Mercurial > mplayer.hg

comparison libvo/vo_directx.c @ 33589:d3ea6cda99b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove more unnecessary code/defines.
author reimar
date Sun, 19 Jun 2011 18:57:57 +0000
parents c4d315b544a1
children b213f28fc17a
comparison
equal deleted inserted replaced
33588:c4d315b544a1 33589:d3ea6cda99b0
34 #include "libmpcodecs/vd.h" 34 #include "libmpcodecs/vd.h"
35 #include "mp_msg.h" 35 #include "mp_msg.h"
36 #include "aspect.h" 36 #include "aspect.h"
37 #include "sub/sub.h" 37 #include "sub/sub.h"
38 #include "w32_common.h" 38 #include "w32_common.h"
39
40 #ifndef WM_XBUTTONDOWN
41 # define WM_XBUTTONDOWN 0x020B
42 # define WM_XBUTTONUP 0x020C
43 # define WM_XBUTTONDBLCLK 0x020D
44 #endif
45
46 #define WNDCLASSNAME_WINDOWED "MPlayer - The Movie Player"
47 #define WNDCLASSNAME_FULLSCREEN "MPlayer - Fullscreen"
48 #define WNDSTYLE WS_OVERLAPPEDWINDOW|WS_SIZEBOX
49 39
50 static LPDIRECTDRAWCOLORCONTROL g_cc = NULL; //color control interface 40 static LPDIRECTDRAWCOLORCONTROL g_cc = NULL; //color control interface
51 static LPDIRECTDRAW7 g_lpdd = NULL; //DirectDraw Object 41 static LPDIRECTDRAW7 g_lpdd = NULL; //DirectDraw Object
52 static LPDIRECTDRAWSURFACE7 g_lpddsPrimary = NULL; //Primary Surface: viewport through the Desktop 42 static LPDIRECTDRAWSURFACE7 g_lpddsPrimary = NULL; //Primary Surface: viewport through the Desktop
53 static LPDIRECTDRAWSURFACE7 g_lpddsOverlay = NULL; //Overlay Surface 43 static LPDIRECTDRAWSURFACE7 g_lpddsOverlay = NULL; //Overlay Surface
336 mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>overlay surface released\n"); 326 mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>overlay surface released\n");
337 } 327 }
338 if (g_lpddsPrimary != NULL) g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); 328 if (g_lpddsPrimary != NULL) g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary);
339 g_lpddsPrimary = NULL; 329 g_lpddsPrimary = NULL;
340 mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>primary released\n"); 330 mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>primary released\n");
341 UnregisterClass(WNDCLASSNAME_WINDOWED, GetModuleHandle(NULL));
342 UnregisterClass(WNDCLASSNAME_FULLSCREEN, GetModuleHandle(NULL));
343 if (colorbrush) DeleteObject(colorbrush); 331 if (colorbrush) DeleteObject(colorbrush);
344 colorbrush = NULL; 332 colorbrush = NULL;
345 mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>GDI resources deleted\n"); 333 mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>GDI resources deleted\n");
346 if (g_lpdd != NULL){ 334 if (g_lpdd != NULL){
347 if(vidmode)g_lpdd->lpVtbl->RestoreDisplayMode(g_lpdd); 335 if(vidmode)g_lpdd->lpVtbl->RestoreDisplayMode(g_lpdd);