diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-06 07:13:57 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-06 07:13:57 +0000 |
| commit | 08b4af80fac1446b54413219173aeb2e64d8f99d (patch) | |
| tree | 02d1cdc41b35f56defc6c4930b11f1acc161db47 /Gui | |
| parent | 414248ded1fc5c3e32d98124548caaf4828b8407 (diff) | |
| download | mpv-08b4af80fac1446b54413219173aeb2e64d8f99d.tar.bz2 mpv-08b4af80fac1446b54413219173aeb2e64d8f99d.tar.xz | |
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6312 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/gtk/menu.c | 1 | ||||
| -rw-r--r-- | Gui/mplayer/mw.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index 78bf212eac..41eb584b49 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -380,6 +380,7 @@ GtkWidget * create_PopUpMenu( void ) } #endif AddSeparator( Menu ); + AddMenuItem( Menu,"Mute", evMute ); AddMenuItem( Menu,MSGTR_MENU_PlayList, evPlayList ); AddMenuItem( Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser ); AddMenuItem( Menu,MSGTR_MENU_Preferences, evPreferences ); diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index dfc094f1c9..1a4c881f75 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -2,6 +2,7 @@ // main window #include "../../libmpdemux/stream.h" +#include "../../mixer.h" unsigned char * mplDrawBuffer = NULL; int mplMainRender = 1; @@ -99,6 +100,7 @@ calclengthmmmmss: case 'l': if ( guiIntfStruct.Playing == 1 ) strcat( trbuf,"p" ); break; case 'e': if ( guiIntfStruct.Playing == 2 ) strcat( trbuf,"e" ); break; case 'a': +// if ( guiIntfStruct.Mute ) { strcat( trbuf,"n" ); break; } switch ( guiIntfStruct.AudioType ) { case 0: strcat( trbuf,"n" ); break; @@ -373,7 +375,7 @@ NoPause: case evIncVolume: vo_x11_putkey( wsGrayMul ); break; case evDecVolume: vo_x11_putkey( wsGrayDiv ); break; - case evMute: guiIntfStruct.Mute=1; break; + case evMute: mixer_mute(); guiIntfStruct.Mute=muted; break; case evSetVolume: case evSetBalance: guiIntfStruct.VolumeChanged=1; break; |