Mercurial > mplayer.hg

comparison Gui/interface.c @ 9314:f38fe55d0e05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b78cd2e33d2c
children 20f0a254142d
comparison
equal deleted inserted replaced
9313:92dbac2e0b79 9314:f38fe55d0e05
38 #include "../libmpdemux/demuxer.h" 38 #include "../libmpdemux/demuxer.h"
39 #include "../libmpdemux/stheader.h" 39 #include "../libmpdemux/stheader.h"
40 #include "../libmpcodecs/dec_video.h" 40 #include "../libmpcodecs/dec_video.h"
41 41
42 guiInterface_t guiIntfStruct; 42 guiInterface_t guiIntfStruct;
43 int guiWinID=-1;
43 44
44 char * gstrcat( char ** dest,char * src ) 45 char * gstrcat( char ** dest,char * src )
45 { 46 {
46 char * tmp = NULL; 47 char * tmp = NULL;
47 48
195 } 196 }
196 197
197 if (WinID>0) 198 if (WinID>0)
198 { 199 {
199 appMPlayer.subWindow.Parent=WinID; 200 appMPlayer.subWindow.Parent=WinID;
200 appMPlayer.mainWindow.Parent=WinID;
201 appMPlayer.sub.x=0; 201 appMPlayer.sub.x=0;
202 appMPlayer.sub.y=0; 202 appMPlayer.sub.y=0;
203 } 203 }
204 if (guiWinID>=0)
205 appMPlayer.mainWindow.Parent=guiWinID;
204 206
205 wsCreateWindow( &appMPlayer.subWindow, 207 wsCreateWindow( &appMPlayer.subWindow,
206 appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height, 208 appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height,
207 wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"MPlayer - Video" ); 209 wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"MPlayer - Video" );
208 210
515 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight ); 517 wsResizeWindow( &appMPlayer.subWindow,vo_dwidth,vo_dheight );
516 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y ); 518 wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
517 } 519 }
518 guiIntfStruct.MovieWidth=vo_dwidth; 520 guiIntfStruct.MovieWidth=vo_dwidth;
519 guiIntfStruct.MovieHeight=vo_dheight; 521 guiIntfStruct.MovieHeight=vo_dheight;
520 if (WinID>0) 522 if (guiWinID>=0)
521 wsMoveWindow( &appMPlayer.mainWindow,0,0, vo_dheight); 523 wsMoveWindow( &appMPlayer.mainWindow,0,0, vo_dheight);
522 } 524 }
523 break; 525 break;
524 #ifdef USE_DVDREAD 526 #ifdef USE_DVDREAD
525 case guiSetDVD: 527 case guiSetDVD: