github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00
Code Releases Activity

win32: simplify icon loading

Browse Source 
I have no idea why the code used this roundabout method.
Also detab mplayer.rc.
This commit is contained in:
wm4 2012-04-14 16:53:24 +02:00
parent 923f353d2a
commit 3bb456b14d
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvo/w32_common.c
View File

@ -631,12 +631,7 @@ int vo_w32_init(struct vo *vo)
HINSTANCE hInstance = GetModuleHandleW(NULL); HINSTANCE hInstance = GetModuleHandleW(NULL);
HICON mplayerIcon = 0; HICON mplayerIcon = LoadIconW(hInstance, L"IDI_ICON1");
wchar_t exedir[MAX_PATH];
if (GetModuleFileNameW(0, exedir, MAX_PATH))
mplayerIcon = ExtractIconW(hInstance, exedir, 0);
if (!mplayerIcon)
mplayerIcon = LoadIcon(0, IDI_APPLICATION);
WNDCLASSEXW wcex = { WNDCLASSEXW wcex = {
.cbSize = sizeof wcex, .cbSize = sizeof wcex,

6
osdep/mplayer.rc
View File

@ -29,9 +29,9 @@ FILETYPE VFT_APP
{ {
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
{ {
BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP
{ {
VALUE "Comments","mplayer2 is distributed under the terms of the GNU General Public License Version 3. Source code is available at http://www.mplayer2.org\000" VALUE "Comments","mplayer2 is distributed under the terms of the GNU General Public License Version 3. Source code is available at http://www.mplayer2.org\000"
VALUE "CompanyName", "\000" VALUE "CompanyName", "\000"
VALUE "FileDescription", "mplayer2 - Movie Player\000" VALUE "FileDescription", "mplayer2 - Movie Player\000"
VALUE "FileVersion",VERSION VALUE "FileVersion",VERSION
@ -45,7 +45,7 @@ FILETYPE VFT_APP
} }
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
{ {
VALUE "Translation",0,0x04b0 VALUE "Translation",0,0x04b0
} }
} }