Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml (revision 3961)
+++ /applications/editors/josm/plugins/surveyor/build.xml (revision 3962)
@@ -10,5 +10,5 @@
-
+
@@ -24,12 +24,9 @@
-
-
-
-
-
-
+
+
-
+
+
Index: /applications/editors/josm/plugins/surveyor/changelog.txt
===================================================================
--- /applications/editors/josm/plugins/surveyor/changelog.txt (revision 3962)
+++ /applications/editors/josm/plugins/surveyor/changelog.txt (revision 3962)
@@ -0,0 +1,7 @@
+2007-08-05: added BeepAction. Parameter is number of beeps
+
+2007-08-02: PlayAudioAction is able to read wav files from classpath and from urls
+
+ It also plays the audio file in the background, so the PlayAudioAction can
+ be set as the first action without delaying the setting of the waypoint/nodes
+ by a following SetWaypointAction.
Index: /applications/editors/josm/plugins/surveyor/resources/surveyor.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/resources/surveyor.xml (revision 3962)
+++ /applications/editors/josm/plugins/surveyor/resources/surveyor.xml (revision 3962)
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java (revision 3961)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/PlayAudioAction.java (revision 3962)
@@ -4,6 +4,7 @@
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,4 +20,5 @@
import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
+import at.dallermassl.josm.plugin.surveyor.util.ResourceLoader;
/**
@@ -27,5 +29,5 @@
*/
public class PlayAudioAction extends AbstractSurveyorAction {
- private File audioFile = null;
+ private String audioSource = null;
/* (non-Javadoc)
@@ -34,55 +36,55 @@
//@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();
- }
+
+ });
}
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java (revision 3962)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/ResourceLoader.java (revision 3962)
@@ -0,0 +1,42 @@
+/**
+ *
+ */
+package at.dallermassl.josm.plugin.surveyor.util;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * @author cdaller
+ *
+ */
+public class ResourceLoader {
+
+ private ResourceLoader() {
+
+ }
+
+ /**
+ * Returns an inputstream from urls, files and classloaders, depending on the name.
+ * @param source the source: if starting with "http://", "ftp://" or
+ * "file://" source is interpreted as an URL. If starting with "resource://"
+ * the classloader is used. All other sources are interpreted as filenames.
+ * @return the inputstream.
+ * @throws IOException if an error occurs on opening the url, or if the file is not found.
+ */
+ public static InputStream getInputStream(String source) throws IOException {
+ InputStream in = null;
+ if (source.startsWith("http://") || source.startsWith("ftp://") || source.startsWith("file:")) {
+ in = new URL(source).openStream();
+ } else if (source.startsWith("resource://")) {
+ in = ResourceLoader.class.getResourceAsStream(source.substring("resource:/".length()));
+ } else {
+ in = new FileInputStream(source);
+ }
+ System.out.println("stream for resource is " + in);
+ return in;
+ }
+
+}
Index: plications/editors/josm/plugins/surveyor/src/surveyor.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/surveyor.xml (revision 3961)
+++ (revision )
@@ -1,76 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-