Mercurial > mplayer.hg
changeset 9314:f38fe55d0e05
this patch adds the option -guiwid to gmplayer. I think its a more clean
approach than using just wid.
Fabian Franz <FabianFranz@gmx.de>
| author | arpi |
|---|---|
| date | Fri, 07 Feb 2003 18:06:16 +0000 |
| parents | 92dbac2e0b79 |
| children | 544c285a5493 |
| files | DOCS/mplayer.1 Gui/interface.c cfg-mplayer.h |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/mplayer.1 Fri Feb 07 14:27:44 2003 +0000 +++ b/DOCS/mplayer.1 Fri Feb 07 18:06:16 2003 +0000 @@ -1454,6 +1454,10 @@ .PD 1 . .TP +.B \-guiwid <window\ id> +This tells the gui to also use a X11 window and stick itself to bottom of video, which is useful to embed an mini-GUI in a +browser (with the mplayerplug-in for instance). +.TP .B \-hue <\-100\-100> Adjust hue of video signal (default: 0). You can get colored negative of image with this option.
--- a/Gui/interface.c Fri Feb 07 14:27:44 2003 +0000 +++ b/Gui/interface.c Fri Feb 07 18:06:16 2003 +0000 @@ -40,6 +40,7 @@ #include "../libmpcodecs/dec_video.h" guiInterface_t guiIntfStruct; +int guiWinID=-1; char * gstrcat( char ** dest,char * src ) { @@ -197,10 +198,11 @@ if (WinID>0) { appMPlayer.subWindow.Parent=WinID; - appMPlayer.mainWindow.Parent=WinID; appMPlayer.sub.x=0; appMPlayer.sub.y=0; } + if (guiWinID>=0) + appMPlayer.mainWindow.Parent=guiWinID; wsCreateWindow( &appMPlayer.subWindow, appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height, @@ -517,7 +519,7 @@ } guiIntfStruct.MovieWidth=vo_dwidth; guiIntfStruct.MovieHeight=vo_dheight; - if (WinID>0) + if (guiWinID>=0) wsMoveWindow( &appMPlayer.mainWindow,0,0, vo_dheight); } break;
--- a/cfg-mplayer.h Fri Feb 07 14:27:44 2003 +0000 +++ b/cfg-mplayer.h Fri Feb 07 18:06:16 2003 +0000 @@ -107,6 +107,7 @@ #ifdef HAVE_NEW_GUI extern char * skinName; extern int enqueue; +extern int guiWinID; #endif #ifdef HAVE_ODIVX_POSTPROCESS @@ -398,6 +399,7 @@ {"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, {"enqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noenqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"guiwid", &guiWinID, CONF_TYPE_INT, 0, 0, 0, NULL}, #endif {"noloop", &loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL},