Changeset 572 in josm for trunk/src

Timestamp:

2008-03-02T16:10:33+01:00 (17 years ago)

Author:

david

Message:

Reorganise audio interface in light of recent usability comments

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenAction.java (modified) (1 diff)
• actions/audio/AudioBackAction.java (modified) (1 diff)
• actions/mapmode/PlayHeadDragMode.java (added)
• gui/MapView.java (modified) (4 diffs)
• gui/layer/GpxLayer.java (modified) (6 diffs)
• gui/layer/markerlayer/AudioMarker.java (modified) (2 diffs)
• gui/layer/markerlayer/Marker.java (modified) (1 diff)
• gui/layer/markerlayer/MarkerLayer.java (modified) (15 diffs)
• gui/layer/markerlayer/PlayHeadMarker.java (added)
• gui/preferences/AudioPreference.java (modified) (3 diffs)
• io/GpxReader.java (modified) (1 diff)
• tools/AudioPlayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenAction.java

@@ -91 +91 @@
                         GpxLayer gpxLayer = new GpxLayer(r.data, fn);
                         Main.main.addLayer(gpxLayer);
-            MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer);
-            if (ml.data.size() > 0) {
-                Main.main.addLayer(ml);
-            }
+                        if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                                MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), file, gpxLayer);
+                                if (ml.data.size() > 0) {
+                                        Main.main.addLayer(ml);
+                                }
+                        }
 
                 } else {

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

@@ -26 +26 @@
                         amount = 10.0;
                 }
+                this.putValue("help", "Action/Back");
         }
 

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer.ModifiedChangedListener;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
 
 /**
@@ -67 +69 @@
         private ArrayList<Layer> layers = new ArrayList<Layer>();
         /**
+         * The play head marker: there is only one of these so it isn't in any specific layer
+         */
+        public PlayHeadMarker playHeadMarker = null;
+        /**
          * Direct link to the edit layer (if any) in the layers list.
          */
@@ -132 +138 @@
                         });
                 }
-
+                if (layer instanceof MarkerLayer && playHeadMarker == null)
+                        playHeadMarker = PlayHeadMarker.create();
+                
                 layers.add(layers.size(), layer);
 
@@ -211 +219 @@
                 if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight())
                         g.drawRect(x1, y1, x2-x1+1, y2-y1+1);
+                
+                if (playHeadMarker != null)
+                        playHeadMarker.paint(g, this);
+
                 super.paint(g);
         }

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

@@ -24 +24 @@
 import java.net.URLConnection;
 import java.net.UnknownHostException;
+import java.util.Iterator;
 
 import javax.swing.AbstractAction;
@@ -160 +161 @@
                 });
 
-                JMenuItem applyAudio = new JMenuItem(tr("Make Sampled Audio Layer"), ImageProvider.get("applyaudio"));
-                applyAudio.putClientProperty("help", "Action/MakeSampledAudioLayer");
-                applyAudio.addActionListener(new ActionListener() {
+                JMenuItem importAudio = new JMenuItem(tr("Import Audio"), ImageProvider.get("importaudio"));
+                importAudio.putClientProperty("help", "ImportAudio");
+                importAudio.addActionListener(new ActionListener() {
                         public void actionPerformed(ActionEvent e) {
                                 String dir = Main.pref.get("markers.lastaudiodirectory");
@@ -182 +183 @@
                                 if (sel == null)
                                         return;
-                                applyAudio(sel);
+                                importAudio(sel);
                                 Main.map.repaint();
                         }
@@ -245 +246 @@
                                 line,
                                 tagimage,
-                                applyAudio,
+                                importAudio,
                                 markersFromNamedTrackpoints,
                                 new JMenuItem(new ConvertToDataLayerAction()),
@@ -458 +459 @@
         }
 
-
         public class ConvertToDataLayerAction extends AbstractAction {
                 public ConvertToDataLayerAction() {
@@ -485 +485 @@
                 }
         }
-
+        
         /**
-         * 
-         *
+         * Makes a new marker layer derived from this GpxLayer containing at least one 
+         * audio marker which the given audio file is associated with.
+         * Markers are derived from the following
+         * (a) explict waypoints in the GPX layer, or
+         * (b) named trackpoints in the GPX layer, or
+         * (c) (in future) voice recognised markers in the sound recording
+         * (d) a single marker at the beginning of the track
+         * @param wavFile : the file to be associated with the markers in the new marker layer
          */
-        private void applyAudio(File wavFile) {
+        private void importAudio(File wavFile) {
                 String uri = "file:".concat(wavFile.getAbsolutePath());
-            double audioGapSecs = 15.0; 
-                try {
-                        audioGapSecs = Double.parseDouble(Main.pref.get("marker.audiosampleminsecs", Double.toString(audioGapSecs)));
-                } catch (NumberFormatException e) {
-                }
-            double audioGapMetres = 75.0; 
-                try {
-                        audioGapMetres = Double.parseDouble(Main.pref.get("marker.audiosampleminmetres", Double.toString(audioGapMetres)));
-                } catch (NumberFormatException e) {
-                }
-                double audioGapRadians = (audioGapMetres / 40041455.0 /* circumference of Earth in metres */) * 2.0 * Math.PI;
-                double audioGapRadiansSquared = audioGapRadians * audioGapRadians;
-                double firstTime = -1.0;
-            double prevOffset = - (audioGapSecs + 1.0); // first point always exceeds time difference
-            WayPoint prevPoint = null;
-
-            MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Sampled audio markers from {0}", name), associatedFile, me);
+            MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", name), associatedFile, me);
+
+            // (a) try explicit waypoints - unless suppressed
+            if (Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true) && 
+                data.waypoints != null && 
+                ! data.waypoints.isEmpty())
+            {
+                double firstTime = -1.0;
+                for (WayPoint w : data.waypoints) {
+                        if (firstTime < 0.0) firstTime = w.time;
+                        double offset = w.time - firstTime;
+                        String name = w.attr.containsKey("name") ? w.getString("name") :
+                                w.attr.containsKey("desc") ? w.getString("desc") :
+                                AudioMarker.inventName(offset);
+                                AudioMarker am = AudioMarker.create(w.latlon, 
+                                                name, uri, ml, w.time, offset);
+                                ml.data.add(am);                        
+                }
+            }
+
+            // (b) use explicitly named track points, again unless suppressed
+            if (ml.data.isEmpty() && 
+                Main.pref.getBoolean("marker.namedtrackpoints") && 
+                data.tracks != null && 
+                ! data.tracks.isEmpty())
+            {
+                double firstTime = -1.0;
+                for (GpxTrack track : data.tracks) {
+                        for (Collection<WayPoint> seg : track.trackSegs) {
+                                for (WayPoint w : seg) {
+                                        String name;
+                                        if (w.attr.containsKey("name"))
+                                                name = w.getString("name");
+                                        else if (w.attr.containsKey("desc"))
+                                                name = w.getString("desc");
+                                        else
+                                                continue;
+                                if (firstTime < 0.0) firstTime = w.time;
+                                double offset = w.time - firstTime;
+                                        AudioMarker am = AudioMarker.create(w.latlon, 
+                                                        name, uri, ml, w.time, offset);
+                                        ml.data.add(am);                        
+                                }
+                        }
+                }
+            }
+
+            // (c) analyse audio for spoken markers here, in due course
             
-                for (GpxTrack track : data.tracks) {
-                        for (Collection<WayPoint> seg : track.trackSegs) {
-                                for (WayPoint point : seg) {
-                                        double time = point.time;
-                                        if (firstTime < 0.0)
-                                                firstTime = time;
-                                        double offset = time - firstTime;
-                                        if (prevPoint == null ||
-                                                (offset - prevOffset > audioGapSecs &&
-                                                /* note: distance is misleading: it actually gives distance _squared_ */
-                                                point.eastNorth.distance(prevPoint.eastNorth) > audioGapRadiansSquared))
-                                        {
-                                                
-                                                AudioMarker am = AudioMarker.create(point.latlon, 
-                                                                AudioMarker.inventName(offset), uri, ml, time, offset);
-                                                ml.data.add(am);
-                                                prevPoint = point;
-                                                prevOffset = offset;
-                                        }
-                                }
-                        }
-                }
-
-        if (ml.data.size() > 0) {
+            // (d) simply add a single marker at the start of the track
+            if (ml.data.isEmpty() && 
+                data.tracks != null && 
+                    ! data.tracks.isEmpty())
+                {
+                for (GpxTrack track : data.tracks) {
+                        for (Collection<WayPoint> seg : track.trackSegs) {
+                                for (WayPoint w : seg) {
+                                AudioMarker am = AudioMarker.create(w.latlon, 
+                                                        tr("start"), uri, ml, w.time, 0.0);
+                                        ml.data.add(am);                        
+                                        break;
+                                }
+                                break;
+                        }
+                        break;
+                }
+                }
+            
+        if (! ml.data.isEmpty()) {
                 Main.main.addLayer(ml);
+        } else {
+                        JOptionPane.showMessageDialog(Main.parent, tr("Nothing available to associate audio with."));
         }
         }

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

@@ -68 +68 @@
                 
         /**
-         * Starts playing the audio associated with the marker: used in response to pressing
-         * the marker as well as indirectly 
-         *
+         * Starts playing the audio associated with the marker offset by the given amount 
+         * @param after : seconds after marker where playing should start
          */
-        public void play() {
+        public void play(double after) {
                 try {
                         // first enable tracing the audio along the track
-                        if (Main.pref.getBoolean("marker.traceaudio", true) && parentLayer != null) {
-                                parentLayer.traceAudio();
-                        }
+                        Main.map.mapView.playHeadMarker.animate();
 
-                        AudioPlayer.play(audioUrl, offset + syncOffset);
+                        AudioPlayer.play(audioUrl, offset + syncOffset + after);
                         recentlyPlayedMarker = this;
                 } catch (Exception e) {
@@ -85 +82 @@
                 }
         }
+
+        /**
+         * Starts playing the audio associated with the marker: used in response to pressing
+         * the marker as well as indirectly 
+         *
+         */
+        public void play() { play(0.0); }
 
         public void adjustOffset(double adjustment) {

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

@@ -62 +62 @@
 public class Marker implements ActionListener {
 
-        public final EastNorth eastNorth;
+        public EastNorth eastNorth;
         public final String text;
         public final Icon symbol;

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

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
+import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -67 +68 @@
         private boolean mousePressed = false;
         public GpxLayer fromLayer = null;
-        private Rectangle audioTracer = null;
+        
+        /*
         private Icon audioTracerIcon = null;
         private EastNorth playheadPosition = null;
@@ -73 +75 @@
         private static double audioAnimationInterval = 0.0; // seconds
         private static double playheadTime = -1.0;
-
+         */
         public MarkerLayer(GpxData indata, String name, File associatedFile, GpxLayer fromLayer) {
                 
@@ -161 +163 @@
                         }
                 }
-
-                if (audioTracer != null) {
-                        Point screen = Main.map.mapView.getPoint(playheadPosition);
-                        audioTracer.setLocation(screen.x, screen.y);
-                        audioTracerIcon.paintIcon(Main.map.mapView, g, screen.x, screen.y);
-                }
-        }
-
-        protected void traceAudio() {
-                if (timer == null) {
-                        audioAnimationInterval = Double.parseDouble(Main.pref.get("marker.audioanimationinterval", "1")); //milliseconds
-                        timer = new Timer((int)(audioAnimationInterval * 1000.0), new ActionListener() {
-                                public void actionPerformed(ActionEvent e) {
-                                        timerAction();
-                                }
-                        });
-                        timer.start();
-                }
-        }
-        
-        /**
-         * callback for AudioPlayer when position changes 
-         * @param position seconds into the audio stream
-         */
-        public void timerAction() {
-                AudioMarker recentlyPlayedMarker = AudioMarker.recentlyPlayedMarker();
-                if (recentlyPlayedMarker == null)
-                        return;
-                double audioTime = recentlyPlayedMarker.time + 
-                        AudioPlayer.position() - 
-                        recentlyPlayedMarker.offset -
-                        recentlyPlayedMarker.syncOffset;
-                if (Math.abs(audioTime- playheadTime) < audioAnimationInterval)
-                        return;
-                if (fromLayer == null)
-                        return;
-                /* find the pair of track points for this position (adjusted by the syncOffset)
-                 * and interpolate between them 
-                 */
-                WayPoint w1 = null;
-                WayPoint w2 = null;
-
-                for (GpxTrack track : fromLayer.data.tracks) {
-                        for (Collection<WayPoint> trackseg : track.trackSegs) {
-                                for (Iterator<WayPoint> it = trackseg.iterator(); it.hasNext();) {
-                                        WayPoint w = it.next();
-                                        if (audioTime < w.time) {
-                                                w2 = w;
-                                                break;
-                                        }
-                                        w1 = w;
-                                }
-                                if (w2 != null) break;
-                        }
-                        if (w2 != null) break;
-                }
-                
-                if (w1 == null)
-                        return;
-                playheadPosition = w2 == null ? 
-                        w1.eastNorth : 
-                        w1.eastNorth.interpolate(w2.eastNorth, 
-                                        (audioTime - w1.time)/(w2.time - w1.time));
-                
-                if (audioTracer == null) {
-                        audioTracerIcon = ImageProvider.getIfAvailable("markers",Main.pref.get("marker.audiotracericon", "audio-tracer"));
-                        audioTracer = new Rectangle(0, 0, audioTracerIcon.getIconWidth(), audioTracerIcon.getIconHeight());                     
-                }
-                playheadTime = audioTime;
-                Main.map.mapView.repaint();
         }
 
@@ -249 +181 @@
                 for (Marker mkr : data)
                         v.visit(mkr.eastNorth);
-        }
-
-        public void applyAudio(File wavFile) {
-                String uri = "file:".concat(wavFile.getAbsolutePath());
-                Collection<Marker> markers = new ArrayList<Marker>();
-            for (Marker mkr : data) {
-                AudioMarker audioMarker = mkr.audioMarkerFromMarker(uri);
-                if (audioMarker == null) {
-                        markers.add(mkr);
-                } else { 
-                    markers.add(audioMarker);
-                }
-            }
-            data.clear();
-            data.addAll(markers);
         }
 
@@ -293 +210 @@
                 });
 
-                JMenuItem applyaudio = new JMenuItem(tr("Apply Audio"), ImageProvider.get("applyaudio"));
-                applyaudio.putClientProperty("help", "Action/ApplyAudio");
-                applyaudio.addActionListener(new ActionListener(){
-                        public void actionPerformed(ActionEvent e) {
-                                String dir = Main.pref.get("markers.lastaudiodirectory");
-                                JFileChooser fc = new JFileChooser(dir);
-                                fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-                                fc.setAcceptAllFileFilterUsed(false);
-                                fc.setFileFilter(new FileFilter(){
-                                        @Override public boolean accept(File f) {
-                                                return f.isDirectory() || f.getName().toLowerCase().endsWith(".wav");
-                                        }
-                                        @Override public String getDescription() {
-                                                return tr("Wave Audio files (*.wav)");
-                                        }
-                                });
-                                fc.showOpenDialog(Main.parent);
-                                File sel = fc.getSelectedFile();
-                                if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir))
-                                        Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath());
-                                if (sel == null)
-                                        return;
-                                applyAudio(sel);
-                                Main.map.repaint();
-                        }
-                });
-
                 JMenuItem syncaudio = new JMenuItem(tr("Synchronize Audio"), ImageProvider.get("audio-sync"));
                 syncaudio.putClientProperty("help", "Action/SynchronizeAudio");
                 syncaudio.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                adjustOffsetsOnAudioMarkers();
+                                if (! AudioPlayer.paused()) {
+                                        JOptionPane.showMessageDialog(Main.parent,tr("You need to pause audio at the moment when you hear your synchronization cue."));
+                                        return;
+                                }
+                                AudioMarker recent = AudioMarker.recentlyPlayedMarker();
+                                if (synchronizeAudioMarkers(recent)) {
+                                        JOptionPane.showMessageDialog(Main.parent, tr("Audio synchronized at point " + recent.text));
+                                } else {
+                                        JOptionPane.showMessageDialog(Main.parent,tr("Unable to synchronize in layer being played."));
+                                }
                         }
                 });
@@ -332 +231 @@
                 moveaudio.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                makeAudioMarkerAtPlayHead();
+                                if (! AudioPlayer.paused()) {
+                                        JOptionPane.showMessageDialog(Main.parent,tr("You need to have paused audio at the point on the track where you want the marker."));
+                                        return;
+                                }
+                                PlayHeadMarker playHeadMarker = Main.map.mapView.playHeadMarker;
+                                if (playHeadMarker == null)
+                                        return;
+                                addAudioMarker(playHeadMarker.time, playHeadMarker.eastNorth);
+                                Main.map.mapView.repaint();
                         }
                 });
@@ -344 +251 @@
                 components.add(new JSeparator());
                 components.add(syncaudio);
-                components.add(applyaudio);
                 if (Main.pref.getBoolean("marker.traceaudio", true)) {
                         components.add (moveaudio);
@@ -354 +260 @@
         }
 
-        private void adjustOffsetsOnAudioMarkers() {
-                if (! AudioPlayer.paused()) {
-                        JOptionPane.showMessageDialog(Main.parent,tr("You need to pause audio at the moment when you hear your synchronization cue."));
-                        return;
-                }
-                Marker startMarker = AudioMarker.recentlyPlayedMarker();
-                boolean explicitMarker = true;
+        public boolean synchronizeAudioMarkers(AudioMarker startMarker) {
                 if (startMarker != null && ! data.contains(startMarker)) {
-                        explicitMarker = false;
                         startMarker = null;
                 }
@@ -368 +267 @@
                         // find the first audioMarker in this layer
                         for (Marker m : data) {
-                                if (m.getClass() == AudioMarker.class) {
-                                        startMarker = m;
+                                if (m instanceof AudioMarker) {
+                                        startMarker = (AudioMarker) m;
                                         break;
                                 }
                         }
                 }
-                if (startMarker == null) {
-                        // still no marker to work from - message?
-                        JOptionPane.showMessageDialog(Main.parent,tr("No audio marker found in the layer to synchronize with."));
-                        return;
-                }
+                if (startMarker == null)
+                        return false;
+                        
                 // apply adjustment to all subsequent audio markers in the layer
                 double adjustment = AudioPlayer.position() - startMarker.offset; // in seconds
                 boolean seenStart = false;
-                URL url = ((AudioMarker)startMarker).url();
+                URL url = startMarker.url();
                 for (Marker m : data) {
                         if (m == startMarker)
@@ -392 +289 @@
                         }
                 }
-                
-                JOptionPane.showMessageDialog(Main.parent, explicitMarker ? 
-                        tr("Audio synchronized with most recently played marker and subsequent ones (that have the same sound track).") :
-                        tr("Audio synchronized with audio markers in the layer (that have the same sound track as the first one)."));
-        }
-        
-        private void makeAudioMarkerAtPlayHead() {
-                if (! AudioPlayer.paused()) {
-                        JOptionPane.showMessageDialog(Main.parent,tr("You need to pause audio at the point on the track where you want the marker."));
-                        return;
-                }
+                return true;
+        }
+        
+        public AudioMarker addAudioMarker(double time, EastNorth en) {
                 // find first audio marker to get absolute start time
                 double offset = 0.0;
@@ -409 +299 @@
                         if (m.getClass() == AudioMarker.class) {
                                 am = (AudioMarker)m;
-                                offset = playheadTime - am.time;
+                                offset = time - am.time;
                                 break;
                         }
@@ -415 +305 @@
                 if (am == null) {
                         JOptionPane.showMessageDialog(Main.parent,tr("No existing audio markers in this layer to offset from."));
-                        return;
+                        return null;
                 }
 
                 // make our new marker
-                AudioMarker newAudioMarker = AudioMarker.create(Main.proj.eastNorth2latlon(playheadPosition), 
-                        AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, playheadTime, offset);
+                AudioMarker newAudioMarker = AudioMarker.create(Main.proj.eastNorth2latlon(en), 
+                        AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, time, offset);
                 
                 // insert it at the right place in a copy the collection
@@ -440 +330 @@
                                 newAudioMarker.adjustOffset(am.syncOffset()); // i.e. same as predecessor                               
                         newData.add(newAudioMarker); // insert at end
-                        newAudioMarker = null;
                 }
                 
@@ -446 +335 @@
                 data.clear();
                 data.addAll(newData);
-                Main.map.mapView.repaint();
+                return newAudioMarker;
         }
         

trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java

@@ -28 +28 @@
 public class AudioPreference implements PreferenceSetting {
         private JCheckBox audioMenuVisible = new JCheckBox(tr("Display the Audio menu."));
-        /*
-        private JCheckBox audioToolbarVisible = new JCheckBox(tr("Display Audio control buttons on toolbar."));
-        */
         private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers."));
         private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace."));
         private JCheckBox markersNamedTrackpoints = new JCheckBox(tr("Create audio markers from named trackpoints."));
+        private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create non-audio markers when reading GPX."));
+        private JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Import audio uses explicit waypoints."));
 
-        private JTextField audioSampleMinSecs = new JTextField(8);
-        private JTextField audioSampleMinMetres = new JTextField(8);
         private JTextField audioLeadIn = new JTextField(8);
         private JTextField audioForwardBackAmount = new JTextField(8);
@@ -91 +88 @@
                 gui.audio.add(markersNamedTrackpoints, GBC.eol().insets(0,0,0,0));
                 
-                audioSampleMinSecs.setText(Main.pref.get("marker.audiosampleminsecs", "15"));
-                audioSampleMinSecs.setToolTipText(tr("Minimum time in seconds between audio samples when creating sampled audio markers from waypoints"));
-                gui.audio.add(new JLabel(tr("Min audio marker sample rate (seconds)")), GBC.std());
-                gui.audio.add(audioSampleMinSecs, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-
-                audioSampleMinMetres.setText(Main.pref.get("marker.audiosampleminmetres", "75"));
-                audioSampleMinMetres.setToolTipText(tr("Minimum distance in metres between audio samples when creating sampled audio markers from waypoints"));
-                gui.audio.add(new JLabel(tr("Min audio marker sample rate (metres)")), GBC.std());
-                gui.audio.add(audioSampleMinMetres, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
-
+                // makeAutoMarkers
+                makeAutoMarkers.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                if (!makeAutoMarkers.isSelected())
+                                        makeAutoMarkers.setSelected(false);
+                                makeAutoMarkers.setEnabled(makeAutoMarkers.isSelected());
+                        }
+                });
+                makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
+                makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
+                gui.audio.add(makeAutoMarkers, GBC.eol().insets(0,0,0,0));
+                
+                // audioMarkersFromExplicitWaypoints
+                audioMarkersFromExplicitWaypoints.addActionListener(new ActionListener(){
+                        public void actionPerformed(ActionEvent e) {
+                                if (!audioMarkersFromExplicitWaypoints.isSelected())
+                                        audioMarkersFromExplicitWaypoints.setSelected(false);
+                                audioMarkersFromExplicitWaypoints.setEnabled(audioMarkersFromExplicitWaypoints.isSelected());
+                        }
+                });
+                audioMarkersFromExplicitWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true));
+                audioMarkersFromExplicitWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer."));
+                gui.audio.add(audioMarkersFromExplicitWaypoints, GBC.eol().insets(0,0,0,0));
+                
                 audioForwardBackAmount.setText(Main.pref.get("audio.forwardbackamount", "10"));
                 audioForwardBackAmount.setToolTipText(tr("The number of seconds to jump forward or back when the relevant button is pressed"));
@@ -129 +140 @@
                 Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected());
                 Main.pref.put("marker.namedtrackpoints", markersNamedTrackpoints.isSelected());
-                Main.pref.put("marker.audiosampleminsecs", audioSampleMinSecs.getText());               
-                Main.pref.put("marker.audiosampleminmetres", audioSampleMinMetres.getText());           
+                Main.pref.put("marker.suppressautomarkers", makeAutoMarkers.isSelected());
+                Main.pref.put("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
                 Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText());             
                 Main.pref.put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());         

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -241 +241 @@
                                         currentState = states.pop();
                                         currentTrackSeg.add(currentWayPoint);
-                                        if (Main.pref.getBoolean("marker.namedtrackpoints") && 
-                                                (currentWayPoint.attr.containsKey("name") || 
-                                                        currentWayPoint.attr.containsKey("desc"))) 
-                                        {
-                                                currentData.waypoints.add(currentWayPoint);
-                                        }
                                 } else if (qName.equals("wpt")) {
                                         currentState = states.pop();

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -305 +305 @@
                                                                 audioOutputLine.close();
                                                         audioFormat = new AudioFormat(audioFormat.getEncoding(), 
-                                                                                audioFormat.getSampleRate() * (float) speed, 
+                                                                                audioFormat.getSampleRate() * (float) (speed * calibration), 
                                                                                 audioFormat.getSampleSizeInBits(), 
                                                                                 audioFormat.getChannels(), 
                                                                                 audioFormat.getFrameSize(), 
-                                                                                audioFormat.getFrameRate() * (float) speed, 
+                                                                                audioFormat.getFrameRate() * (float) (speed * calibration), 
                                                                                 audioFormat.isBigEndian());
                                                         DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat);