Changeset 12565 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2017-08-03T23:51:18+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
r12328 r12565 11 11 12 12 import org.openstreetmap.josm.Main; 13 import org.openstreetmap.josm.actions.JosmAction;14 13 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 15 14 import org.openstreetmap.josm.io.audio.AudioPlayer; … … 21 20 * @since 547 22 21 */ 23 public class AudioBackAction extends JosmAction {22 public class AudioBackAction extends AbstractAudioAction { 24 23 25 24 /** -
trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java
r12328 r12565 6 6 7 7 import org.openstreetmap.josm.Main; 8 import org.openstreetmap.josm.actions.JosmAction;9 8 import org.openstreetmap.josm.io.audio.AudioPlayer; 10 9 import org.openstreetmap.josm.io.audio.AudioUtil; … … 15 14 * @since 563 16 15 */ 17 public abstract class AudioFastSlowAction extends JosmAction {16 public abstract class AudioFastSlowAction extends AbstractAudioAction { 18 17 19 18 private double multiplier; -
trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java
r12328 r12565 10 10 11 11 import org.openstreetmap.josm.Main; 12 import org.openstreetmap.josm.actions.JosmAction;13 12 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 14 13 import org.openstreetmap.josm.io.audio.AudioPlayer; … … 20 19 * @since 547 21 20 */ 22 public class AudioFwdAction extends JosmAction {21 public class AudioFwdAction extends AbstractAudioAction { 23 22 24 23 /** -
trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java
r6830 r12565 8 8 import java.awt.event.KeyEvent; 9 9 10 import org.openstreetmap.josm.actions.JosmAction;11 10 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 12 11 import org.openstreetmap.josm.tools.Shortcut; … … 17 16 * @since 547 18 17 */ 19 public class AudioNextAction extends JosmAction {18 public class AudioNextAction extends AbstractAudioAction { 20 19 21 20 /** -
trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java
r12328 r12565 10 10 import java.net.URL; 11 11 12 import org.openstreetmap.josm.actions.JosmAction;13 12 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker; 14 13 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; … … 24 23 * @since 547 25 24 */ 26 public class AudioPlayPauseAction extends JosmAction {25 public class AudioPlayPauseAction extends AbstractAudioAction { 27 26 28 27 /** -
trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java
r6830 r12565 8 8 import java.awt.event.KeyEvent; 9 9 10 import org.openstreetmap.josm.actions.JosmAction;11 10 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 12 11 import org.openstreetmap.josm.tools.Shortcut; … … 17 16 * @since 547 18 17 */ 19 public class AudioPrevAction extends JosmAction {18 public class AudioPrevAction extends AbstractAudioAction { 20 19 21 20 /** -
trunk/src/org/openstreetmap/josm/io/audio/AudioPlayer.java
r12328 r12565 168 168 public static boolean paused() { 169 169 AudioPlayer instance = AudioPlayer.getInstance(); 170 return instance == null ? false : (instance.state == State.PAUSED);170 return instance != null && instance.state == State.PAUSED; 171 171 } 172 172 … … 177 177 public static boolean playing() { 178 178 AudioPlayer instance = AudioPlayer.getInstance(); 179 return instance == null ? false : (instance.state == State.PLAYING);179 return instance != null && instance.state == State.PLAYING; 180 180 } 181 181
Note:
See TracChangeset
for help on using the changeset viewer.