Changeset 2326

Timestamp:

10/08/07 22:00:57 (11 months ago)

Author:

kmaclean

Message:

snapshot - speech submission app and upload working on windows/linux

Files:

• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java (modified) (21 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java (modified) (1 diff)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/RecorderApplet.java (modified) (1 diff)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/copyrights (modified) (1 prop)
• Trunk/SpeechSubmission/VFSpeechSubmission/server/SubmitSpeechServer.php (modified) (1 diff)
• Trunk/SpeechSubmission/VFSpeechSubmission/server/archive/NewSubmitSpeechServer.php (moved) (moved from Trunk/SpeechSubmission/VFSpeechSubmission/server/NewSubmitSpeechServer.php)
• Trunk/SpeechSubmission/VFSpeechSubmission/server/index.php (moved) (moved from Trunk/SpeechSubmission/VFSpeechSubmission/server/Start.php) (3 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/server/javaUpload.php (modified) (1 diff)

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

@@ -317 +317 @@
-
-    int compressionMode = 2; // Simple compression 1 (loqual) 2 (med) 3 (hiqual)
+    
+        String tempdir = getTempDir();
-// !!!!!!
-//    public CapturePlayback(String subject,  String fileFieldName,
@@ -390 +392 @@
-                        wavFile.deleteOnExit();
-// !!!!!!
-
-                        File dir=File.createTempFile("VF-dir",null);
-                        dir.delete();
-                        dir.mkdir();
-                        String tempdir = dir.toString();
-                        if ( !(tempdir.endsWith("/") || tempdir.endsWith("\\")) )
-                                   tempdir = tempdir + System.getProperty("file.separator");    
-                        
-                        wavFile1 = new File(tempdir + "wavFile1.wav");
-                        wavFile1.deleteOnExit();
@@ -757 +751 @@
-         JPanel DisclaimerInnerPanel = new JPanel(); 
-         String DisclaimerText = 
-<br>VoxForge SpeechSubmission Applet - Copyright (C) 2007 
+VoxForge SpeechSubmission Applet - Copyright (C) 2007
-                 +"This program comes with ABSOLUTELY NO WARRANTY; without even the implied<br> "
-                 +"warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  For<br>" 
-                 +"details click the \"About\" button:";
-
+Inner
-         aboutB = addButton("About", DisclaimerInnerPanel, true); 
-
-
-
-
+
+
-         DisclaimerPanel.add(DisclaimerInnerPanel);        
-        p2.add(DisclaimerPanel); 
@@ -775 +767 @@
-    public void open() { }
-
+    private String getTempDir() {
+        String tempdir=null;
+                try {
+                File dir=File.createTempFile("VF-dir",null);
+                dir.delete();
+                dir.mkdir();
+                tempdir = dir.toString();
+                if ( !(tempdir.endsWith("/") || tempdir.endsWith("\\")) )
+                           tempdir = tempdir + System.getProperty("file.separator");
+
+                } catch (Exception e) {
+                        System.err.println("Unable to create temp directory\n" + e);
+                }
+                return tempdir;
+    }
-
-    public void close() {
@@ -815 +822 @@
-    
-    private void setButtonsOff() {
-
+// debug 
-        play1.setEnabled(false); 
-        capt1.setEnabled(false); 
@@ -839 +846 @@
-    
-    private void saveButtonState() {
-
+// debug 
-        if (play1.isEnabled()) {play1_state = true;} else {play1_state = false;}
-        if (play2.isEnabled()) {play2_state = true;} else {play2_state = false;}  
@@ -863 +870 @@
-    
-    private void restoreButtonState() {
-
+// debug 
-        if (play1_state) {play1.setEnabled(true);} else {play1.setEnabled(false);}
-        if (play2_state) {play2.setEnabled(true);} else {play2.setEnabled(false);}
@@ -1532 +1539 @@
- 
-           JOptionPane.showMessageDialog(this, areaScrollPane, 
-More info on Copyright and GPL license
+About VoxForge Speech Submission Application
-       }
-    }
@@ -1925 +1932 @@
-                        }
-
-
+// debug 
-
-            // we reached the end of the stream.  stop and close the line.
@@ -1952 +1959 @@
-            } catch (Exception ex) { reportStatus(ex.toString()); }
-            // !!!!!!
-
+// debug
-                byte audioBytes[] = outbaos.toByteArray();
-        //      System.err.println("Loaded bytes to byte array");
@@ -1963 +1970 @@
-                 duration = totalBytesWritten / (double) (format.getSampleRate() * format.getSampleSizeInBits()/ 8);
-            // !!!!!!
-
+// debug
-// !!!!!!
-//            samplingGraph.createWaveForm(audioInputStream);
-            samplingGraph.createWaveForm(audioBytes);
-// !!!!!!
-
+// debug 
-
-            // This is the only way to "reset" long streams - re-grab
@@ -1992 +1999 @@
-                }
-        
-
+// debug 
-                try {
-                        //              audioInputStream = AudioSystem.getAudioInputStream(wavFile);
@@ -2004 +2011 @@
-                        System.err.println("Exception while reading cache file: " + err);
-                }
-
+// debug 
-        }
-
@@ -2124 +2131 @@
-//            totalBytes = ((int)spxFile.length());
-            progBar.setMaximum((int)wavFile.length());
-
+//
-// !!!!!!            
-            progBar.setMinimum(0);
@@ -2167 +2174 @@
-files[9] = uploadWavFile9;
-files[10] = uploadWavFile10;
+
-//############ prompt files #################################### 
-try {
@@ -2276 +2284 @@
-}
-
-
-if (userName != null){
-
+tempdir + 
-} else {
-
+tempdir +
-}
-
-createZipArchive(archiveFile, files);
-System.err.println("Archive file location:" + archiveFile);
-
+
+
+
+
-//############ Upload #################################### 
-
@@ -2560 +2570 @@
-
-                    // .. draw current position ..
-        
+// debug
-                    if (seconds != 0) {
-                        double loc = seconds/duration*w;
@@ -2593 +2603 @@
-
-                    seconds =  milliseconds / 1000.0;
-        
+// debug
-                } else if ( (capture.line != null) && (capture.line.isActive()) ) {
-
-                    long milliseconds = (long)(capture.line.getMicrosecondPosition() / 1000);
-                    seconds =  milliseconds / 1000.0;
-        
+// debug
-
-                }
@@ -2626 +2636 @@
-            //DEL progCompletion.setText(pLabels.getLabel(2));
-            if (endPageURL != null){
+                progBar.setString("Upload completed... Thank you for your submission!");
+                progBar.setIndeterminate(false);
-                System.err.println("Finished! Sending you on to "+endPageURL);
-                ((JApplet)(getParent().getParent().getParent().getParent())).getAppletContext().showDocument(endPageURL);
@@ -2633 +2645 @@
-                // Attempt at calling Javascript after upload is complete.
-//FORDEBUG
-
+     
-                JSObject win = (JSObject) JSObject.getWindow((JApplet)getParent());
-                win.eval("postletFinished();");
@@ -2644 +2656 @@
-        } else {
-//FORDEBUG
-//
+
-        }
-     }

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java

@@ -48 +48 @@
-                
-                VFlicenseNotice =  
-Submission Application
+ Submission Application v0.1
-                + " upload the recorded audio to the VoxForge server, so that it can be" + System.getProperty("line.separator") 
-                + "incorporated into the VoxForge Speech Corpus and used in the creation of " + System.getProperty("line.separator") 

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/RecorderApplet.java

@@ -213 +213 @@
-        
-        /*  HELPPAGE  */
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
-    }
-

Trunk/SpeechSubmission/VFSpeechSubmission/server/SubmitSpeechServer.php

@@ -16 +16 @@
-  $cookie = htmlspecialchars($_SERVER['HTTP_COOKIE']);
-  $code =  <<<ENDHTMLFRAGMENT
-00" height ="850
+25" height ="875
-      code="speechrecorder/RecorderApplet.class" style="border: 1px solid rgb(153,153,153);">
- <param name="codebase"  value="$codebase"/>

Trunk/SpeechSubmission/VFSpeechSubmission/server/index.php

@@ -8 +8 @@
-        }
-        .copyright {
-s
+x
-                color: #2E3436;
-                font-family: sans-serif;
@@ -155 +155 @@
-<p>After each recording, the black box near the bottom of your screen will display the audio waveform corresponding to the currently active recording.  Please avoid recording clipped speech (i.e. recording with the  volume to high).  The grey bar below the upload button will display a warning if your recording volume is too loud.</p>
-<p>Once you have completed recording all ten prompts the <b>Upload</b> button will activate.  Click the <b>Upload</b> button to upload your entire submission to the VoxForge repository as a single zip file.</p>
-
+i
-</br>
-<?php
@@ -161 +161 @@
-
-echo speex_postlet_applet(
-www.repository.voxforge1.org/SubmitSpeech
-www.repository.voxforge1.org/SubmitSpeech
-www.repository.voxforge1.org/SubmitSpeech
+read.voxforge1.org
+read.voxforge1.org
+read.voxforge1.org
-     );
-

Trunk/SpeechSubmission/VFSpeechSubmission/server/javaUpload.php

@@ -24 +24 @@
-// or "c:\php\uploads\"
-// Note, this MUST have the trailing slash.
-
+
+
-// Whether or not to allow the upload of specific files
-fals
+tru
-// If the above is true, then this states whether the array of files is a list of
-// extensions to ALLOW, or DENY