[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk menu.c,1.26,1.27

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv25933/Gui/mplayer/gtk

Modified Files:
	menu.c 
Log Message:


- 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


Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- menu.c	5 Dec 2002 23:40:05 -0000	1.26
+++ menu.c	11 Dec 2002 01:21:11 -0000	1.27
@@ -379,14 +379,15 @@
     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 @@
     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;