Changeset 33376 in osm for applications/editors/josm/plugins/videomapping

Timestamp:

2017-06-07T14:23:04+02:00 (8 years ago)

Author:

donvip

Message:

update dependencies

Location:

applications/editors/josm/plugins/videomapping

Files:

• .classpath (modified) (1 diff)
• lib/slf4j-api-1.7.25.jar (added)
• lib/slf4j-log4j12-1.7.25.jar (added)
• lib/vlcj-3.10.0-javadoc.jar (deleted)
• lib/vlcj-3.10.0-sources.jar (deleted)
• lib/vlcj-3.10.0.jar (deleted)
• lib/vlcj-3.10.1-javadoc.jar (added)
• lib/vlcj-3.10.1-sources.jar (added)
• lib/vlcj-3.10.1.jar (added)
• src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java (modified) (3 diffs)

applications/editors/josm/plugins/videomapping/.classpath

@@ -6 +6 @@
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jna"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-log4j"/>
-        <classpathentry kind="lib" path="lib/vlcj-3.10.0.jar" sourcepath="lib/vlcj-3.10.0-sources.jar">
+        <classpathentry kind="lib" path="lib/vlcj-3.10.1.jar" sourcepath="lib/vlcj-3.10.1-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-videomapping/lib/vlcj-3.10.0-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-videomapping/lib/vlcj-3.10.1-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java

@@ -276 +276 @@
     @Override
     public void backward(MediaPlayer arg0) { }
-/*
-    public void buffering(MediaPlayer arg0) {
-
-    }
-*/
+
     @Override
     public void error(MediaPlayer arg0) { }
@@ -292 +288 @@
     @Override
     public void lengthChanged(MediaPlayer arg0, long arg1) { }
-/*
+    /*
     public void mediaChanged(MediaPlayer arg0) {
 

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java

@@ -42 +42 @@
     private JToggleButton loop, mute;
     private JSlider speed;
-//    private DateFormat videoTimeFormat;
     private VideoEngine videoengine;
     private long jumpLength;
@@ -53 +52 @@
     public VideoPlayer(DateFormat videoTimeFormat) throws HeadlessException {
         super();
-//        this.videoTimeFormat=videoTimeFormat;
         //setup playback notifications
         videoengine = new VideoEngine(this);
@@ -161 +159 @@
         speed.setOrientation(Adjustable.VERTICAL);
         Hashtable<Integer, JLabel> labelTable = new Hashtable<>();
-        labelTable.put(new Integer(100), new JLabel("1x"));
-        labelTable.put(new Integer(50), new JLabel("-2x"));
-        labelTable.put(new Integer(200), new JLabel("2x"));
+        labelTable.put(100, new JLabel("1x"));
+        labelTable.put(50, new JLabel("-2x"));
+        labelTable.put(200, new JLabel("2x"));
         speed.setLabelTable(labelTable);
         speed.setPaintLabels(true);