Changeset 28949 in osm for applications/editors/josm/plugins

Timestamp:

2012-11-18T20:37:02+01:00 (12 years ago)

Author:

donvip

Message:

[josm_videomapping] Safeguards and error messages when the VLC library is not correctly initialized

Location:

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping

Files:

• VideoPlugin.java (modified) (2 diffs)
• video/GPSVideoPlayer.java (modified) (1 diff)
• video/VideoPlayer.java (modified) (2 diffs)

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

@@ -64 +64 @@
         private VideoPositionLayer videoPositionLayer;
         private GPSVideoPlayer gpsVideoPlayer;
+        
+        public static String VLC_VERSION = "2.0.x";
 
         public VideoPlugin(PluginInformation info) {
@@ -236 +238 @@
                 enableVideoControlMenus(true);
                 }
-                if (gpsVideoPlayer != null) {
+                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
+                        );
                 }
         }               

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

@@ -30 +30 @@
         }
 
-        public GPSVideo addVideo(File Videofile) {              
-                GPSVideo video = new GPSVideo(super.addVideo(Videofile,Integer.toString(videos.size())));
+        public GPSVideo addVideo(File videofile) {              
+                GPSVideo video = new GPSVideo(super.addVideo(videofile,Integer.toString(videos.size())));
                 enableSingleVideoMode(true);
                 videos.add(video);

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

@@ -66 +66 @@
         }
         
-        public Video addVideo(File Videofile, String id)
-        {
-                Video video = new Video(Videofile,id,videoengine.mediaPlayerFactory);
+        public Video addVideo(File videofile, String id) {
+                Video video = new Video(videofile,id,videoengine.mediaPlayerFactory);
                 canvasPanel.add(video.panel);
                 video.canvas.setSize(new Dimension(300, 300)); // will be updated by the video engine itself
@@ -374 +373 @@
         }
     
-
-    
-
+        public boolean isCorrectlyInitiliazed() {
+            return videoengine != null && videoengine.mediaPlayerFactory != null;
+        }
 }