Changeset 12328 in josm for trunk/src/org/openstreetmap/josm/actions/audio

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/actions/audio

Files:

• AudioBackAction.java (modified) (2 diffs)
• AudioFastSlowAction.java (modified) (2 diffs)
• AudioFwdAction.java (modified) (2 diffs)
• AudioPlayPauseAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
+import org.openstreetmap.josm.io.audio.AudioUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -40 +41 @@
                 MarkerLayer.playAudio();
         } catch (IOException | InterruptedException ex) {
-            AudioPlayer.audioMalfunction(ex);
+            AudioUtil.audioMalfunction(ex);
         }
     }

trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java

@@ -8 +8 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
+import org.openstreetmap.josm.io.audio.AudioUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -43 +44 @@
                 AudioPlayer.play(AudioPlayer.url(), AudioPlayer.position(), speed * multiplier);
         } catch (IOException | InterruptedException ex) {
-            AudioPlayer.audioMalfunction(ex);
+            AudioUtil.audioMalfunction(ex);
         }
     }

trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
+import org.openstreetmap.josm.io.audio.AudioUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -38 +39 @@
                 MarkerLayer.playAudio();
         } catch (IOException | InterruptedException ex) {
-            AudioPlayer.audioMalfunction(ex);
+            AudioUtil.audioMalfunction(ex);
         }
     }

trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
+import org.openstreetmap.josm.io.audio.AudioUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
@@ -55 +56 @@
             }
         } catch (IOException | InterruptedException ex) {
-            AudioPlayer.audioMalfunction(ex);
+            AudioUtil.audioMalfunction(ex);
         }
     }