Changeset 2258
- Timestamp:
- 08/14/07 21:32:52 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
Trunk/SpeechSubmission/VFSpeechSubmission/java/src/moodlespeex/CapturePlayback.java
r2257 r2258 661 661 prompt10InnerPanel.add(new JLabel(this.prompt10)); 662 662 prompt10Panel.add(prompt10InnerPanel); 663 play 5= addButton("Play", prompt10Panel, false);664 capt 5= addButton("Record", prompt10Panel, true);663 play10 = addButton("Play", prompt10Panel, false); 664 capt10 = addButton("Record", prompt10Panel, true); 665 665 prompts.add(prompt10Panel); 666 666 promptsContainer.add(prompts); … … 757 757 wavFile = wavFile1; // !!!!!! 758 758 playback.start(); 759 fileName = promptID1; 759 760 samplingGraph.start(); 760 761 capt1.setEnabled(false); … … 771 772 wavFile = wavFile2; // !!!!!! 772 773 playback.start(); 774 fileName = promptID2; 773 775 samplingGraph.start(); 774 776 capt2.setEnabled(false); … … 785 787 wavFile = wavFile3; // !!!!!! 786 788 playback.start(); 789 fileName = promptID3; 787 790 samplingGraph.start(); 788 791 capt3.setEnabled(false); … … 799 802 wavFile = wavFile4; // !!!!!! 800 803 playback.start(); 804 fileName = promptID4; 801 805 samplingGraph.start(); 802 806 capt4.setEnabled(false); … … 813 817 wavFile = wavFile5; // !!!!!! 814 818 playback.start(); 819 fileName = promptID5; 815 820 samplingGraph.start(); 816 821 capt5.setEnabled(false); … … 827 832 wavFile = wavFile6; // !!!!!! 828 833 playback.start(); 834 fileName = promptID6; 829 835 samplingGraph.start(); 830 836 capt6.setEnabled(false); … … 841 847 wavFile = wavFile7; // !!!!!! 842 848 playback.start(); 849 fileName = promptID7; 843 850 samplingGraph.start(); 844 851 capt7.setEnabled(false); … … 855 862 wavFile = wavFile8; // !!!!!! 856 863 playback.start(); 864 fileName = promptID8; 857 865 samplingGraph.start(); 858 866 capt8.setEnabled(false); … … 869 877 wavFile = wavFile9; // !!!!!! 870 878 playback.start(); 879 fileName = promptID9; 871 880 samplingGraph.start(); 872 881 capt9.setEnabled(false); … … 883 892 wavFile = wavFile10; // !!!!!! 884 893 playback.start(); 894 fileName = promptID10; 885 895 samplingGraph.start(); 886 896 capt10.setEnabled(false); … … 931 941 wavFile = wavFile1; 932 942 capture.start(uploadWavFile1); 933 fileName = "untitled";943 fileName = promptID1; 934 944 samplingGraph.start(); 935 945 play1.setEnabled(false); … … 950 960 wavFile = wavFile2; // !!!!!! 951 961 capture.start(uploadWavFile2); 952 fileName = "untitled";962 fileName = promptID2; 953 963 samplingGraph.start(); 954 964 play2.setEnabled(false); … … 969 979 wavFile = wavFile3; // !!!!!! 970 980 capture.start(uploadWavFile3); 971 fileName = "untitled";981 fileName = promptID3; 972 982 samplingGraph.start(); 973 983 play3.setEnabled(false); … … 988 998 wavFile = wavFile4; // !!!!!! 989 999 capture.start(uploadWavFile4); 990 fileName = "untitled";1000 fileName = promptID4; 991 1001 samplingGraph.start(); 992 1002 play4.setEnabled(false); … … 1007 1017 wavFile = wavFile5; // !!!!!! 1008 1018 capture.start(uploadWavFile5); 1009 fileName = "untitled";1019 fileName = promptID5; 1010 1020 samplingGraph.start(); 1011 1021 play5.setEnabled(false); … … 1026 1036 wavFile = wavFile6; 1027 1037 capture.start(uploadWavFile6); 1028 fileName = "untitled";1038 fileName = promptID6; 1029 1039 samplingGraph.start(); 1030 1040 play6.setEnabled(false); … … 1045 1055 wavFile = wavFile7; // !!!!!! 1046 1056 capture.start(uploadWavFile7); 1047 fileName = "untitled";1057 fileName = promptID7; 1048 1058 samplingGraph.start(); 1049 1059 play7.setEnabled(false); … … 1064 1074 wavFile = wavFile8; // !!!!!! 1065 1075 capture.start(uploadWavFile8); 1066 fileName = "untitled";1076 fileName = promptID8; 1067 1077 samplingGraph.start(); 1068 1078 play8.setEnabled(false); … … 1083 1093 wavFile = wavFile9; // !!!!!! 1084 1094 capture.start(uploadWavFile9); 1085 fileName = "untitled";1095 fileName = promptID9; 1086 1096 samplingGraph.start(); 1087 1097 play9.setEnabled(false); … … 1102 1112 wavFile = wavFile10; // !!!!!! 1103 1113 capture.start(uploadWavFile10); 1104 fileName = "untitled";1114 fileName = promptID10; 1105 1115 samplingGraph.start(); 1106 1116 play10.setEnabled(false); … … 1350 1360 play4.setText("Play"); 1351 1361 capt5.setEnabled(true); 1352 play5.setText("Play"); 1362 play5.setText("Play"); 1363 capt6.setEnabled(true); 1364 play6.setText("Play"); 1365 capt7.setEnabled(true); 1366 play7.setText("Play"); 1367 capt8.setEnabled(true); 1368 play8.setText("Play"); 1369 capt9.setEnabled(true); 1370 play9.setText("Play"); 1371 capt10.setEnabled(true); 1372 play10.setText("Play"); 1353 1373 // !!!!!! 1354 1374 } … … 2152 2172 } 2153 2173 } 2154 } else if (format.getSampleSizeInBits() == 8) { 2174 } 2175 // !!!!!! 2176 else if (format.getSampleSizeInBits() == 48) { 2177 buflengthinsamples = bytesread / 6; 2178 // System.err.println("Debug point 1.1"); 2179 // audioData = new int[nlengthInSamples]; 2180 // System.err.println("Debug point 1.2"); 2181 if (format.isBigEndian()) { 2182 for (int i = 0; i < buflengthinsamples; i++) { 2183 /* First byte is MSB (high order) */ 2184 int MSB = (int) readbuf[2*i]; 2185 /* Second byte is LSB (low order) */ 2186 int LSB = (int) readbuf[2*i+1]; 2187 audioDatum = MSB << 8 | (255 & LSB); 2188 if(audioDatum > peakThresh) { 2189 numPeakValues++; 2190 } 2191 if((i % frames_per_pixel) == 0){ 2192 my_byte = (byte)(128 * audioDatum / 32768); 2193 double y_new = (double) (h * (128 - my_byte) / 256); 2194 int x = i / frames_per_pixel; 2195 lines.add(new Line2D.Double(x, y_last, x, y_new)); 2196 y_last = y_new; 2197 } 2198 // audioData[i] = audioDatum; 2199 } 2200 } else { 2201 for (int i = 0; i < buflengthinsamples; i++) { 2202 /* First byte is LSB (low order) */ 2203 int LSB = (int) readbuf[2*i]; 2204 /* Second byte is MSB (high order) */ 2205 int MSB = (int) readbuf[2*i+1]; 2206 audioDatum = MSB << 8 | (255 & LSB); 2207 if(audioDatum > peakThresh) { 2208 numPeakValues++; 2209 } 2210 if((i % frames_per_pixel) == 0){ 2211 my_byte = (byte)(128 * audioDatum / 32768); 2212 double y_new = (double) (h * (128 - my_byte) / 256); 2213 int x = i / frames_per_pixel; 2214 lines.add(new Line2D.Double(x, y_last, x, y_new)); 2215 y_last = y_new; 2216 } 2217 // audioData[i] = audioDatum; 2218 } 2219 } 2220 } 2221 // !!!!!! 2222 2223 else if (format.getSampleSizeInBits() == 8) { 2155 2224 buflengthinsamples = bytesread; 2156 2225 // System.err.println("Debug point 2.1"); Trunk/SpeechSubmission/VFSpeechSubmission/server/javaUpload.php
r2256 r2258 30 30 // extensions to ALLOW, or DENY 31 31 $allow_or_deny_method = "allow"; // "allow" or "deny" 32 $file_extension_list = array(" php","asp","pl");32 $file_extension_list = array("zip"); 33 33 // ----------------------------------------------------------------------------- 34 34 if ($allow_or_deny){