Changeset 14183 in josm

Timestamp:

2018-08-27T13:17:01+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16682 - deprecate JavaFX core media player to move it to new openjfx plugin

Location:

trunk/src/org/openstreetmap/josm/io/audio

Files:

• AudioPlayer.java (modified) (5 diffs)
• fx/JavaFxMediaPlayer.java (modified) (1 diff)
• fx/package-info.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/audio/AudioPlayer.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.net.URL;
+import java.util.Objects;
 
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -47 +48 @@
 
     private State state;
+    private static Class<? extends SoundPlayer> soundPlayerClass;
     private SoundPlayer soundPlayer;
     private URL playingUrl;
@@ -266 +268 @@
     }
 
+    @SuppressWarnings("unchecked")
     private AudioPlayer() {
         state = State.INITIALIZING;
@@ -273 +276 @@
         double calibration = Config.getPref().getDouble("audio.calibration", 1.0 /* default, ratio */);
         try {
-            soundPlayer = (SoundPlayer) Class.forName("org.openstreetmap.josm.io.audio.fx.JavaFxMediaPlayer")
-                    .getDeclaredConstructor().newInstance();
+            if (soundPlayerClass == null) {
+                // To remove when switching to Java 11
+                soundPlayerClass = (Class<? extends SoundPlayer>) Class.forName(
+                        "org.openstreetmap.josm.io.audio.fx.JavaFxMediaPlayer");
+            }
+            soundPlayer = soundPlayerClass.getDeclaredConstructor().newInstance();
         } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
             Logging.debug(e);
@@ -355 +362 @@
         this.playingUrl = playingUrl;
     }
+
+    /**
+     * Returns the custom sound player class, if any.
+     * @return the custom sound player class, or {@code null}
+     * @since 14183
+     */
+    public static Class<? extends SoundPlayer> getSoundPlayerClass() {
+        return soundPlayerClass;
+    }
+
+    /**
+     * Sets the custom sound player class to override default core player.
+     * Must be called before the first audio method invocation.
+     * @param playerClass custom sound player class to override default core player
+     * @since 14183
+     */
+    public static void setSoundPlayerClass(Class<? extends SoundPlayer> playerClass) {
+        if (audioPlayer != null) {
+            throw new IllegalStateException("Audio player already initialized");
+        }
+        soundPlayerClass = Objects.requireNonNull(playerClass);
+    }
 }

trunk/src/org/openstreetmap/josm/io/audio/fx/JavaFxMediaPlayer.java

@@ -34 +34 @@
  * </ul>
  * @since 12328
+ * @deprecated MP3 support moved to openjfx plugin as JavaFX is gone with Java 11.
  */
+@Deprecated
 public class JavaFxMediaPlayer implements SoundPlayer {
 

trunk/src/org/openstreetmap/josm/io/audio/fx/package-info.java

@@ -4 +4 @@
  * Provides the classes for Audio mapping features requiring JavaFX.
  * The package is distinct to ease the decoupling between JOSM and JavaFX as an optional dependence.
+ * @deprecated MP3 support moved to openjfx plugin as JavaFX is gone with Java 11.
  */
 package org.openstreetmap.josm.io.audio.fx;