diff --git a/Gui/app.h b/Gui/app.h
index 38a4a6c29f..c12258091b 100644
--- a/Gui/app.h
+++ b/Gui/app.h
@@ -58,7 +58,8 @@
 #define evLoadAudioFile	    42
 #define evSetAspect         44
 #define evSetAudio	    45
-// 46 ...
+#define evSetVideo          46
+// 47 ...
 
 #define evExit              1000
 
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index 9d69a8d106..473c1a46d7 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -244,8 +244,6 @@ drawrenderedtext:
 }
 
 extern void exit_player(char* how);
-extern int audio_id;
-extern int dvdsub_id;
 extern char * dvd_device;
 extern int vcd_track;
 extern char * cdrom_device;
@@ -277,7 +275,14 @@ void mplEventHandling( int msg,float param )
 	if ( guiIntfStruct.StreamType == STREAMTYPE_DVD ) goto play;
 	guiIntfStruct.FilenameChanged=1;
 	break;
-	
+
+   case evSetVideo:
+        if ( !guiIntfStruct.demuxer ) break;
+        video_id=(int)param;
+        if ( guiIntfStruct.StreamType == STREAMTYPE_DVD ) goto play;
+        guiIntfStruct.FilenameChanged=1;
+        break;
+
 #ifdef HAVE_VCD
    case evSetVCDTrack:
         guiIntfStruct.Track=(int)param;