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

Timestamp:

2015-12-28T02:40:06+01:00 (9 years ago)

Author:

donvip

Message:

[josm_plugins] update to vlcj 3.10.0 + jna 4.1.0 (see ​https://github.com/caprica/vlcj#news)

Location:

applications/editors/josm/plugins/videomapping

Files:

• .classpath (modified) (1 diff)
• lib/vlcj-3.1.0-javadoc.jar (deleted)
• lib/vlcj-3.1.0-sources.jar (deleted)
• lib/vlcj-3.1.0.jar (deleted)
• lib/vlcj-3.10.0-javadoc.jar (added)
• lib/vlcj-3.10.0-sources.jar (added)
• lib/vlcj-3.10.0.jar (added)
• src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (modified) (22 diffs)

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

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

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

@@ -36 +36 @@
         private boolean singleVideoMode; //commands will only affect the last added video
         private Video lastAddedVideo;
-        
+
         //called at plugin start to setup library
         public static void setupPlayer() {
             String vlcInstallDir = null;
-            
+
             if (RuntimeUtil.isWindows()) {
                 vlcInstallDir = WindowsRuntimeUtil.getVlcInstallDir();
@@ -46 +46 @@
                 if (vlcInstallDir == null && arch.equals("amd64")) {
                     try {
-                        vlcInstallDir = Advapi32Util.registryGetStringValue(WinReg.HKEY_LOCAL_MACHINE, 
-                                WindowsRuntimeUtil.VLC_REGISTRY_KEY.replaceFirst("\\\\", "\\\\Wow6432Node\\\\"), 
+                        vlcInstallDir = Advapi32Util.registryGetStringValue(WinReg.HKEY_LOCAL_MACHINE,
+                                WindowsRuntimeUtil.VLC_REGISTRY_KEY.replaceFirst("\\\\", "\\\\Wow6432Node\\\\"),
                                 WindowsRuntimeUtil.VLC_INSTALL_DIR_KEY);
                     } catch (RuntimeException e) {
@@ -58 +58 @@
             // TODO
             }
-            
+
         if (vlcInstallDir != null) {
             Main.info("videomapping: found VLC install dir: "+vlcInstallDir);
@@ -66 +66 @@
         }
         }
-        
+
         public VideoEngine(Window parent) {
                 System.setProperty("logj4.configuration","file:log4j.xml"); //TODO still unsure if we can't link this to the JOSM log4j instance
@@ -82 +82 @@
         }
         }
-        
+
         public void add(Video video) {
                 try {
@@ -93 +93 @@
                 mp.addMediaPlayerEventListener(this);
                 String mediaPath = video.filename.getAbsoluteFile().toString();
-                mp.playMedia(mediaPath); 
-                //now fetching and playback starts automatically                        
+                mp.playMedia(mediaPath);
+                //now fetching and playback starts automatically
                 } catch (NoClassDefFoundError e) {
                     Main.error(tr("Unable to find JNA Java library!"));
@@ -110 +110 @@
         }
 */
-        public List<Video> getVideos() {                
+        public List<Video> getVideos() {
                 return videos;
         }
@@ -123 +123 @@
                 }
         }
-        
-        //toggles pause and play 
+
+        //toggles pause and play
         public void pause() {
                 if (singleVideoMode) {
@@ -134 +134 @@
                 }
         }
-        
+
         //ensures that all stop
         public void pauseAll() {
@@ -140 +140 @@
                         if (video.player.isPlaying())
                                 video.player.pause();
-                }       
+                }
         }
 
@@ -154 +154 @@
                         }
                 }
-                notifyObservers(VideoObserversEvents.jumping);          
+                notifyObservers(VideoObserversEvents.jumping);
         }
 
@@ -168 +168 @@
                 notifyObservers(VideoObserversEvents.jumping);
         }
-                        
+
         //TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
         public long getVideoTime() {
                 return videos.get(0).player.getTime();
         }
-        
+
         //jumps in all videos to this absolute video time percentage
         public void jumpToPosition(int percent) {
-                float position = ((float)percent/100f);
+                float position = (percent/100f);
                 if (singleVideoMode) {
                         lastAddedVideo.player.setPosition(position);
@@ -186 +186 @@
                 notifyObservers(VideoObserversEvents.jumping);
         }
-        
+
         //TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
         public int getPosition() {
                 return (int) (videos.get(0).player.getPosition()*100);
-        }       
-        
+        }
+
         public void setSpeed(int percent) {
                 if (singleVideoMode) {
-                        lastAddedVideo.player.setRate((float)(percent/100f));
-                }
-                for (Video video : videos) {
-                        video.player.setRate((float)(percent/100f));
+                        lastAddedVideo.player.setRate(percent/100f);
+                }
+                for (Video video : videos) {
+                        video.player.setRate(percent/100f);
                 }
                 notifyObservers(VideoObserversEvents.speeding);
         }
-        
+
         //TODO muss evtl. auf Rückgabe für alle Videos erweitert werden
         public int getSpeed() {
                 return (int) (videos.get(0).player.getRate()*100);
         }
-        
+
         //returns if at least one video has subtitles
         public boolean hasSubtitles() {
@@ -214 +214 @@
                 return false;
         }
-        
+
         public void setSubtitles (boolean enabled) {
                 if (enabled) {
@@ -227 +227 @@
                 }
         }
-        
+
         public void setDeinterlacer (DeinterlaceMode deinterlacer) {
                 if (singleVideoMode) {
@@ -237 +237 @@
                 }
         }
-        
+
         public static String[] getDeinterlacers() {
                 return deinterlacers;
         }
-        
+
         public void mute() {
                 if (singleVideoMode) {
@@ -250 +250 @@
                 }
         }
-        
+
         public void unload() {
                 for (Video video : videos) {
@@ -259 +259 @@
                         video.canvas=null;
                 }
-                mediaPlayerFactory.release();        
+                mediaPlayerFactory.release();
         }
 
@@ -276 +276 @@
 /*
         public void buffering(MediaPlayer arg0) {
-                
+
         }
 */
@@ -292 +292 @@
 /*
         public void mediaChanged(MediaPlayer arg0) {
-                
+
         }
 
@@ -298 +298 @@
                 Dimension org=data.getVideoDimension();
                 getVideo(mp).canvas.setSize(new Dimension((int)(org.width*initialCanvasFactor), (int)(org.height*initialCanvasFactor)));
-                notifyObservers(VideoObserversEvents.resizing);         
+                notifyObservers(VideoObserversEvents.resizing);
         }
 */
@@ -427 +427 @@
         // TODO Auto-generated method stub
     }
+
+        @Override
+        public void corked(MediaPlayer mediaPlayer, boolean corked) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void muted(MediaPlayer mediaPlayer, boolean muted) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void volumeChanged(MediaPlayer mediaPlayer, float volume) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void audioDeviceChanged(MediaPlayer mediaPlayer, String audioDevice) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void chapterChanged(MediaPlayer mediaPlayer, int newChapter) {
+                // TODO Auto-generated method stub
+
+        }
+
+        @Override
+        public void mediaSubItemTreeAdded(MediaPlayer mediaPlayer, libvlc_media_t item) {
+                // TODO Auto-generated method stub
+
+        }
 }