diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_directx.c | 3 | ||||
| -rw-r--r-- | libvo/w32_common.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 7302b36cdb..52d18188d2 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -959,9 +959,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ if (!vo_w32_config(d_width, d_height, options)) return 1; - if (WinID == -1) - SetWindowText(vo_w32_window, title); - /*create the surfaces*/ if (Directx_CreatePrimarySurface()) return 1; diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 8dcd8a1708..bbcf110686 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -31,6 +31,8 @@ #include "aspect.h" #include "w32_common.h" #include "mp_fifo.h" +#include "osdep/io.h" +#include "talloc.h" #ifndef WM_XBUTTONDOWN # define WM_XBUTTONDOWN 0x020B @@ -44,7 +46,7 @@ #define WIN_ID_TO_HWND(x) ((HWND)(uint32_t)(x)) -static const char classname[] = "MPlayer - The Movie Player"; +static const char classname[] = "mplayer2"; int vo_vm = 0; static int depthonscreen; @@ -402,7 +404,7 @@ static void resetMode(void) { ChangeDisplaySettings(0, 0); } -// Update the window position, size, and border style from vo_* values. +// Update the window title, position, size, and border style from vo_* values. static int reinit_window_state(void) { const LONG NO_FRAME = WS_POPUP; const LONG FRAME = WS_OVERLAPPEDWINDOW | WS_SIZEBOX; @@ -412,6 +414,10 @@ static int reinit_window_state(void) { if (WinID >= 0) return 1; + wchar_t *title = mp_from_utf8(NULL, vo_get_window_title(global_vo)); + SetWindowTextW(vo_window, title); + talloc_free(title); + bool toggle_fs = current_fs != vo_fs; current_fs = vo_fs; |