[MPlayer-cvslog] CVS: main/libvo video_out.c, 1.95, 1.96 vo_directx.c, 1.43, 1.44 x11_common.c, 1.184, 1.185
Joey Parrish CVS
syncmail at mplayerhq.hu
Tue Dec 21 21:33:53 CET 2004
CVS change done by Joey Parrish CVS
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv5214/libvo
Modified Files:
video_out.c vo_directx.c x11_common.c
Log Message:
added -wid support for vo_directx.
Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- video_out.c 30 Nov 2004 07:42:08 -0000 1.95
+++ video_out.c 21 Dec 2004 20:33:51 -0000 1.96
@@ -45,6 +45,7 @@
int vo_refresh_rate=0;
int vo_keepaspect=1;
int vo_rootwin=0;
+int WinID = -1;
int vo_pts=0; // for hw decoding
float vo_fps=0; // for mp1e rte
Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- vo_directx.c 21 Dec 2004 20:32:26 -0000 1.43
+++ vo_directx.c 21 Dec 2004 20:33:51 -0000 1.44
@@ -81,6 +81,7 @@
extern int vidmode;
extern int vo_colorkey;
extern float monitor_aspect;
+extern int WinID;
/*****************************************************************************
* DirectDraw GUIDs.
@@ -510,6 +511,17 @@
rd.top=(vo_screenheight-height)/2;
if(ShowCursor(FALSE)>=0)while(ShowCursor(FALSE)>=0){}
}
+ else if (WinID != -1 && vo_geometry) {
+ POINT pt;
+ pt.x = vo_dx;
+ pt.y = vo_dy;
+ ClientToScreen(hWnd,&pt);
+ width=d_image_width;
+ height=d_image_height;
+ rd.left = pt.x;
+ rd.top = pt.y;
+ while(ShowCursor(TRUE)<=0){}
+ }
else {
POINT pt;
pt.x = 0; //overlayposition relative to the window
@@ -628,6 +640,7 @@
}
if(!vidmode && !vo_fs){
+ if(WinID == -1) {
RECT rdw=rd;
AdjustWindowRect(&rdw,WS_OVERLAPPEDWINDOW|WS_SIZEBOX,FALSE);
// printf("window: %i %i %ix%i\n",rdw.left,rdw.top,rdw.right - rdw.left,rdw.bottom - rdw.top);
@@ -636,18 +649,18 @@
rdw.right += monitor_rect.left;
rdw.bottom += monitor_rect.top;
SetWindowPos(hWnd,(vo_ontop)?HWND_TOPMOST:(vo_rootwin?HWND_BOTTOM:HWND_NOTOPMOST),rdw.left,rdw.top,rdw.right-rdw.left,rdw.bottom-rdw.top,SWP_NOOWNERZORDER);
+ }
}
else SetWindowPos(vidmode?hWnd:hWndFS,vo_rootwin?HWND_BOTTOM:HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE|SWP_NOOWNERZORDER);
- /*for nonoverlay mode we are finished, for overlay mode we have to display the overlay first*/
- if(nooverlay)return 0;
-
/*make sure the overlay is inside the screen*/
if(rd.left<0)rd.left=0;
if(rd.right>vo_screenwidth)rd.right=vo_screenwidth;
if(rd.top<0)rd.top=0;
if(rd.bottom>vo_screenheight)rd.bottom=vo_screenheight;
+ /*for nonoverlay mode we are finished, for overlay mode we have to display the overlay first*/
+ if(nooverlay)return 0;
// printf("overlay: %i %i %ix%i\n",rd.left,rd.top,rd.right - rd.left,rd.bottom - rd.top);
ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay,&rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx);
@@ -992,6 +1005,8 @@
wc.lpszClassName = "MPlayer - The Movie Player";
wc.lpszMenuName = NULL;
RegisterClass(&wc);
+ if (WinID != -1) hWnd = WinID;
+ else
hWnd = CreateWindowEx(vidmode?WS_EX_TOPMOST:0,
"MPlayer - The Movie Player","",(vidmode)?WS_POPUP:WS_OVERLAPPEDWINDOW| WS_SIZEBOX,
CW_USEDEFAULT, CW_USEDEFAULT, 100, 100,NULL,NULL,hInstance,NULL);
@@ -1144,6 +1159,8 @@
uint32_t y = mpi->y;
uint32_t w = mpi->w;
uint32_t h = mpi->h;
+
+ if (WinID != -1) Directx_ManageDisplay();
if((mpi->flags&MP_IMGFLAG_DIRECT)||(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK))
{
@@ -1232,12 +1249,15 @@
rd.top = vo_dy;
rd.right = rd.left + d_image_width;
rd.bottom = rd.top + d_image_height;
+ if (WinID == -1) {
AdjustWindowRect(&rd,WS_OVERLAPPEDWINDOW|WS_SIZEBOX,FALSE);
SetWindowPos(hWnd,NULL, vo_dx, vo_dy,rd.right-rd.left,rd.bottom-rd.top,SWP_SHOWWINDOW|SWP_NOOWNERZORDER);
+ }
}
else ShowWindow(hWnd,SW_SHOW);
if(vo_fs && !vidmode)ShowWindow(hWndFS,SW_SHOW);
+ if (WinID == -1)
SetWindowText(hWnd,title);
@@ -1380,6 +1400,7 @@
case VOCTRL_DRAW_IMAGE:
return put_image(data);
case VOCTRL_ONTOP:
+ if(WinID != -1) return VO_TRUE;
if(vidmode)
{
mp_msg(MSGT_VO, MSGL_ERR,"<vo_directx><ERROR>ontop has no meaning in exclusive mode\n");
@@ -1392,6 +1413,7 @@
}
return VO_TRUE;
case VOCTRL_ROOTWIN:
+ if(WinID != -1) return VO_TRUE;
if(vidmode)
{
mp_msg(MSGT_VO, MSGL_ERR,"<vo_directx><ERROR>rootwin has no meaning in exclusive mode\n");
Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- x11_common.c 21 Nov 2004 10:53:27 -0000 1.184
+++ x11_common.c 21 Dec 2004 20:33:51 -0000 1.185
@@ -75,7 +75,7 @@
int mLocalDisplay;
/* output window id */
-int WinID = -1;
+extern int WinID;
int vo_mouse_autohide = 0;
int vo_wm_type = 0;
int vo_fs_type = 0; // needs to be accessible for GUI X11 code
More information about the MPlayer-cvslog
mailing list