Changeset 2256

Timestamp:

08/14/07 00:36:23 (1 year ago)

Author:

kmaclean

Message:

updates to VF Speech Submission program: 10 audio files to record
& directory cleanup

Files:

• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/moodlespeex/CapturePlayback.java (modified) (51 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/moodlespeex/License.java (modified) (2 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/moodlespeex/MoodleSpeexRecorderApplet.java (modified) (3 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/moodle (deleted)
• Trunk/SpeechSubmission/VFSpeechSubmission/moodlepatches (deleted)
• Trunk/SpeechSubmission/VFSpeechSubmission/server (added)
• Trunk/SpeechSubmission/VFSpeechSubmission/server/javaUpload.php (added)
• Trunk/SpeechSubmission/VFSpeechSubmission/server/speechSubmission.php (added)

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/moodlespeex/CapturePlayback.java

@@ -96 +96 @@
-    JButton loadB;
-    JButton uploadB;
+    JButton moreInfoB;    
-// !!!!!!
-    JButton play1;
@@ -122 +123 @@
-    JButton load5;
-    JButton upload5;  
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    JCheckBox acceptLicenseCB;    
-
@@ -157 +182 @@
-    private File uploadWavFile3;
-    private File uploadWavFile4;
-
+
+
+
+
+
+
+
+
+
+
+
-//    private File archiveFile;   
-    private File promptsFile;  
@@ -190 +225 @@
-    String promptID4;
-    String promptID5;    
-
+
+
+
+
+
+
+
+
+
+
-
-    JTextField usernameTextField;  
@@ -252 +296 @@
-//                 String language, URL destinationURL, 
-//                 URL endPageURL, URL helpPageURL, String cookie, int defaultCompressionMode) {
-
-
+
+
+
+
-                URL endPageURL, URL helpPageURL, String cookie, int defaultCompressionMode) {           
-
-    if (prompt1 == null || prompt1.length() == 0) {
-5
+10
-        String [][] promptArray = prompts.getPrompts();
-                this.promptID1 = promptArray[0][0];
@@ -269 +315 @@
-                this.promptID5 = promptArray[0][4];
-                this.prompt5 = promptArray[1][4];
+                this.promptID6 = promptArray[0][5];
+        this.prompt6 = promptArray[1][5];
+                this.promptID7 = promptArray[0][6];
+                this.prompt7 = promptArray[1][6];
+                this.promptID8 = promptArray[0][7];
+                this.prompt8 = promptArray[1][7];
+                this.promptID9 = promptArray[0][8]; 
+                this.prompt9 = promptArray[1][8];
+                this.promptID10 = promptArray[0][9];
+                this.prompt10 = promptArray[1][9];              
-    } else {
-        this.prompt1 = prompt1;        
@@ -280 +336 @@
-                this.promptID4 = promptID4;        
-                this.promptID5 = promptID5;  
+        this.prompt6 = prompt6;        
+                this.prompt7 = prompt7;        
+                this.prompt8 = prompt8;        
+                this.prompt9 = prompt9;        
+                this.prompt10 = prompt10;    
+                this.promptID6 = promptID6;        
+                this.promptID7 = promptID7;        
+                this.promptID8 = promptID8;        
+                this.promptID9 = promptID9;        
+                this.promptID10 = promptID10;           
-          }
-                   
@@ -319 +385 @@
-                        uploadWavFile5 = new File(this.promptID5 + ".wav");
-                        uploadWavFile5.deleteOnExit();
+                        wavFile6 = File.createTempFile("vxf", ".raw");
+                        wavFile6.deleteOnExit();
+                        wavFile7 = File.createTempFile("vxf", ".raw");
+                        wavFile7.deleteOnExit();
+                        wavFile8 = File.createTempFile("vxf", ".raw");
+                        wavFile8.deleteOnExit();
+                        wavFile9 = File.createTempFile("vxf", ".raw");
+                        wavFile9.deleteOnExit();
+                        wavFile10 = File.createTempFile("vxf", ".raw");
+                        wavFile10.deleteOnExit();
+                        uploadWavFile6 = new File(this.promptID6 + ".wav");
+                        uploadWavFile6.deleteOnExit();
+                        uploadWavFile7 = new File(this.promptID7 + ".wav");
+                        uploadWavFile7.deleteOnExit();
+                        uploadWavFile8 = new File(this.promptID8 + ".wav");
+                        uploadWavFile8.deleteOnExit();
+                        uploadWavFile9 = new File(this.promptID9 + ".wav");
+                        uploadWavFile9.deleteOnExit();
+                        uploadWavFile10 = new File(this.promptID10 + ".wav");
+                        uploadWavFile10.deleteOnExit();                 
-//                      archiveFile = File.createTempFile("vxf", ".zip");
-//                      archiveFile.deleteOnExit();     
@@ -357 +443 @@
-        //p2.setBorder(sbb);
-        p2.setLayout(new BoxLayout(p2, BoxLayout.Y_AXIS));
+//      ###########################################################              
-//      ############ User name ####################################             
-//      userName is read when user clicks Upload
-    
-    usernamePanel.setLayout(new FlowLayout(FlowLayout.CENTER)); 
-    
-    
-    
-    
+
+usernamePanel.setLayout(new FlowLayout(FlowLayout.CENTER));
+
+
+
+
-// ############ Gender ####################################             
-        JPanel genderPanel = new JPanel();
-
+
+
-        genderPanel.add(new JLabel("Gender:"));
-        String[] genderSelection = {male, female};
@@ -382 +470 @@
-                 }
-                 });
+        
-        p2.add(genderPanel);
-// ############ Age Range ####################################             
@@ -433 +522 @@
-                 });
-        p2.add(dialectPanel);
+
-//      ############ Microphone Type: ####################################       
-        JPanel microphonePanel = new JPanel();
@@ -460 +550 @@
-                 });
-        p2.add(microphonePanel);
-
+
+
-        JPanel promptsContainer = new JPanel(); 
-        promptsContainer.setLayout(new FlowLayout(FlowLayout.CENTER));
-
+
+
-        JPanel prompts = new JPanel(); 
-
+//
-        prompts.setLayout(new BoxLayout(prompts, BoxLayout.Y_AXIS));
-
@@ -471 +563 @@
-// ############ Prompt1 ####################################        
-        JPanel prompt1Panel = new JPanel(); 
-    //    prompt1Panel.setLayout(new BoxLayout(prompt1Panel, BoxLayout.X_AXIS));
-    //    prompt1Panel.setBorder(new EmptyBorder(10,5,5,5));
-        prompt1Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
-        
-        JPanel prompt1InnerPanel = new JPanel();
-        prompt1InnerPanel.setBorder(BorderFactory.createLineBorder (Color.blue, 1));
-        prompt1InnerPanel.add(new JLabel(this.prompt1));
-        prompt1Panel.add(prompt1InnerPanel);
- //       prompt1Panel.add(new JTextField(this.prompt1, 50));
-        
-        play1 = addButton("Play", prompt1Panel, false);
-        play1.setSize(10,10);
-        capt1 = addButton("Record", prompt1Panel, true);
-//        paus1 = addButton("Pause", prompt1Panel, false);
-        prompts.add(prompt1Panel);
-// ############ Prompt2 ####################################            
-        JPanel prompt2Panel = new JPanel(); 
- //       prompt2Panel.setLayout(new BoxLayout(prompt2Panel, BoxLayout.X_AXIS));
-  //      prompt2Panel.setBorder(new EmptyBorder(10,5,5,5));
-        prompt2Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));       
-        JPanel prompt2InnerPanel = new JPanel(); 
@@ -495 +579 @@
-        prompt2InnerPanel.add(new JLabel(this.prompt2));
-        prompt2Panel.add(prompt2InnerPanel);
-  //      prompt2Panel.add(prompt1Box = new JTextField(this.prompt2, 50));
-        
-        play2 = addButton("Play", prompt2Panel, false);
-        capt2 = addButton("Record", prompt2Panel, true);
-//        paus2 = addButton("Pause", prompt2Panel, false);
-        prompts.add(prompt2Panel);        
-//      ############ Prompt3 ####################################            
-        JPanel prompt3Panel = new JPanel(); 
- //       prompt3Panel.setLayout(new BoxLayout(prompt3Panel, BoxLayout.X_AXIS));
-  //      prompt3Panel.setBorder(new EmptyBorder(10,5,5,5));
-        prompt3Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));      
-        JPanel prompt3InnerPanel = new JPanel(); 
@@ -510 +589 @@
-        prompt3InnerPanel.add(new JLabel(this.prompt3));
-        prompt3Panel.add(prompt3InnerPanel);
-  //      prompt3Panel.add(prompt1Box = new JTextField(this.prompt3, 50));
-
-        play3 = addButton("Play", prompt3Panel, false);
-        capt3 = addButton("Record", prompt3Panel, true);
- //       paus3 = addButton("Pause", prompt3Panel, false);
-        prompts.add(prompt3Panel);     
-//      ############ Prompt4 ####################################            
-        JPanel prompt4Panel = new JPanel(); 
-  //      prompt4Panel.setLayout(new BoxLayout(prompt4Panel, BoxLayout.X_AXIS));
-  //      prompt4Panel.setBorder(new EmptyBorder(10,5,5,5));
-        prompt4Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
-        JPanel prompt4InnerPanel = new JPanel(); 
@@ -525 +599 @@
-        prompt4InnerPanel.add(new JLabel(this.prompt4));
-        prompt4Panel.add(prompt4InnerPanel);     
-  //      prompt4Panel.add(prompt1Box = new JTextField(this.prompt4, 50));
-        play4 = addButton("Play", prompt4Panel, false);
-        capt4 = addButton("Record", prompt4Panel, true);
- //       paus4 = addButton("Pause", prompt4Panel, false);
-        prompts.add(prompt4Panel);     
-//      ############ Prompt5 ####################################            
-        JPanel prompt5Panel = new JPanel(); 
-  //      prompt5Panel.setLayout(new BoxLayout(prompt5Panel, BoxLayout.X_AXIS));
-  //      prompt5Panel.setBorder(new EmptyBorder(10,5,5,5));
-        prompt5Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));     
-        JPanel prompt5InnerPanel = new JPanel(); 
@@ -539 +609 @@
-        prompt5InnerPanel.add(new JLabel(this.prompt5));
-        prompt5Panel.add(prompt5InnerPanel);
-   //     prompt5Panel.add(prompt1Box = new JTextField(this.prompt5, 50));
-        
-        play5 = addButton("Play", prompt5Panel, false);
-        capt5 = addButton("Record", prompt5Panel, true);
- //       paus5 = addButton("Pause", prompt5Panel, false);
-        
-        
-        prompts.add(prompt5Panel); 
+
+//      ############ Prompt6 ####################################        
+        JPanel prompt6Panel = new JPanel(); 
+        prompt6Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
+        JPanel prompt6InnerPanel = new JPanel();
+        prompt6InnerPanel.setBorder(BorderFactory.createLineBorder (Color.blue, 1));
+        prompt6InnerPanel.add(new JLabel(this.prompt6));
+        prompt6Panel.add(prompt6InnerPanel);
+        play6 = addButton("Play", prompt6Panel, false);
+        play6.setSize(10,10);
+        capt6 = addButton("Record", prompt6Panel, true);
+        prompts.add(prompt6Panel);
+// ############ prompt7 ####################################            
+        JPanel prompt7Panel = new JPanel(); 
+        prompt7Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));       
+        JPanel prompt7InnerPanel = new JPanel(); 
+        prompt7InnerPanel.setBorder(BorderFactory.createLineBorder (Color.blue, 1));
+        prompt7InnerPanel.add(new JLabel(this.prompt7));
+        prompt7Panel.add(prompt7InnerPanel);
+        play7 = addButton("Play", prompt7Panel, false);
+        capt7 = addButton("Record", prompt7Panel, true);
+        prompts.add(prompt7Panel);        
+//      ############ prompt8 ####################################            
+        JPanel prompt8Panel = new JPanel(); 
+        prompt8Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));      
+        JPanel prompt8InnerPanel = new JPanel(); 
+        prompt8InnerPanel.setBorder(BorderFactory.createLineBorder (Color.blue, 1));
+        prompt8InnerPanel.add(new JLabel(this.prompt8));
+        prompt8Panel.add(prompt8InnerPanel);
+        play8 = addButton("Play", prompt8Panel, false);
+        capt8 = addButton("Record", prompt8Panel, true);
+        prompts.add(prompt8Panel);     
+//      ############ prompt9 ####################################            
+        JPanel prompt9Panel = new JPanel(); 
+        prompt9Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
+        JPanel prompt9InnerPanel = new JPanel(); 
+        prompt9InnerPanel.setBorder(BorderFactory.createLineBorder (Color.blue, 1));
+        prompt9InnerPanel.add(new JLabel(this.prompt9));
+        prompt9Panel.add(prompt9InnerPanel);     
+        play9 = addButton("Play", prompt9Panel, false);
+        capt9 = addButton("Record", prompt9Panel, true);
+        prompts.add(prompt9Panel);     
+//      ############ prompt10 ####################################            
+        JPanel prompt10Panel = new JPanel(); 
+        prompt10Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));     
+        JPanel prompt10InnerPanel = new JPanel(); 
+        prompt10InnerPanel.setBorder(BorderFactory.createLineBorder (Color.blue, 1));
+        prompt10InnerPanel.add(new JLabel(this.prompt10));
+        prompt10Panel.add(prompt10InnerPanel);
+        play5 = addButton("Play", prompt10Panel, false);
+        capt5 = addButton("Record", prompt10Panel, true);
+        prompts.add(prompt10Panel); 
-        promptsContainer.add(prompts);
-        p2.add(promptsContainer);
-
+
+
+
+
-//      ############ Sampling Graph ####################################          
-        JPanel samplingPanel = new JPanel(new BorderLayout());
@@ -556 +676 @@
-        samplingPanel.add(samplingGraph = new SamplingGraph());
-        p2.add(samplingPanel);
-
-
+
+
+
+
+
+
-//############ Upload ####################################          
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        add(p2);
-    }
@@ -651 +759 @@
-                samplingGraph.start();
-                capt1.setEnabled(false);
- //               paus1.setEnabled(true);
-                play1.setText("Stop");
-            } else {
@@ -657 +764 @@
-                samplingGraph.stop();
-                capt1.setEnabled(true);
- //               paus1.setEnabled(false);
-                play1.setText("Play");
-            }
@@ -667 +773 @@
-                samplingGraph.start();
-                capt2.setEnabled(false);
-//                paus2.setEnabled(true);
-                play2.setText("Stop");
-            } else {
@@ -673 +778 @@
-                samplingGraph.stop();
-                capt2.setEnabled(true);
-  //              paus2.setEnabled(false);
-                play2.setText("Play");
-            }
@@ -683 +787 @@
-                samplingGraph.start();
-                capt3.setEnabled(false);
- //               paus3.setEnabled(true);
-                play3.setText("Stop");
-            } else {
@@ -689 +792 @@
-                samplingGraph.stop();
-                capt3.setEnabled(true);
- //               paus3.setEnabled(false);
-                play3.setText("Play");
-            }
@@ -699 +801 @@
-                samplingGraph.start();
-                capt4.setEnabled(false);
- //               paus4.setEnabled(true);
-                play4.setText("Stop");
-            } else {
@@ -705 +806 @@
-                samplingGraph.stop();
-                capt4.setEnabled(true);
- //               paus4.setEnabled(false);
-                play4.setText("Play");
-            }
@@ -715 +815 @@
-                samplingGraph.start();
-                capt5.setEnabled(false);
- //               paus5.setEnabled(true);
-                play5.setText("Stop");
-            } else {
@@ -721 +820 @@
-                samplingGraph.stop();
-                capt5.setEnabled(true);
- //               paus5.setEnabled(false);
-                play5.setText("Play");
+            }
+        }     
+        else if (obj.equals(play6)) {
+            if (play6.getText().startsWith("Play")) {
+                wavFile = wavFile6;  // !!!!!!                  
+                playback.start();
+                samplingGraph.start();
+                capt6.setEnabled(false);
+                play6.setText("Stop");
+            } else {
+                playback.stop();
+                samplingGraph.stop();
+                capt6.setEnabled(true);
+                play6.setText("Play");
+            }
+        }   
+        else if (obj.equals(play7)) {
+            if (play7.getText().startsWith("Play")) {
+                wavFile = wavFile7;  // !!!!!!                  
+                playback.start();
+                samplingGraph.start();
+                capt7.setEnabled(false);
+                play7.setText("Stop");
+            } else {
+                playback.stop();
+                samplingGraph.stop();
+                capt7.setEnabled(true);
+                play7.setText("Play");
+            }
+        }    
+        else if (obj.equals(play8)) {
+            if (play8.getText().startsWith("Play")) {
+                wavFile = wavFile8;  // !!!!!!                  
+                playback.start();
+                samplingGraph.start();
+                capt8.setEnabled(false);
+                play8.setText("Stop");
+            } else {
+                playback.stop();
+                samplingGraph.stop();
+                capt8.setEnabled(true);
+                play8.setText("Play");
+            }
+        }   
+        else if (obj.equals(play9)) {
+            if (play9.getText().startsWith("Play")) {
+                wavFile = wavFile9;  // !!!!!!                  
+                playback.start();
+                samplingGraph.start();
+                capt9.setEnabled(false);
+                play9.setText("Stop");
+            } else {
+                playback.stop();
+                samplingGraph.stop();
+                capt9.setEnabled(true);
+                play9.setText("Play");
+            }
+        }   
+        else if (obj.equals(play10)) {
+            if (play10.getText().startsWith("Play")) {
+                wavFile = wavFile10;  // !!!!!!                 
+                playback.start();
+                samplingGraph.start();
+                capt10.setEnabled(false);
+                play10.setText("Stop");
+            } else {
+                playback.stop();
+                samplingGraph.stop();
+                capt10.setEnabled(true);
+                play10.setText("Play");
-            }
-        }           
@@ -735 +903 @@
-//Temp hidden                loadB.setEnabled(false);
-                uploadB.setEnabled(false);
+                moreInfoB.setEnabled(false);                
-                playB.setEnabled(false);
-                pausB.setEnabled(true);
@@ -747 +916 @@
-//Temp hidden                loadB.setEnabled(true);
-                uploadB.setEnabled(true);
+                moreInfoB.setEnabled(true);                   
-                playB.setEnabled(true);
-                pausB.setEnabled(false);
@@ -759 +929 @@
-        if (capt1.getText().startsWith("Record")) {
-            file = null;
-// !!!!!!            
-            wavFile = wavFile1;  
-//            capture.start();
-            capture.start(uploadWavFile1);   
-// !!!!!!            
-            fileName = "untitled";
-            samplingGraph.start();
-            play1.setEnabled(false);
-//            paus1.setEnabled(true);
-            capt1.setText("Stop");
+            moreInfoB.setEnabled(false);  
-        } else {
-            lines.removeAllElements();  
@@ -774 +941 @@
-            samplingGraph.stop();
-            play1.setEnabled(true);
- //           paus1.setEnabled(false);
-            capt1.setText("Record");
+            moreInfoB.setEnabled(true);  
-        }
-      } 
@@ -781 +948 @@
-          if (capt2.getText().startsWith("Record")) {
-              file = null;
-// !!!!!!              
-              wavFile = wavFile2;  // !!!!!!              
-//              capture.start();
-              capture.start(uploadWavFile2);   
-//            !!!!!!               
-              fileName = "untitled";
-              samplingGraph.start();
-              play2.setEnabled(false);
- //             paus2.setEnabled(true);
-              capt2.setText("Stop");
+              moreInfoB.setEnabled(false);  
-          } else {
-              lines.removeAllElements();  
@@ -796 +960 @@
-              samplingGraph.stop();
-              play2.setEnabled(true);
- //             paus2.setEnabled(false);
-              capt2.setText("Record");
+              moreInfoB.setEnabled(true);  
-          }
-        }    
@@ -803 +967 @@
-          if (capt3.getText().startsWith("Record")) {
-              file = null;
-// !!!!!!              
-              wavFile = wavFile3;  // !!!!!!   
-//              capture.start();
-              capture.start(uploadWavFile3);   
-//            !!!!!!  
-              fileName = "untitled";
-              samplingGraph.start();
-              play3.setEnabled(false);
- //             paus3.setEnabled(true);
-              capt3.setText("Stop");
+              moreInfoB.setEnabled(false);  
-          } else {
-              lines.removeAllElements();  
@@ -818 +979 @@
-              samplingGraph.stop();
-              play3.setEnabled(true);
- //             paus3.setEnabled(false);
-              capt3.setText("Record");
+              moreInfoB.setEnabled(true);  
-          }
-        } 
@@ -825 +986 @@
-          if (capt4.getText().startsWith("Record")) {
-              file = null;
-// !!!!!!              
-              wavFile = wavFile4;  // !!!!!!              
-//              capture.start();
-              capture.start(uploadWavFile4);   
-//            !!!!!!  
-              fileName = "untitled";
-              samplingGraph.start();
-              play4.setEnabled(false);
- //             paus4.setEnabled(true);
-              capt4.setText("Stop");
+              moreInfoB.setEnabled(false);  
-          } else {
-              lines.removeAllElements();  
@@ -840 +998 @@
-              samplingGraph.stop();
-              play4.setEnabled(true);
- //             paus4.setEnabled(false);
-              capt4.setText("Record");
+              moreInfoB.setEnabled(true);  
-          }
-        } 
@@ -847 +1005 @@
-          if (capt5.getText().startsWith("Record")) {
-              file = null;
-// !!!!!!              
-              wavFile = wavFile5;  // !!!!!!              
-//              capture.start();
-              capture.start(uploadWavFile5);   
-// !!!!!!    
-              fileName = "untitled";
-              samplingGraph.start();
-              play5.setEnabled(false);
- //             paus5.setEnabled(true);
-              capt5.setText("Stop");
+              moreInfoB.setEnabled(false);  
-          } else {
-              lines.removeAllElements();  
@@ -862 +1017 @@
-              samplingGraph.stop();
-              play5.setEnabled(true);
- //             paus5.setEnabled(false);
-              capt5.setText("Record");
+              moreInfoB.setEnabled(true);  
-          }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-// !!!!!!
-//      ################### Pause #######################################          
@@ -889 +1139 @@
-            }            
-        } 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-