From 4e7fd628bfaf8be0399c27b3ebdc36b75eaaa1db Mon Sep 17 00:00:00 2001 From: vayne Date: Sat, 14 Oct 2006 20:50:08 +0000 Subject: [PATCH] as per request, fullscreen and mute options have been added to the context menus. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20217 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/win32/dialogs.h | 2 ++ Gui/win32/gui.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Gui/win32/dialogs.h b/Gui/win32/dialogs.h index 5651f5da70..b7b47ae7a6 100644 --- a/Gui/win32/dialogs.h +++ b/Gui/win32/dialogs.h @@ -120,6 +120,8 @@ #define ID_ASPECT4 86 #define ID_SUBWINDOW 87 #define ID_TIMER 88 +#define ID_MUTE 89 +#define ID_FULLSCREEN 90 /* gtk emulation */ #define GTK_MB_FATAL 0x1 diff --git a/Gui/win32/gui.c b/Gui/win32/gui.c index afe8549ad7..3435e2a3c3 100644 --- a/Gui/win32/gui.c +++ b/Gui/win32/gui.c @@ -445,6 +445,12 @@ static LRESULT CALLBACK SubProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l display_chapterselwindow(gui); break; #endif + case ID_FULLSCREEN: + mp_input_queue_cmd(mp_input_parse_cmd("vo_fullscreen")); + break; + case ID_MUTE: + mp_input_queue_cmd(mp_input_parse_cmd("mute")); + break; case ID_ASPECT1: mp_input_queue_cmd(mp_input_parse_cmd("switch_ratio 1.777777")); break; @@ -950,6 +956,9 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM case IDURL_OPEN: display_openurlwindow(gui, 0); break; + case ID_MUTE: + mp_input_queue_cmd(mp_input_parse_cmd("mute")); + break; #ifdef USE_SUB case IDSUBTITLE_OPEN: display_opensubtitlewindow(gui); @@ -1208,6 +1217,8 @@ static void create_traymenu(gui_t *gui) AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_NTRACK, "Next Track"); AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKF, "Seek Forwards"); AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); + AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, "Toggle Mute"); + AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0); #ifdef USE_SUB AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, "Open Subtitle"); #endif @@ -1237,6 +1248,9 @@ static void create_submenu(gui_t *gui) AppendMenu(gui->submenu, MF_STRING, ID_NTRACK, "Next Track"); AppendMenu(gui->submenu, MF_STRING, ID_SEEKF, "Seek Forwards"); AppendMenu(gui->submenu, MF_SEPARATOR, 0, 0); + AppendMenu(gui->submenu, MF_STRING, ID_FULLSCREEN, "Toggle Fullscreen"); + AppendMenu(gui->submenu, MF_STRING, ID_MUTE, "Toggle Mute"); + AppendMenu(gui->submenu, MF_SEPARATOR, 0, 0); AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->aspectmenu, "Aspect Ratio"); AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->subtitlemenu, "Subtitle Options"); AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->dvdmenu, "DVD Options");