RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Code Issues Releases Wiki Activity

win32: properly set window title

Browse Source 
Set the window title on win32 based VOs using the same logic as on X11
and Cocoa.

Until now, the window title when using vo_direct3d and vo_gl was hardcoded
to "MPlayer - The Movie Player", and vo_directx showed "MPlayer". Now it
will show "mplayer2", unless the --title or --use-filename-title options
are used.

Change the internal window class name to the string "mplayer2" too.
This commit is contained in:
wm4 2011-12-07 01:36:19 +01:00
parent 7c6a4e1e98
commit 1bb08fc1e6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvo/vo_directx.c
View File

@ -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;

10
libvo/w32_common.c
View File

@ -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;