Changeset 3962 in osm for applications/editors/josm/plugins/surveyor/src/at

Timestamp:

2007-08-05T21:54:03+02:00 (17 years ago)

Author:

christofd

Message:

moved resources into separate directory
made play sound in background thread

Location:

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor

Files:

• action/PlayAudioAction.java (modified) (4 diffs)
• util (added)
• util/ResourceLoader.java (added)

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java

@@ -4 +4 @@
 package at.dallermassl.josm.plugin.surveyor.action;
 
-import java.io.File;
+import java.io.BufferedInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 
@@ -19 +20 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
+import at.dallermassl.josm.plugin.surveyor.util.ResourceLoader;
 
 /**
@@ -27 +29 @@
  */
 public class PlayAudioAction extends AbstractSurveyorAction {
-    private File audioFile = null;
+    private String audioSource = null;
 
     /* (non-Javadoc)
@@ -34 +36 @@
     //@Override
     public void actionPerformed(GpsActionEvent event) {
-        try {
-            if(audioFile == null) {
-                audioFile = new File(getParameters().get(0));
-                if(!audioFile.exists()) {
-                    audioFile = new File(Main.pref.getPreferencesDir(), getParameters().get(0));
-                    if(!audioFile.exists()) {
-                        System.err.println("Audio file " + getParameters().get(0) + " not found!");
-                        return;
+        // run as a separate thread
+        Main.worker.execute(new Runnable() {
+            public void run() {
+                try {
+                    if(audioSource == null) {
+                        audioSource = getParameters().get(0);
+                        System.out.println("reading audio from " + audioSource);
                     }
+                    InputStream in = new BufferedInputStream(ResourceLoader.getInputStream(audioSource));
+                    AudioInputStream stream = AudioSystem.getAudioInputStream(in);
+
+                    // From URL
+//                  stream = AudioSystem.getAudioInputStream(new URL("http://hostname/audiofile"));
+
+                    // At present, ALAW and ULAW encodings must be converted
+                    // to PCM_SIGNED before it can be played
+                    AudioFormat format = stream.getFormat();
+                    if (format.getEncoding() != AudioFormat.Encoding.PCM_SIGNED) {
+                        format = new AudioFormat(
+                            AudioFormat.Encoding.PCM_SIGNED,
+                            format.getSampleRate(),
+                            format.getSampleSizeInBits()*2,
+                            format.getChannels(),
+                            format.getFrameSize()*2,
+                            format.getFrameRate(),
+                            true);        // big endian
+                        stream = AudioSystem.getAudioInputStream(format, stream);
+                    }
+
+                    // Create the clip
+                    DataLine.Info info = new DataLine.Info(
+                        Clip.class, stream.getFormat(), ((int)stream.getFrameLength()*format.getFrameSize()));
+                    Clip clip = (Clip) AudioSystem.getLine(info);
+
+                    // This method does not return until the audio file is completely loaded
+                    clip.open(stream);
+
+                    // Start playing
+                    clip.start();
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                } catch (LineUnavailableException e) {
+                    e.printStackTrace();
+                } catch (UnsupportedAudioFileException e) {
+                    e.printStackTrace();
                 }
             }
-            // From file
-            AudioInputStream stream = AudioSystem.getAudioInputStream(audioFile);
-        
-            // From URL
-//            stream = AudioSystem.getAudioInputStream(new URL("http://hostname/audiofile"));
-        
-            // At present, ALAW and ULAW encodings must be converted
-            // to PCM_SIGNED before it can be played
-            AudioFormat format = stream.getFormat();
-            if (format.getEncoding() != AudioFormat.Encoding.PCM_SIGNED) {
-                format = new AudioFormat(
-                        AudioFormat.Encoding.PCM_SIGNED,
-                        format.getSampleRate(),
-                        format.getSampleSizeInBits()*2,
-                        format.getChannels(),
-                        format.getFrameSize()*2,
-                        format.getFrameRate(),
-                        true);        // big endian
-                stream = AudioSystem.getAudioInputStream(format, stream);
-            }
-        
-            // Create the clip
-            DataLine.Info info = new DataLine.Info(
-                Clip.class, stream.getFormat(), ((int)stream.getFrameLength()*format.getFrameSize()));
-            Clip clip = (Clip) AudioSystem.getLine(info);
-        
-            // This method does not return until the audio file is completely loaded
-            clip.open(stream);
-        
-            // Start playing
-            clip.start();
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (LineUnavailableException e) {
-            e.printStackTrace();
-        } catch (UnsupportedAudioFileException e) {
-            e.printStackTrace();
-        }
+            
+        });
         
     }