Changeset 25291 in osm for applications/editors/josm

Timestamp:

2011-02-13T19:23:56+01:00 (14 years ago)

Author:

guardian

Message:

minor bugfixes: lyerchange, deployment

Location:

applications/editors/josm/plugins/videomapping

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java (modified) (3 diffs)

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

@@ -9 +9 @@
         <classpathentry kind="lib" path="lib/vlcj-1.1.5.1.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/core"/>
+        <classpathentry kind="lib" path="lib/platform.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/videomapping/build.xml

@@ -33 +33 @@
         <property name="commit.message" value="videomapping" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="3835" />
+        <property name="plugin.main.version" value="3600" />
 
 
@@ -45 +45 @@
         <!-- this is the directory where the plugin jar is copied to -->
         <property name="plugin.dist.dir"        value="../../dist"/>
-        <property name="ant.build.javac.target" value="1.5"/>
+        <property name="ant.build.javac.target" value="1.6"/>
         <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
         <property name="vlcj"                  value="lib/vlcj-1.1.5.1.jar"/>
         <property name="jna"                  value="lib/jna.jar"/>
+        <property name="platform"                  value="lib/platform.jar"/>
         <property name="log4j"                  value="lib/log4j.jar"/>
         <!--
@@ -70 +71 @@
                         <compilerarg value="-Xlint:unchecked"/>
                         <classpath>
-                                <pathelement location="${vlcj}"/> <!--Add external library -->
+                                <pathelement location="${vlcj}"/> <!--Add extra libraries -->
                                 <pathelement location="${jna}"/>
+                                <pathelement location="${platform}"/>
                                 <pathelement location="${log4j}"/>
                         </classpath>
@@ -114 +116 @@
                                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>                             
                         </manifest>
+                        <!--added to bundle libs-->
+                        <zipfileset src="lib/jna.jar" />
+                        <zipfileset src="lib/log4j.jar" />
+                        <zipfileset src="lib/platform.jar" />
+                        <zipfileset src="lib/vlcj-1.1.5.1.jar" />
                 </jar>
         </target>

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java

@@ -67 +67 @@
     public VideoMappingPlugin(PluginInformation info) {
         super(info);
+        
         MapView.addLayerChangeListener(this);
         //Register for GPS menu
         VMenu = Main.main.menu.addMenu(" Video", KeyEvent.VK_V, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));//TODO no more ugly " video" hack
+        VMenu.setEnabled(false);
         addMenuItems();
         enableControlMenus(true);
@@ -79 +81 @@
     //only use with GPS and own layers
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        System.out.println(newLayer);
+        VMenu.setEnabled(true);
         if (newLayer instanceof GpxLayer)
         {
@@ -105 +107 @@
     }
 
-    public void layerRemoved(Layer arg0) {  
+    public void layerRemoved(Layer arg0) {
+        if(Main.main.getActiveLayer()==null)    VMenu.setEnabled(false);
     } //well ok we have a local copy of the GPS track....
 
@@ -314 +317 @@
     
     
-    
     //we can only work on our own layer
     private void enableControlMenus(boolean enabled)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.plugins.videomapping.VideoObserver;
 
-//combines video and GPS playback, major control has the video player
+//extends video playback, major control has the video player
 public class GPSVideoPlayer
 {
@@ -47 +47 @@
             //do a sync
             public void actionPerformed(ActionEvent e) {
-                long diff=gps.getRelativeTime()-video.getTime();
+                long diff=gps.getRelativeTime()-video.getTime(); //FIXME differenzierter betrachten
                 file= new GPSVideoFile(file, diff);
                 syncBtn.setBackground(Color.GREEN);
@@ -105 +105 @@
         
         for (WayPoint wp : ls) {
+                wp.attr.clear();
             wp.attr.put("synced", "true");
         }   

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.videomapping.video;
 import java.awt.Adjustable;
+
 import org.apache.log4j.Logger;
 import org.apache.log4j.helpers.DateTimeDateFormat;
@@ -51 +52 @@
 import uk.co.caprica.vlcj.player.VideoMetaData;
 import uk.co.caprica.vlcj.player.embedded.*;
+import uk.co.caprica.vlcj.runtime.RuntimeUtil;
+import uk.co.caprica.vlcj.runtime.windows.WindowsRuntimeUtil;
 
 //basic class of a videoplayer for one video
@@ -73 +76 @@
     public SimpleVideoPlayer() {
         super();
-        /*TODO new EnvironmentCheckerFactory().newEnvironmentChecker().checkEnvironment();
-         * if(RuntimeUtil.isWindows()) {
-                vlcArgs.add("--plugin-path=" + WindowsRuntimeUtil.getVlcInstallDir() + "\\plugins");
-            }
-         */
         try
         {
+                //some workarounds to detect libVLC and DNA on windows        
+                if(RuntimeUtil.isWindows()) {
+                        System.setProperty("jna.library.path",WindowsRuntimeUtil.getVlcInstallDir());  //FIXME doesn't work even with this workaround!
+            }
+                System.setProperty("logj4.configuration","file:log4j.xml"); //TODO still unsure if we can't link this to the JOSM log4j instance                        
             //we don't need any options
             String[] libvlcArgs = {""};
-            String[] standardMediaOptions = {""}; 
-            
+            String[] standardMediaOptions = {""};
             //System.out.println("libvlc version: " + LibVlc.INSTANCE.libvlc_get_version());
             //setup Media Player
-            //TODO we have to deal with unloading things....
+            //TODO we have to deal with unloading things again ....
             MediaPlayerFactory mediaPlayerFactory = new MediaPlayerFactory(libvlcArgs);
             FullScreenStrategy fullScreenStrategy = new DefaultFullScreenStrategy(this);