RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

win32: cleanup: remove some unneeded things

This commit is contained in:
wm4 2015-10-02 18:13:24 +02:00
parent fe993a6712
commit 93db4233af
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/opengl/w32.c
View File

@ -259,7 +259,7 @@ fail:
static int w32_reconfig(struct MPGLContext *ctx, int flags) static int w32_reconfig(struct MPGLContext *ctx, int flags)
{ {
vo_w32_config(ctx->vo, flags); vo_w32_config(ctx->vo);
return 0; return 0;
} }

2
video/out/vo_direct3d.c
View File

@ -1336,7 +1336,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
/* w32_common framework call. Creates window on the screen with /* w32_common framework call. Creates window on the screen with
* the given coordinates. * the given coordinates.
*/ */
if (!vo_w32_config(vo, flags)) { if (!vo_w32_config(vo)) {
MP_VERBOSE(priv, "Creating window failed.\n"); MP_VERBOSE(priv, "Creating window failed.\n");
return VO_ERROR; return VO_ERROR;
} }

21
video/out/w32_common.c
View File

@ -946,13 +946,13 @@ static DWORD update_style(struct vo_w32_state *w32, DWORD style)
} }
// Update the window title, position, size, and border style. // Update the window title, position, size, and border style.
static int reinit_window_state(struct vo_w32_state *w32) static void reinit_window_state(struct vo_w32_state *w32)
{ {
HWND layer = HWND_NOTOPMOST; HWND layer = HWND_NOTOPMOST;
RECT r; RECT r;
if (w32->parent) if (w32->parent)
return 1; return;
bool new_fs = w32->opts->fullscreen; bool new_fs = w32->opts->fullscreen;
bool toggle_fs = w32->current_fs != new_fs; bool toggle_fs = w32->current_fs != new_fs;
@ -1046,16 +1046,11 @@ static int reinit_window_state(struct vo_w32_state *w32)
r.bottom - r.top, SWP_FRAMECHANGED | SWP_SHOWWINDOW); r.bottom - r.top, SWP_FRAMECHANGED | SWP_SHOWWINDOW);
signal_events(w32, VO_EVENT_RESIZE); signal_events(w32, VO_EVENT_RESIZE);
return 1;
} }
static void gui_thread_reconfig(void *ptr) static void gui_thread_reconfig(void *ptr)
{ {
void **p = ptr; struct vo_w32_state *w32 = ptr;
struct vo_w32_state *w32 = p[0];
uint32_t flags = *(uint32_t *)p[1];
int *res = p[2];
struct vo *vo = w32->vo; struct vo *vo = w32->vo;
@ -1098,17 +1093,15 @@ static void gui_thread_reconfig(void *ptr)
w32->dw = vo->dwidth; w32->dw = vo->dwidth;
w32->dh = vo->dheight; w32->dh = vo->dheight;
*res = reinit_window_state(w32); reinit_window_state(w32);
} }
// Resize the window. On the first call, it's also made visible. // Resize the window. On the first call, it's also made visible.
int vo_w32_config(struct vo *vo, uint32_t flags) int vo_w32_config(struct vo *vo)
{ {
struct vo_w32_state *w32 = vo->w32; struct vo_w32_state *w32 = vo->w32;
int r; mp_dispatch_run(w32->dispatch, gui_thread_reconfig, w32);
void *p[] = {w32, &flags, &r}; return 0;
mp_dispatch_run(w32->dispatch, gui_thread_reconfig, p);
return r;
} }
static void *gui_thread(void *ptr) static void *gui_thread(void *ptr)

2
video/out/w32_common.h
View File

@ -29,7 +29,7 @@ struct vo;
int vo_w32_init(struct vo *vo); int vo_w32_init(struct vo *vo);
void vo_w32_uninit(struct vo *vo); void vo_w32_uninit(struct vo *vo);
int vo_w32_control(struct vo *vo, int *events, int request, void *arg); int vo_w32_control(struct vo *vo, int *events, int request, void *arg);
int vo_w32_config(struct vo *vo, uint32_t); int vo_w32_config(struct vo *vo);
HWND vo_w32_hwnd(struct vo *vo); HWND vo_w32_hwnd(struct vo *vo);
void vo_w32_run_on_thread(struct vo *vo, void (*cb)(void *ctx), void *ctx); void vo_w32_run_on_thread(struct vo *vo, void (*cb)(void *ctx), void *ctx);