diff options
author | wm4 <wm4@nowhere> | 2013-06-15 19:04:20 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-15 19:07:21 +0200 |
commit | 168a595bfeb97be89da314dcc652b7c4782e43e5 (patch) | |
tree | c5e88c9eec004a8a5cd66a68ad4b1cdd1382b97a /video/out/w32_common.c | |
parent | 70f97efa720ee2366cb6c1eeefb211c11fd88a63 (diff) | |
download | mpv-168a595bfeb97be89da314dcc652b7c4782e43e5.tar.bz2 mpv-168a595bfeb97be89da314dcc652b7c4782e43e5.tar.xz |
video/out: introduce VOCTRL_UPDATE_WINDOW_TITLE
Instead of implicitly changing the window title on config(), do it as
part of the new VOCTRL.
At first I wanted to make all VOs use the VOCTRL argument directly, but
on a second thought it appears vo_get_window_title() is much more useful
for some (namely, if the window is created lazily on first config()).
Not all VOs are changed. Wayland and OSX have to follow.
Diffstat (limited to 'video/out/w32_common.c')
-rw-r--r-- | video/out/w32_common.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index e97a9e2e85..7d60435c5b 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -407,10 +407,6 @@ static int reinit_window_state(struct vo *vo) if (vo->opts->WinID >= 0) return 1; - wchar_t *title = mp_from_utf8(NULL, vo_get_window_title(vo)); - SetWindowTextW(w32->window, title); - talloc_free(title); - bool toggle_fs = w32->current_fs != vo->opts->fs; w32->current_fs = vo->opts->fs; @@ -705,6 +701,12 @@ int vo_w32_control(struct vo *vo, int *events, int request, void *arg) case VOCTRL_RESTORE_SCREENSAVER: w32->disable_screensaver = false; return VO_TRUE; + case VOCTRL_UPDATE_WINDOW_TITLE: { + wchar_t *title = mp_from_utf8(NULL, (char *)arg); + SetWindowTextW(w32->window, title); + talloc_free(title); + return VO_TRUE; + } } return VO_NOTIMPL; } |