Ticket #2784: audio_timestamps.diff

src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -26 +26 @@
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.TimeZone;
 
 import javax.swing.AbstractAction;
 import javax.swing.Box;
@@ -948 +949 @@
         if ((Main.pref.getBoolean("marker.audiofromwavtimestamps", false)) &&
                 data.tracks != null && ! data.tracks.isEmpty())
         {
-            double lastModified = wavFile.lastModified() / 1000.0; // lastModified is in milliseconds
+            long lastModifiedLocal = wavFile.lastModified();                 // in milliseconds
+            int offset = TimeZone.getDefault().getOffset(lastModifiedLocal); // in milliseconds
+            double lastModified = (lastModifiedLocal - offset) / 1000.0;  // in seconds
             double duration = AudioUtil.getCalibratedDuration(wavFile);
             double startTime = lastModified - duration;
             startTime = firstStartTime + (startTime - firstStartTime) /