Changeset 5945 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-05-08T13:22:46+02:00 (11 years ago)

Author:

stoecker

Message:

fix #8522 - remember and play last played audio marker for start/stop

File:

• trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java (modified) (2 diffs)

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

@@ -9 +9 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.tools.AudioPlayer;
@@ -40 +41 @@
                     AudioPlayer.pause();
             } else {
-                // find first audio marker to play
-                MarkerLayer.playAudio();
+                // play the last-played marker again, if there is one
+                AudioMarker lastPlayed = AudioMarker.recentlyPlayedMarker();
+                if (lastPlayed != null) {
+                    lastPlayed.play();
+                } else {
+                    // If no marker was played recently, play the first one
+                    MarkerLayer.playAudio();
+                }
             }
         } catch (Exception ex) {