diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-11 01:21:12 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-11 01:21:12 +0000 |
commit | 15dc6ef3f76c8a8060ad9cfc36fe34a33f241aba (patch) | |
tree | 3b93cb826c911fe5cff2f9bb98b6369c275119ce /Gui/mplayer/gtk | |
parent | d9b33edbba28e29aeb94b7f4acae099175302a16 (diff) | |
download | mpv-15dc6ef3f76c8a8060ad9cfc36fe34a33f241aba.tar.bz2 mpv-15dc6ef3f76c8a8060ad9cfc36fe34a33f241aba.tar.xz |
- fix three submenu bug
- audio/video track hiding
- normal/double/fullscreen handling
- dvd audio channel setting bug
- fix file/url/vcd/dvd playing
- fix variables initialization
- some small bug fix
- applied some patch from RĂ¼diger Kuhlmann
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8424 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/gtk')
-rw-r--r-- | Gui/mplayer/gtk/menu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index 2f34076e14..002b75ed0f 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -379,14 +379,15 @@ GtkWidget * create_PopUpMenu( void ) DVDAudioLanguageMenu=AddSubMenu( DVDSubMenu,MSGTR_MENU_AudioLanguages ); if ( guiIntfStruct.DVD.nr_of_audio_channels ) { - char tmp[64]; int i; + char tmp[64]; int i, id = audio_id; for ( i=0;i < guiIntfStruct.DVD.nr_of_audio_channels;i++ ) { snprintf( tmp,64,"%s - %s %s",GetLanguage( guiIntfStruct.DVD.audio_streams[i].language ), ChannelTypes[ guiIntfStruct.DVD.audio_streams[i].type ], ChannelNumbers[ guiIntfStruct.DVD.audio_streams[i].channels ] ); + if ( id == -1 ) id=guiIntfStruct.DVD.audio_streams[i].id; AddMenuCheckItem( DVDAudioLanguageMenu,tmp, - audio_id == guiIntfStruct.DVD.audio_streams[i].id, + id == guiIntfStruct.DVD.audio_streams[i].id, ( guiIntfStruct.DVD.audio_streams[i].id << 16 ) + evSetDVDAudio ); } } @@ -424,7 +425,7 @@ GtkWidget * create_PopUpMenu( void ) AddMenuItem( AspectMenu,"2.35",( 4 << 16 ) + evSetAspect ); } - if ( guiIntfStruct.demuxer && guiIntfStruct.StreamType != STREAMTYPE_DVD ) + if ( guiIntfStruct.Playing && guiIntfStruct.demuxer && guiIntfStruct.StreamType != STREAMTYPE_DVD ) { int i,c = 0; |