Index: /applications/editors/josm/plugins/jna/.classpath
===================================================================
--- /applications/editors/josm/plugins/jna/.classpath	(revision 31876)
+++ /applications/editors/josm/plugins/jna/.classpath	(revision 31877)
@@ -4,6 +4,14 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry exported="true" kind="lib" path="lib/jna-3.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/platform-3.5.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jna-4.1.0.jar" sourcepath="lib/jna-4.1.0-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jna/lib/jna-4.1.0-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="lib/jna-platform-4.1.0.jar" sourcepath="lib/jna-platform-4.1.0-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jna/lib/jna-platform-4.1.0-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/videomapping/.classpath
===================================================================
--- /applications/editors/josm/plugins/videomapping/.classpath	(revision 31876)
+++ /applications/editors/josm/plugins/videomapping/.classpath	(revision 31877)
@@ -7,7 +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>
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 31876)
+++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java	(revision 31877)
@@ -36,9 +36,9 @@
 	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,6 +46,6 @@
 	        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,5 +58,5 @@
             // TODO
 	    }
-	    
+
         if (vlcInstallDir != null) {
             Main.info("videomapping: found VLC install dir: "+vlcInstallDir);
@@ -66,5 +66,5 @@
         }
 	}
-	
+
 	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,5 +82,5 @@
         }
 	}
-	
+
 	public void add(Video video) {
 		try {
@@ -93,6 +93,6 @@
 	        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,5 +110,5 @@
 	}
 */
-	public List<Video> getVideos() {		
+	public List<Video> getVideos() {
 		return videos;
 	}
@@ -123,6 +123,6 @@
 		}
 	}
-	
-	//toggles pause and play 
+
+	//toggles pause and play
 	public void pause() {
 		if (singleVideoMode) {
@@ -134,5 +134,5 @@
 		}
 	}
-	
+
 	//ensures that all stop
 	public void pauseAll() {
@@ -140,5 +140,5 @@
 			if (video.player.isPlaying())
 				video.player.pause();
-		}	
+		}
 	}
 
@@ -154,5 +154,5 @@
 			}
 		}
-		notifyObservers(VideoObserversEvents.jumping);		
+		notifyObservers(VideoObserversEvents.jumping);
 	}
 
@@ -168,13 +168,13 @@
 		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,25 +186,25 @@
 		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,5 +214,5 @@
 		return false;
 	}
-	
+
 	public void setSubtitles (boolean enabled) {
 		if (enabled) {
@@ -227,5 +227,5 @@
 		}
 	}
-	
+
 	public void setDeinterlacer (DeinterlaceMode deinterlacer) {
 		if (singleVideoMode) {
@@ -237,9 +237,9 @@
 		}
 	}
-	
+
 	public static String[] getDeinterlacers() {
 		return deinterlacers;
 	}
-	
+
 	public void mute() {
 		if (singleVideoMode) {
@@ -250,5 +250,5 @@
 		}
 	}
-	
+
 	public void unload() {
 		for (Video video : videos) {
@@ -259,5 +259,5 @@
 			video.canvas=null;
 		}
-		mediaPlayerFactory.release();        
+		mediaPlayerFactory.release();
 	}
 
@@ -276,5 +276,5 @@
 /*
 	public void buffering(MediaPlayer arg0) {
-		
+
 	}
 */
@@ -292,5 +292,5 @@
 /*
 	public void mediaChanged(MediaPlayer arg0) {
-		
+
 	}
 
@@ -298,5 +298,5 @@
 		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,3 +427,39 @@
         // 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
+
+	}
 }