Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/io/audio

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

Location:

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

Files:

• AudioPlayer.java (modified) (2 diffs)
• AudioUtil.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import java.net.URL;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -234 +234 @@
         command = new Execute();
         playingUrl = null;
-        double leadIn = Main.pref.getDouble("audio.leadin", 1.0 /* default, seconds */);
-        double calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
+        double leadIn = Config.getPref().getDouble("audio.leadin", 1.0 /* default, seconds */);
+        double calibration = Config.getPref().getDouble("audio.calibration", 1.0 /* default, ratio */);
         try {
             soundPlayer = (SoundPlayer) Class.forName("org.openstreetmap.josm.io.audio.JavaFxMediaPlayer").getConstructor().newInstance();

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -44 +45 @@
                 * audioFormat.getFrameSize() /* bytes per frame */;
             double naturalLength = filesize / bytesPerSecond;
-            double calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
+            double calibration = Config.getPref().getDouble("audio.calibration", 1.0 /* default, ratio */);
             return naturalLength / calibration;
         } catch (UnsupportedAudioFileException | IOException e) {