Changeset 2352

Timestamp:

11/14/07 22:24:11 (1 year ago)

Author:

kmaclean

Message:

SpeechSubmission App - removing legacy code

Files:

• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java (modified) (14 diffs)

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

@@ -47 +47 @@
-import java.net.URL;
-import java.text.*;
-import java.util.Enumeration;
-import java.util.Vector;
-import javax.sound.sampled.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-import net.sf.postlet.UploadManager;
-import netscape.javascript.JSObject;
-// !!!!!!
-//import java.io.File;
-//import java.io.FileInputStream;
-//import java.io.FileOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
@@ -66 +60 @@
-import speechrecorder.Prompts;
-import speechrecorder.LabelLocalizer;
-
-
-/**
@@ -107 +100 @@
-    AudioInputStream audioInputStream;
-    SamplingGraph samplingGraph;
-// !!!!!!
-    JButton playB;
-    JButton captB;
-    JButton pausB;
-    JButton loadB;
-    JButton uploadB;
-    JButton moreInfoB;    
-    JButton aboutB; 
-// !!!!!!
-    JButton play1;
-    JButton capt1;
@@ -162 +149 @@
-    String license = licenseObject.getLicense();
-    String VFlicense = licenseObject.getVFLicense();
-
-
-
-
-
-
-
-
-
+
-    JTextField textField;
-
-    String fileName = "untitled";
-    String errStr;
-
+
-    double duration = 0;
-    double duration1 = 0;
@@ -187 +166 @@
-    double duration9 = 0;  
-    double duration10 = 0;   
-
+
-    double seconds;
-    long totalBytesWritten = 0L;
@@ -194 +173 @@
-  
-    private File wavFile;
-
+
-    private File wavFile1;
-    private File wavFile2;
@@ -918 +897 @@
-    public void actionPerformed(ActionEvent e) {
-        Object obj = e.getSource();
-
-
-
-
-
-
-
-
+
-// ################### Play #######################################            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            if (play1.getText().startsWith(playButton)) {
-                wavFile = wavFile1;  // !!!!!!      
@@ -1103 +1059 @@
-            }
-        }           
-// !!!!!!      
-// ################### Record #######################################          
-        else if (obj.equals(captB)) {
-            if (captB.getText().startsWith("Record")) {
-                file = null;
-                capture.start();
-                fileName = "untitled";
-                samplingGraph.start();
-//Temp hidden                loadB.setEnabled(false);
-                uploadB.setEnabled(false);
-                moreInfoB.setEnabled(false);            
-                aboutB.setEnabled(false);     
-                playB.setEnabled(false);
-                pausB.setEnabled(true);
-//temp hidden                auB.setEnabled(false);
-//temp hidden                aiffB.setEnabled(false);
-//temp hidden                waveB.setEnabled(false);
-                captB.setText(stopButton);
-            } else {
-                lines.removeAllElements();  
-                capture.stop();
-                samplingGraph.stop();
-//Temp hidden                loadB.setEnabled(true);
-                uploadB.setEnabled(true);
-                moreInfoB.setEnabled(true);          
-                aboutB.setEnabled(true);    
-                playB.setEnabled(true);
-                pausB.setEnabled(false);
-//temp hidden                auB.setEnabled(true);
-//temp hidden                aiffB.setEnabled(true);
-//temp hidden                waveB.setEnabled(true);
-                captB.setText("Record");
-            }
-        } 
-// !!!!!!        
-      else if (obj.equals(capt1)) {
-        if (capt1.getText().startsWith(recordButton)) {
@@ -1441 +1363 @@
-            }
-          }  
-// !!!!!!
-//      ################### Pause #######################################          
-        else if (obj.equals(pausB)) {
-            if (pausB.getText().startsWith("Pause")) {
-                if (capture.thread != null) {
-                    capture.line.stop();
-                } else {
-                    if (playback.thread != null) {
-                        playback.line.stop();
-                    }
-                }
-                pausB.setText("Resume");
-            } else {
-                if (capture.thread != null) {
-                    capture.line.start();
-                } else {
-                    if (playback.thread != null) {
-                        playback.line.start();
-                    }
-                }
-                pausB.setText("Pause");
-            }            
-        } 
-
-//      ################### Load #######################################  
-        else if (obj.equals(loadB)) {
-            try {
-                File file = new File(System.getProperty("user.dir"));
-                JFileChooser fc = new JFileChooser(file);
-                fc.setFileFilter(new javax.swing.filechooser.FileFilter () {
-                    public boolean accept(File f) {
-                        if (f.isDirectory()) {
-                            return true;
-                        }
-                        String name = f.getName();
-                        if (name.endsWith(".au") || name.endsWith(".wav") || name.endsWith(".aiff") || name.endsWith(".aif")) {
-                            return true;
-                        }
-                        return false;
-                    }
-                    public String getDescription() {
-                        return ".au, .wav, .aif";
-                    }
-                });
-
-                if (fc.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-                    createAudioInputStream(fc.getSelectedFile(), true);
-                }
-            } catch (SecurityException ex) { 
-//                JavaSound.showInfoDialog();
-                ex.printStackTrace();
-            } catch (Exception ex) { 
-                ex.printStackTrace();
-            }
-        } 
-//          ################### Upload #######################################               
-        else if (obj.equals(uploadB)) {
-// !!!!!!               
-//                uploadB.setEnabled(false);
-//                playB.setEnabled(false);
-//                pausB.setEnabled(false);
-//                captB.setEnabled(false);
-//                upload1.setEnabled(false);
-               play1.setEnabled(false);
-               capt1.setEnabled(false);
@@ -1584 +1445 @@
-                errStr = null;
-                audioInputStream = AudioSystem.getAudioInputStream(file);
-                playB.setEnabled(true);
-                fileName = file.getName();
-                long milliseconds = (long)((audioInputStream.getFrameLength() * 1000) / audioInputStream.getFormat().getFrameRate());
-                duration = milliseconds / 1000.0;
-                auB.setEnabled(true);
-                aiffB.setEnabled(true);
-                waveB.setEnabled(true);
-                if (updateComponents) {
-//DEL                    formatControls.setFormat(audioInputStream.getFormat());
@@ -1885 +1742 @@
-                thread = null;
-                samplingGraph.stop();
-                playB.setEnabled(true);
-                waveB.setEnabled(true);
-                captB.setText(recordButton);
-                System.err.println(errStr);
-                samplingGraph.repaint();
@@ -2356 +2210 @@
-            if (thread != null) {
-                thread = null;
-                captB.setEnabled(true);
-                pausB.setEnabled(false);
-            } 
-        }
@@ -2447 +2299 @@
-        Color jfcBlue = new Color(204, 204, 255);
-        Color pink = new Color(255, 175, 175);
-// !!!!!!
-        protected boolean peakWarning = false;
-// !!!!!!
- 
-
-        public SamplingGraph() {
@@ -2541 +2390 @@
-                y_last = y_new;
-            }
-// !!!!!!            
-            System.err.println("numPeakValues: " + numPeakValues);
-            float proportionPeakValues = ((float)numPeakValues) / ((int)nlengthInSamples);
-            System.err.println("proportionPeakValues: " + proportionPeakValues);
-            peakWarning = proportionPeakValues > 0.001f;
-// !!!!!!            
-            repaint();
-        }