Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (revision 29536) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (revision 29769) @@ -48,7 +48,7 @@ //Here we manage properties and start the other classes public class VideoPlugin extends Plugin implements LayerChangeListener{ - private JMenu VMenu,VDeinterlacer; - private JosmAction VAdd,/*VRemove,*/VStart,Vbackward,Vforward,VJump,Vfaster,Vslower,Vloop; - private JRadioButtonMenuItem VIntBob,VIntNone,VIntLinear; + private JMenu VMenu,VDeinterlacer; + private JosmAction VAdd,/*VRemove,*/VStart,Vbackward,Vforward,VJump,Vfaster,Vslower,Vloop; + private JRadioButtonMenuItem VIntBob,VIntNone,VIntLinear; private JCheckBoxMenuItem VCenterIcon,VSubTitles; private JMenuItem VJumpLength,VLoopLength; @@ -61,35 +61,36 @@ private Integer jumpLength,loopLength; private String mostRecentFolder; - private GpxLayer gpsLayer; - private VideoPositionLayer videoPositionLayer; - private GPSVideoPlayer gpsVideoPlayer; - - public static String VLC_VERSION = "2.0.x"; - - public VideoPlugin(PluginInformation info) { - super(info); - VideoEngine.setupPlayer(); - MapView.addLayerChangeListener(this); - createMenusAndShortCuts(); - enableVideoControlMenus(false); - setDefaults(); - loadProperties(); - } - - private void createMenusAndShortCuts() { - VMenu = Main.main.menu.addMenu(marktr("Video"), KeyEvent.VK_D, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping")); - VMenu.setEnabled(false); - VAdd= new JosmAction(tr("Import Video"),"videomapping",tr("Sync a video against this GPS track"),null,false) { - public void actionPerformed(ActionEvent arg0) { + private GpxLayer gpsLayer; + private VideoPositionLayer videoPositionLayer; + private GPSVideoPlayer gpsVideoPlayer; + + public static String VLC_VERSION = "2.0.x"; + + public VideoPlugin(PluginInformation info) { + super(info); + VideoEngine.setupPlayer(); + MapView.addLayerChangeListener(this); + createMenusAndShortCuts(); + enableVideoControlMenus(false); + setDefaults(); + loadProperties(); + } + + private void createMenusAndShortCuts() { + boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; + VMenu = Main.main.menu.addMenu(marktr("Video"), oldMenu?KeyEvent.VK_D: KeyEvent.VK_Q, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping")); + VMenu.setEnabled(false); + VAdd= new JosmAction(tr("Import Video"),"videomapping",tr("Sync a video against this GPS track"),null,false) { + @Override public void actionPerformed(ActionEvent arg0) { importVideoFile(); } }; /*VRemove=*/ new JosmAction(tr("Remove Video"),"videomapping",tr("removes current video from layer"),null,false) { - public void actionPerformed(ActionEvent arg0) { + @Override public void actionPerformed(ActionEvent arg0) { } }; VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"), Shortcut.registerShortcut("videomapping:startstop",tr("Video: {0}", tr("Play/Pause")),KeyEvent.VK_NUMPAD5, Shortcut.DIRECT), false, "vm_play_pause",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.pause(); @@ -99,5 +100,5 @@ Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"), Shortcut.registerShortcut("videomapping:backward",tr("Video: {0}", tr("Backward")),KeyEvent.VK_NUMPAD4, Shortcut.DIRECT), false, "vm_prev",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.backward(); @@ -107,5 +108,5 @@ Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"), Shortcut.registerShortcut("videomapping:forward",tr("Video: {0}", tr("Forward")),KeyEvent.VK_NUMPAD6, Shortcut.DIRECT), false, "vm_next",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.forward(); @@ -116,5 +117,5 @@ Shortcut.registerShortcut("videomapping:faster",tr("Video: {0}", tr("Faster")),KeyEvent.VK_NUMPAD8, Shortcut.DIRECT), false, "vm_faster",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.setSpeed(gpsVideoPlayer.getSpeed()+20); @@ -125,5 +126,5 @@ Shortcut.registerShortcut("videomapping:slower",tr("Video: {0}", tr("Slower")),KeyEvent.VK_NUMPAD2, Shortcut.DIRECT), false, "vm_slower",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.setSpeed(gpsVideoPlayer.getSpeed()-20); @@ -132,5 +133,5 @@ }; VJump= new JosmAction(tr("Jump To"), "jumpto", tr("jumps to the entered gps time"),null, false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { showJumpTo(); } @@ -140,5 +141,5 @@ Vloop= new JosmAction(tr("Loop"), "loop", tr("loops n sec around current position"), Shortcut.registerShortcut("videomapping:loop",tr("Video: {0}", tr("Loop")),KeyEvent.VK_NUMPAD7, Shortcut.DIRECT), false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.toggleLooping(); @@ -149,5 +150,5 @@ //now the options menu VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), (String)null, tr("follows the video icon automaticly"),null, false,"vm_keepcentered",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (videoPositionLayer != null) { videoPositionLayer.setAutoCenter(VCenterIcon.isSelected()); @@ -157,5 +158,5 @@ VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), (String)null, tr("Show subtitles in video"),null, false,"vm_subtitles",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.setSubtitles(VSubTitles.isSelected()); @@ -165,5 +166,5 @@ VJumpLength = new JMenuItem(new JosmAction(tr("Jump length"), (String)null, tr("Set the length of a jump"),null, false,"vm_jumplen",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { Object[] possibilities = {"200", "500", "1000", "2000", "10000"}; String s = (String)JOptionPane.showInputDialog(Main.parent,tr("Jump in video for x ms"),tr("Jump length"),JOptionPane.QUESTION_MESSAGE,null,possibilities,jumpLength); @@ -174,5 +175,5 @@ VLoopLength = new JMenuItem(new JosmAction(tr("Loop length"), (String)null, tr("Set the length around a looppoint"),null, false,"vm_looplen",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { Object[] possibilities = {"500", "1000", "3000", "5000", "10000"}; String s = (String)JOptionPane.showInputDialog(Main.parent,tr("Jump in video for x ms"),tr("Loop length"),JOptionPane.QUESTION_MESSAGE,null,possibilities,loopLength); @@ -184,5 +185,5 @@ VDeinterlacer= new JMenu("Deinterlacer"); VIntNone= new JRadioButtonMenuItem(new JosmAction(tr("none"), (String)null, tr("no deinterlacing"),null, false,"vm_deinterlacer",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.setDeinterlacer(null); @@ -191,5 +192,5 @@ }); VIntBob= new JRadioButtonMenuItem(new JosmAction("bob", (String)null, tr("deinterlacing using line doubling"),null, false,"vm_bobdeinterlace",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.setDeinterlacer(DeinterlaceMode.BOB); @@ -198,5 +199,5 @@ }); VIntLinear= new JRadioButtonMenuItem(new JosmAction("linear", (String)null, tr("deinterlacing using linear interpolation"),null, false,"vm_lineardeinterlace",false) { - public void actionPerformed(ActionEvent e) { + @Override public void actionPerformed(ActionEvent e) { if (gpsVideoPlayer != null) { gpsVideoPlayer.setDeinterlacer(DeinterlaceMode.LINEAR); @@ -223,32 +224,31 @@ } - protected void importVideoFile() { - JFileChooser fc = new JFileChooser(mostRecentFolder); + protected void importVideoFile() { + JFileChooser fc = new JFileChooser(mostRecentFolder); fc.setSelectedFile(new File(mostRecentFolder)); if (fc.showOpenDialog(Main.parent) != JFileChooser.CANCEL_OPTION) { - mostRecentFolder=fc.getSelectedFile().getAbsolutePath(); - saveProperties(); - if (videoPositionLayer == null && gpsLayer != null) { - videoPositionLayer = new VideoPositionLayer(gpsLayer); - gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer); - gpsVideoPlayer.setJumpLength(jumpLength); - gpsVideoPlayer.setLoopLength(loopLength); - enableVideoControlMenus(true); - } - if (gpsVideoPlayer != null && gpsVideoPlayer.isCorrectlyInitiliazed()) { - gpsVideoPlayer.addVideo(fc.getSelectedFile()); - } else { + mostRecentFolder=fc.getSelectedFile().getAbsolutePath(); + saveProperties(); + if (videoPositionLayer == null && gpsLayer != null) { + videoPositionLayer = new VideoPositionLayer(gpsLayer); + gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer); + gpsVideoPlayer.setJumpLength(jumpLength); + gpsVideoPlayer.setLoopLength(loopLength); + enableVideoControlMenus(true); + } + if (gpsVideoPlayer != null && gpsVideoPlayer.isCorrectlyInitiliazed()) { + gpsVideoPlayer.addVideo(fc.getSelectedFile()); + } else { JOptionPane.showMessageDialog(Main.parent, - tr("VLC library is not correctly initialized."+ - " Please check that VLC {0} is correctly installed on your system."+ - " Its architecture (32/64 bits) must also be the same as the JRE that runs JOSM.", VLC_VERSION), - tr("Error"), JOptionPane.ERROR_MESSAGE - ); - } + tr("VLC library is not correctly initialized."+ + " Please check that VLC {0} is correctly installed on your system."+ + " Its architecture (32/64 bits) must also be the same as the JRE that runs JOSM.", VLC_VERSION), + tr("Error"), JOptionPane.ERROR_MESSAGE); + } } - } - - private void enableVideoControlMenus(boolean b) { - VStart.setEnabled(b); + } + + private void enableVideoControlMenus(boolean b) { + VStart.setEnabled(b); Vbackward.setEnabled(b); Vforward.setEnabled(b); @@ -257,15 +257,15 @@ Vslower.setEnabled(b); VJump.setEnabled(b); - } + } - private void setDefaults() { - autoCenter=false; + private void setDefaults() { + autoCenter=false; // deinterlacer=""; - jumpLength=1000; - loopLength=6000; - mostRecentFolder=System.getProperty("user.home"); - } + jumpLength=1000; + loopLength=6000; + mostRecentFolder=System.getProperty("user.home"); + } - private void loadProperties() { + private void loadProperties() { String temp; temp=Main.pref.get(PROP_AUTOCENTER); @@ -283,5 +283,5 @@ } - private void saveProperties(){ + private void saveProperties(){ Main.pref.put(PROP_AUTOCENTER, autoCenter); Main.pref.put(PROP_JUMPLENGTH, jumpLength.toString()); @@ -290,48 +290,48 @@ } - private void showJumpTo() - { - try { - JOptionPane d=new JOptionPane(tr("Jump to"), JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION); - SimpleDateFormat gpsTimeFormat= new SimpleDateFormat("HH:mm:ss"); - String timerange=gpsTimeFormat.format(videoPositionLayer.getFirstWayPoint().getTime())+" - "; - timerange=timerange+gpsTimeFormat.format(videoPositionLayer.getLastWayPoint().getTime()); - d.add(new JLabel(timerange)); //TODO for some reason this doesn't work -> use dialog - final JFormattedTextField inp = new JFormattedTextField(new MaskFormatter("##:##:##")); - inp.setText(gpsTimeFormat.format( videoPositionLayer.getGPSDate())); - inp.setInputVerifier(new InputVerifier() { - @Override - public boolean verify(JComponent input) { - return false; - } - }); - //hack to set the focus - SwingUtilities.invokeLater(new Runnable() { - public void run() { - inp.requestFocus(); - inp.setCaretPosition(0); - } - }); - if (JOptionPane.showConfirmDialog(Main.panel,inp, tr("Jump to GPS time"),JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) - { - //add the day to the time - Date t = gpsTimeFormat.parse(inp.getText()); - Calendar time = Calendar.getInstance(); - Calendar date = Calendar.getInstance(); - time.setTime(t); - date.setTime(videoPositionLayer.getFirstWayPoint().getTime()); - time.set(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DATE)); - if (t!=null) - { - videoPositionLayer.jump(time.getTime()); - } - } + private void showJumpTo() { + try { + JOptionPane d=new JOptionPane(tr("Jump to"), JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION); + SimpleDateFormat gpsTimeFormat= new SimpleDateFormat("HH:mm:ss"); + String timerange=gpsTimeFormat.format(videoPositionLayer.getFirstWayPoint().getTime())+" - "; + timerange=timerange+gpsTimeFormat.format(videoPositionLayer.getLastWayPoint().getTime()); + d.add(new JLabel(timerange)); //TODO for some reason this doesn't work -> use dialog + final JFormattedTextField inp = new JFormattedTextField(new MaskFormatter("##:##:##")); + inp.setText(gpsTimeFormat.format( videoPositionLayer.getGPSDate())); + inp.setInputVerifier(new InputVerifier() { + @Override + public boolean verify(JComponent input) { + return false; + } + }); + //hack to set the focus + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + inp.requestFocus(); + inp.setCaretPosition(0); + } + }); + if (JOptionPane.showConfirmDialog(Main.panel,inp, tr("Jump to GPS time"),JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) + { + //add the day to the time + Date t = gpsTimeFormat.parse(inp.getText()); + Calendar time = Calendar.getInstance(); + Calendar date = Calendar.getInstance(); + time.setTime(t); + date.setTime(videoPositionLayer.getFirstWayPoint().getTime()); + time.set(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DATE)); + if (t!=null) + { + videoPositionLayer.jump(time.getTime()); + } + } } catch (ParseException e1) { - e1.printStackTrace(); + e1.printStackTrace(); } - } - - - public void activeLayerChange(Layer oldLayer, Layer newLayer) { + } + + @Override + public void activeLayerChange(Layer oldLayer, Layer newLayer) { VMenu.setEnabled(true); if (newLayer instanceof GpxLayer) @@ -343,14 +343,14 @@ } - public void layerAdded(Layer arg0) { - activeLayerChange(null,arg0); - - } - - public void layerRemoved(Layer arg0) { - if(arg0 instanceof VideoPositionLayer) - enableVideoControlMenus(false); - activeLayerChange(null,arg0); - - } + @Override + public void layerAdded(Layer arg0) { + activeLayerChange(null,arg0); + } + + @Override + public void layerRemoved(Layer arg0) { + if(arg0 instanceof VideoPositionLayer) + enableVideoControlMenus(false); + activeLayerChange(null,arg0); + } } 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 29536) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (revision 29769) @@ -42,4 +42,5 @@ syncButton.setBackground(Color.RED); syncButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { resync(e); Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (revision 29536) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (revision 29769) @@ -319,7 +319,6 @@ } - public void backward(MediaPlayer arg0) { - - } + @Override + public void backward(MediaPlayer arg0) { } /* public void buffering(MediaPlayer arg0) { @@ -327,19 +326,15 @@ } */ - public void error(MediaPlayer arg0) { - - } - - public void finished(MediaPlayer arg0) { - - } - - public void forward(MediaPlayer arg0) { - - } - - public void lengthChanged(MediaPlayer arg0, long arg1) { - - } + @Override + public void error(MediaPlayer arg0) { } + + @Override + public void finished(MediaPlayer arg0) { } + + @Override + public void forward(MediaPlayer arg0) { } + + @Override + public void lengthChanged(MediaPlayer arg0, long arg1) { } /* public void mediaChanged(MediaPlayer arg0) { @@ -353,43 +348,33 @@ } */ - public void opening(MediaPlayer arg0) { - - } - - public void pausableChanged(MediaPlayer arg0, int arg1) { - - } - - public void paused(MediaPlayer arg0) { - - } - - public void playing(MediaPlayer arg0) { - - } - - public void positionChanged(MediaPlayer arg0, float arg1) { - - } - - public void seekableChanged(MediaPlayer arg0, int arg1) { - - } - - public void snapshotTaken(MediaPlayer arg0, String arg1) { - - } - - public void stopped(MediaPlayer arg0) { - - } - - public void timeChanged(MediaPlayer arg0, long arg1) { - - } - - public void titleChanged(MediaPlayer arg0, int arg1) { - - } + @Override + public void opening(MediaPlayer arg0) { } + + @Override + public void pausableChanged(MediaPlayer arg0, int arg1) { } + + @Override + public void paused(MediaPlayer arg0) { } + + @Override + public void playing(MediaPlayer arg0) { } + + @Override + public void positionChanged(MediaPlayer arg0, float arg1) { } + + @Override + public void seekableChanged(MediaPlayer arg0, int arg1) { } + + @Override + public void snapshotTaken(MediaPlayer arg0, String arg1) { } + + @Override + public void stopped(MediaPlayer arg0) { } + + @Override + public void timeChanged(MediaPlayer arg0, long arg1) { } + + @Override + public void titleChanged(MediaPlayer arg0, int arg1) { } public boolean isNoVideoPlaying() { Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java (revision 29536) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java (revision 29769) @@ -30,5 +30,6 @@ import uk.co.caprica.vlcj.player.DeinterlaceMode; -//basic UI of a videoplayer for multiple videos incl. notifications +/** basic UI of a videoplayer for multiple videos incl. notifications + */ public class VideoPlayer extends JFrame implements WindowListener, VideosObserver, VideoPlayerObserver { private static final int notificationIntervall = 500; @@ -205,5 +206,5 @@ play.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { + @Override public void actionPerformed(ActionEvent arg0) { pause(); } @@ -212,5 +213,5 @@ back.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { + @Override public void actionPerformed(ActionEvent arg0) { backward(); } @@ -219,5 +220,5 @@ forward.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { + @Override public void actionPerformed(ActionEvent arg0) { forward(); } @@ -226,5 +227,5 @@ loop.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { + @Override public void actionPerformed(ActionEvent arg0) { toggleLooping(); } @@ -233,5 +234,5 @@ mute.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { + @Override public void actionPerformed(ActionEvent arg0) { mute(); } @@ -239,4 +240,5 @@ timeline.addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { //skip events, fired by this sliede, one cycle ago @@ -252,4 +254,5 @@ speed.addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent arg0) { if(!speed.getValueIsAdjusting()) @@ -311,58 +314,50 @@ } - public void windowActivated(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - public void windowClosed(WindowEvent arg0) { - - } - + @Override + public void windowActivated(WindowEvent arg0) { } + + @Override + public void windowClosed(WindowEvent arg0) { } + + @Override public void windowClosing(WindowEvent arg0) { videoengine.unload(); } - public void windowDeactivated(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - public void windowDeiconified(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - public void windowIconified(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - - public void windowOpened(WindowEvent arg0) { - // TODO Auto-generated method stub - - } - + @Override + public void windowDeactivated(WindowEvent arg0) { } + + @Override + public void windowDeiconified(WindowEvent arg0) { } + + @Override + public void windowIconified(WindowEvent arg0) { } + + @Override + public void windowOpened(WindowEvent arg0) { } + + @Override public void update(VideoObserversEvents event) { - switch (event) - { - case resizing: - { - pack(); - break; - } - case speeding: - { - speed.setValue(videoengine.getSpeed()); - break; - } - case jumping: - { - break; - } - } + switch (event) + { + case resizing: + { + pack(); + break; + } + case speeding: + { + speed.setValue(videoengine.getSpeed()); + break; + } + case jumping: + { + break; + } + } } //keep internal controls up to date during playback + @Override public void update_plays() { timeline.setValue(videoengine.getPosition()); Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayerObserver.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayerObserver.java (revision 29536) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayerObserver.java (revision 29769) @@ -1,7 +1,7 @@ package org.openstreetmap.josm.plugins.videomapping.video; -//update mechanism for GPS position, title bar,... +/** Update mechanism for GPS position, title bar,... + */ public interface VideoPlayerObserver { public void update_plays(); - } Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideosObserver.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideosObserver.java (revision 29536) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideosObserver.java (revision 29769) @@ -1,8 +1,7 @@ package org.openstreetmap.josm.plugins.videomapping.video; -//getting basic control informations per video +/** Getting basic control informations per video + */ public interface VideosObserver { - void update(VideoObserversEvents event); - }