diff options
author | wm4 <wm4@nowhere> | 2012-10-28 20:32:55 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-30 19:50:23 +0100 |
commit | 7985d4fd3452ba5feed240ab86ba1c088547e98e (patch) | |
tree | d400e26120911aeca9f603c27b6895e50752a137 /libvo | |
parent | 0502b6967275569fe0bc2ca69c55b491cc9f6bd2 (diff) | |
download | mpv-7985d4fd3452ba5feed240ab86ba1c088547e98e.tar.bz2 mpv-7985d4fd3452ba5feed240ab86ba1c088547e98e.tar.xz |
options: remove --adapter
This probably didn't do anything. Maybe OpenGL VOs on win32 actually
could make use of it, but even then it probably didn't work.
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/video_out.c | 1 | ||||
-rw-r--r-- | libvo/video_out.h | 1 | ||||
-rw-r--r-- | libvo/w32_common.c | 23 | ||||
-rw-r--r-- | libvo/w32_common.h | 3 |
4 files changed, 0 insertions, 28 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 7e1360ecf5..d095ca530c 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -55,7 +55,6 @@ int vo_vsync = 1; int vo_fs = 0; int vo_fsmode = 0; float vo_panscan = 0.0f; -int vo_adapter_num=0; int vo_refresh_rate=0; int vo_keepaspect=1; int vo_rootwin=0; diff --git a/libvo/video_out.h b/libvo/video_out.h index a36c56aa90..539a9b5043 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -316,7 +316,6 @@ extern int vo_vsync; extern int vo_fs; extern int vo_fsmode; extern float vo_panscan; -extern int vo_adapter_num; extern int vo_refresh_rate; extern int vo_keepaspect; extern int vo_rootwin; diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 6136730fbd..f60f5328de 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -596,20 +596,6 @@ int vo_w32_config(struct vo *vo, uint32_t width, uint32_t height, } /** - * \brief return the name of the selected device if it is indepedant - * \return pointer to string, must be freed. - */ -static wchar_t *get_display_name(void) -{ - DISPLAY_DEVICEW disp; - disp.cb = sizeof(disp); - EnumDisplayDevicesW(NULL, vo_adapter_num, &disp, 0); - if (disp.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) - return NULL; - return wcsdup(disp.DeviceName); -} - -/** * \brief Initialize w32_common framework. * * The first function that should be called from the w32_common framework. @@ -680,10 +666,6 @@ int vo_w32_init(struct vo *vo) if (WinID >= 0) EnableWindow(w32->window, 0); - w32->dev_hdc = 0; - wchar_t *dev = get_display_name(); - if (dev) w32->dev_hdc = CreateDCW(dev, NULL, NULL, NULL); - free(dev); updateScreenProperties(vo); mp_msg(MSGT_VO, MSGL_V, "vo: win32: running at %dx%d with depth %d\n", @@ -746,7 +728,6 @@ void vo_w32_uninit(struct vo *vo) return; resetMode(vo); ShowCursor(1); - if (w32->dev_hdc) DeleteDC(w32->dev_hdc); DestroyWindow(w32->window); UnregisterClassW(classname, 0); talloc_free(w32); @@ -761,8 +742,6 @@ void vo_w32_uninit(struct vo *vo) HDC vo_w32_get_dc(struct vo *vo, HWND wnd) { struct vo_w32_state *w32 = vo->w32; - if (w32->dev_hdc) - return w32->dev_hdc; return GetDC(wnd); } @@ -774,7 +753,5 @@ HDC vo_w32_get_dc(struct vo *vo, HWND wnd) void vo_w32_release_dc(struct vo *vo, HWND wnd, HDC dc) { struct vo_w32_state *w32 = vo->w32; - if (w32->dev_hdc) - return; ReleaseDC(wnd, dc); } diff --git a/libvo/w32_common.h b/libvo/w32_common.h index 1e4bd604a0..c6d9fc7653 100644 --- a/libvo/w32_common.h +++ b/libvo/w32_common.h @@ -26,9 +26,6 @@ struct vo_w32_state { HWND window; - // HDC used when rendering to a device instead of window - HDC dev_hdc; - bool vm; int depthonscreen; |