Index: /applications/editors/josm/plugins/videomapping/resources/icon_jumpto.svg
===================================================================
--- /applications/editors/josm/plugins/videomapping/resources/icon_jumpto.svg (revision 23173)
+++ /applications/editors/josm/plugins/videomapping/resources/icon_jumpto.svg (revision 23173)
@@ -0,0 +1,103 @@
+
+
+
+
Index: /applications/editors/josm/plugins/videomapping/resources/icon_loop.svg
===================================================================
--- /applications/editors/josm/plugins/videomapping/resources/icon_loop.svg (revision 23173)
+++ /applications/editors/josm/plugins/videomapping/resources/icon_loop.svg (revision 23173)
@@ -0,0 +1,99 @@
+
+
+
+
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/GpsPlayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/GpsPlayer.java (revision 23172)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/GpsPlayer.java (revision 23173)
@@ -347,5 +347,6 @@
public void jump(long relTime) {
int pos = Math.round(relTime/1000);//TODO ugly quick hack
- jump(pos);
+ jump(pos);
+ //if (autoCenter) Main.map.mapView.
}
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java (revision 23172)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java (revision 23173)
@@ -268,5 +268,9 @@
{
player.jump(wp);
- if(gps!=null) notifyObservers(player.getRelativeTime()); //call videoplayer to set rigth position
+ //jump if we know position
+ if(wp.attr.containsKey("synced"))
+ {
+ if(gps!=null) notifyObservers(player.getRelativeTime()); //call videoplayers to set right position
+ }
}
}
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java (revision 23172)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java (revision 23173)
@@ -147,6 +147,6 @@
};
- VStart = new JosmAction(tr("play/pause"), "audio-playpause", tr("starts/pauses video playback"),
- Shortcut.registerShortcut("videomapping:startstop","",KeyEvent.VK_SPACE, Shortcut.GROUP_DIRECT), false) {
+ VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"),
+ Shortcut.registerShortcut("videomapping:startstop","",KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {
public void actionPerformed(ActionEvent e) {
@@ -154,12 +154,6 @@
}
};
- Vbackward = new JosmAction(tr("backward"), "audio-prev", tr("jumps n sec back"),
+ Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"),
Shortcut.registerShortcut("videomapping:backward","",KeyEvent.VK_NUMPAD4, Shortcut.GROUP_DIRECT), false) {
-
- /**
- *
- */
- private static final long serialVersionUID = -1060444361541900464L;
-
public void actionPerformed(ActionEvent e) {
player.backward();
@@ -167,5 +161,5 @@
}
};
- Vbackward = new JosmAction(tr("jump"), null, tr("jumps to the entered gps time"),null, false) {
+ Vbackward = new JosmAction(tr("Jump To"), null, tr("jumps to the entered gps time"),null, false) {
public void actionPerformed(ActionEvent e) {
String s =JOptionPane.showInputDialog(tr("please enter GPS timecode"),"10:07:57");
@@ -185,5 +179,5 @@
}
};
- Vforward= new JosmAction(tr("forward"), "audio-next", tr("jumps n sec forward"),
+ Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"),
Shortcut.registerShortcut("videomapping:forward","",KeyEvent.VK_NUMPAD6, Shortcut.GROUP_DIRECT), false) {
@@ -193,6 +187,6 @@
}
};
- Vfaster= new JosmAction(tr("faster"), "audio-faster", tr("faster playback"),
- Shortcut.registerShortcut("videomapping:faster","",KeyEvent.VK_PLUS, Shortcut.GROUP_DIRECT), false) {
+ Vfaster= new JosmAction(tr("Faster"), "audio-faster", tr("faster playback"),
+ Shortcut.registerShortcut("videomapping:faster","",KeyEvent.VK_NUMPAD8, Shortcut.GROUP_DIRECT), false) {
public void actionPerformed(ActionEvent e) {
@@ -201,6 +195,6 @@
}
};
- Vslower= new JosmAction(tr("slower"), "audio-slower", tr("slower playback"),
- Shortcut.registerShortcut("videomapping:slower","",KeyEvent.VK_MINUS, Shortcut.GROUP_DIRECT), false) {
+ Vslower= new JosmAction(tr("Slower"), "audio-slower", tr("slower playback"),
+ Shortcut.registerShortcut("videomapping:slower","",KeyEvent.VK_NUMPAD2, Shortcut.GROUP_DIRECT), false) {
public void actionPerformed(ActionEvent e) {
@@ -209,6 +203,6 @@
}
};
- Vloop= new JosmAction(tr("loop"), "clock", tr("loops n sec around current position"),
- Shortcut.registerShortcut("videomapping:loop","",KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {
+ Vloop= new JosmAction(tr("Loop"), null, tr("loops n sec around current position"),
+ Shortcut.registerShortcut("videomapping:loop","",KeyEvent.VK_NUMPAD7, Shortcut.GROUP_DIRECT), false) {
public void actionPerformed(ActionEvent e) {
@@ -219,8 +213,9 @@
//now the options menu
- VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), "cursor/crosshair", tr("follows the video icon automaticly"),null, false) {
+ VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), null, tr("follows the video icon automaticly"),null, false) {
public void actionPerformed(ActionEvent e) {
autocenter=VCenterIcon.isSelected();
+ player.setAutoCenter(autocenter);
applySettings();
saveSettings();
@@ -229,5 +224,5 @@
});
//now the options menu
- VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), "cursor/crosshair", tr("Show subtitles in video"),null, false) {
+ VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), null, tr("Show subtitles in video"),null, false) {
public void actionPerformed(ActionEvent e) {
Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java
===================================================================
--- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (revision 23172)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (revision 23173)
@@ -23,5 +23,5 @@
public class GPSVideoPlayer implements PlayerObserver{
Timer t;
- TimerTask syncGPSTrack;
+ TimerTask updateGPSTrack;
private GpsPlayer gps;
private SimpleVideoPlayer video;
@@ -64,5 +64,6 @@
public void playing(long time) {
//sync the GPS back
- if(synced) gps.jump(getGPSTime(time));
+ if(synced) gps.jump(getGPSTime(time));
+
}
@@ -187,4 +188,9 @@
}
+
+ public boolean isSynced()
+ {
+ return isSynced();
+ }
public void loop() {