diff -urN main/cfg-mplayer.h main-itrs/cfg-mplayer.h --- main/cfg-mplayer.h Wed Nov 14 08:26:28 2001 +++ main-itrs/cfg-mplayer.h Tue Nov 20 16:50:20 2001 @@ -54,6 +54,8 @@ #ifdef HAVE_X11 extern char *mDisplayName; +// Added by ITRS +extern int WinID; #endif #ifdef HAVE_AA @@ -232,5 +234,7 @@ {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, +// Added by ITRS + {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0}, {NULL, NULL, 0, 0, 0, 0} }; diff -urN main/help_mp-en.h main-itrs/help_mp-en.h --- main/help_mp-en.h Sun Nov 4 05:57:07 2001 +++ main-itrs/help_mp-en.h Tue Nov 20 16:52:22 2001 @@ -41,6 +41,7 @@ " -fps x -srate y options to change video (x fps) and audio (y Hz) rate\n" " -pp enable postprocessing filter (0-4 for DivX, 0-63 for mpegs)\n" " -nobps use alternative A-V sync method for AVI files (may help!)\n" +" -wid use exist windows for video out ( useful with plugger )\n" " -framedrop enable frame-dropping (for slow machines)\n" "\n" "Keys:\n" diff -urN main/libvo/vo_x11.c main-itrs/libvo/vo_x11.c --- main/libvo/vo_x11.c Mon Nov 19 23:51:17 2001 +++ main-itrs/libvo/vo_x11.c Tue Nov 20 16:58:26 2001 @@ -72,6 +72,9 @@ static XWindowAttributes attribs; static int X_already_started=0; +//Added by ITRS +extern int WinID; + //static int vo_dwidth,vo_dheight; static int Flip_Flag; @@ -282,7 +285,14 @@ } #endif - mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), +// Added by ITRS + if ( WinID ){ + mywindow = (Window)WinID; + XUnmapWindow( mDisplay,mywindow ); + XChangeWindowAttributes( mDisplay,mywindow,xswamask,&xswa ); + } + else + mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), hint.x,hint.y, hint.width,hint.height, xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa ); diff -urN main/mplayer.c main-itrs/mplayer.c --- main/mplayer.c Tue Nov 20 15:53:20 2001 +++ main-itrs/mplayer.c Tue Nov 20 17:00:08 2001 @@ -236,6 +236,9 @@ int sub_auto = 1; /*DSP!!char *dsp=NULL;*/ +//Added by ITRS +int WinID; + extern char *vo_subdevice; extern char *ao_subdevice;