Changeset 12328 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2017-06-07T21:41:26+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #2089 - Add support for MP3, AIFF and AAC audio codecs (.mp3, .aac, .aif, .aiff files) if Java FX is on the classpath (i.e. Windows, macOS, nearly all major Linux distributions). The classes are not public on purpose, as the whole system will have to be simplified when all Linux distributions propose Java FX and so we can get rid of old Java Sound implementation.

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• gpx/ImportAudioAction.java (modified) (4 diffs)
• markerlayer/AudioMarker.java (modified) (2 diffs)
• markerlayer/DefaultMarkerProducers.java (modified) (2 diffs)
• markerlayer/Marker.java (modified) (1 diff)
• markerlayer/PlayHeadMarker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -41 +41 @@
     private final transient GpxLayer layer;
 
-    static final class AudioFileFilter extends FileFilter {
+    /**
+     * Audio file filter.
+     * @since 12328
+     */
+    public static final class AudioFileFilter extends FileFilter {
         @Override
         public boolean accept(File f) {
-            return f.isDirectory() || Utils.hasExtension(f, "wav");
+            return f.isDirectory() || Utils.hasExtension(f, "wav", "mp3", "aac", "aif", "aiff");
         }
 
         @Override
         public String getDescription() {
-            return tr("Wave Audio files (*.wav)");
+            return tr("Audio files (*.wav, *.mp3, *.aac, *.aif, *.aiff)");
         }
     }
@@ -119 +123 @@
      * which the given audio file is associated with. Markers are derived from the following (a)
      * explict waypoints in the GPX layer, or (b) named trackpoints in the GPX layer, or (d)
-     * timestamp on the wav file (e) (in future) voice recognised markers in the sound recording (f)
+     * timestamp on the audio file (e) (in future) voice recognised markers in the sound recording (f)
      * a single marker at the beginning of the track
-     * @param wavFile the file to be associated with the markers in the new marker layer
+     * @param audioFile the file to be associated with the markers in the new marker layer
      * @param ml marker layer
      * @param firstStartTime first start time in milliseconds, used for (d)
      * @param markers keeps track of warning messages to avoid repeated warnings
      */
-    private void importAudio(File wavFile, MarkerLayer ml, double firstStartTime, Markers markers) {
-        URL url = Utils.fileToURL(wavFile);
+    private void importAudio(File audioFile, MarkerLayer ml, double firstStartTime, Markers markers) {
+        URL url = Utils.fileToURL(audioFile);
         boolean hasTracks = layer.data.tracks != null && !layer.data.tracks.isEmpty();
         boolean hasWaypoints = layer.data.waypoints != null && !layer.data.waypoints.isEmpty();
@@ -212 +216 @@
         // (d) use timestamp of file as location on track
         if (hasTracks && Main.pref.getBoolean("marker.audiofromwavtimestamps", false)) {
-            double lastModified = wavFile.lastModified() / 1000.0; // lastModified is in
-            // milliseconds
-            double duration = AudioUtil.getCalibratedDuration(wavFile);
+            double lastModified = audioFile.lastModified() / 1000.0; // lastModified is in milliseconds
+            double duration = AudioUtil.getCalibratedDuration(audioFile);
             double startTime = lastModified - duration;
             startTime = firstStartTime + (startTime - firstStartTime)
@@ -242 +245 @@
                         (startTime - w1.time) / (w2.time - w1.time)));
                 wayPointFromTimeStamp.time = startTime;
-                String name = wavFile.getName();
+                String name = audioFile.getName();
                 int dot = name.lastIndexOf('.');
                 if (dot > 0) {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
+import org.openstreetmap.josm.io.audio.AudioUtil;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
 
@@ -60 +61 @@
             recentlyPlayedMarker = this;
         } catch (IOException | InterruptedException e) {
-            AudioPlayer.audioMalfunction(e);
+            AudioUtil.audioMalfunction(e);
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/DefaultMarkerProducers.java

@@ -44 +44 @@
         if (url == null) {
             return Collections.singleton(marker);
-        } else if (urlStr.endsWith(".wav")) {
+        } else if (Utils.hasExtension(urlStr, "wav", "mp3", "aac", "aif", "aiff")) {
             final AudioMarker audioMarker = new AudioMarker(wpt.getCoor(), wpt, url, parentLayer, time, offset);
             Extensions exts = (Extensions) wpt.get(GpxConstants.META_EXTENSIONS);
@@ -55 +55 @@
             }
             return Arrays.asList(marker, audioMarker);
-        } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg")
-                || urlStr.endsWith(".gif")) {
+        } else if (Utils.hasExtension(urlStr, "png", "jpg", "jpeg", "gif")) {
             return Arrays.asList(marker, new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset));
         } else {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -53 +53 @@
  *
  * By default, one the list contains one default "Maker" implementation that
- * will create AudioMarkers for .wav files, ImageMarkers for .png/.jpg/.jpeg
+ * will create AudioMarkers for supported audio files, ImageMarkers for supported image
  * files, and WebMarkers for everything else. (The creation of a WebMarker will
  * fail if there's no valid URL in the <link> tag, so it might still make sense

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
+import org.openstreetmap.josm.io.audio.AudioUtil;
 
 /**
@@ -100 +101 @@
                 AudioPlayer.pause();
             } catch (IOException | InterruptedException ex) {
-                AudioPlayer.audioMalfunction(ex);
+                AudioUtil.audioMalfunction(ex);
             }
         }
@@ -114 +115 @@
                 AudioPlayer.pause();
             } catch (IOException | InterruptedException ex) {
-                AudioPlayer.audioMalfunction(ex);
+                AudioUtil.audioMalfunction(ex);
             }
         }