Changeset 7310 in josm

Timestamp:

2014-07-15T15:30:05+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #10266 - fix issue with audio marker synchronisation

Location:

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer

Files:

• MarkerLayer.java (modified) (3 diffs)
• PlayHeadMarker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -71 +71 @@
     public GpxLayer fromLayer = null;
     private Marker currentMarker;
+    public AudioMarker syncAudioMarker = null;
 
     public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer) {
@@ -258 +259 @@
     }
 
-    public boolean synchronizeAudioMarkers(AudioMarker startMarker) {
-        if (startMarker != null && ! data.contains(startMarker)) {
-            startMarker = null;
-        }
-        if (startMarker == null) {
+    public boolean synchronizeAudioMarkers(final AudioMarker startMarker) {
+        syncAudioMarker = startMarker;
+        if (syncAudioMarker != null && ! data.contains(syncAudioMarker)) {
+            syncAudioMarker = null;
+        }
+        if (syncAudioMarker == null) {
             // find the first audioMarker in this layer
             for (Marker m : data) {
                 if (m instanceof AudioMarker) {
-                    startMarker = (AudioMarker) m;
+                    syncAudioMarker = (AudioMarker) m;
                     break;
                 }
             }
         }
-        if (startMarker == null)
+        if (syncAudioMarker == null)
             return false;
 
         // apply adjustment to all subsequent audio markers in the layer
-        double adjustment = AudioPlayer.position() - startMarker.offset; // in seconds
+        double adjustment = AudioPlayer.position() - syncAudioMarker.offset; // in seconds
         boolean seenStart = false;
         try {
-            URI uri = startMarker.url().toURI();
+            URI uri = syncAudioMarker.url().toURI();
             for (Marker m : data) {
-                if (m == startMarker) {
+                if (m == syncAudioMarker) {
                     seenStart = true;
                 }
@@ -516 +518 @@
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        tr("Audio synchronized at point {0}.", recent.getText()),
+                        tr("Audio synchronized at point {0}.", syncAudioMarker.getText()),
                         tr("Information"),
                         JOptionPane.INFORMATION_MESSAGE

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -247 +247 @@
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("Audio synchronized at point {0}.", ca.getText()),
+                    tr("Audio synchronized at point {0}.", recent.parentLayer.syncAudioMarker.getText()),
                     tr("Information"),
                     JOptionPane.INFORMATION_MESSAGE
                     );
-            setCoor(ca.getCoor());
+            setCoor(recent.parentLayer.syncAudioMarker.getCoor());
             endDrag(false);
         } else {