Changeset 572 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

Timestamp:

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

Author:

david

Message:

Reorganise audio interface in light of recent usability comments

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (15 diffs)

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;
         }