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

[Arpi of Ize]

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

Modified Files:
	menu.c 
Log Message:
fix selected audio language in menu


Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- menu.c	11 Dec 2002 01:21:11 -0000	1.27
+++ menu.c	19 Jan 2003 21:45:55 -0000	1.28
@@ -379,13 +379,13 @@
     DVDAudioLanguageMenu=AddSubMenu( DVDSubMenu,MSGTR_MENU_AudioLanguages );
      if ( guiIntfStruct.DVD.nr_of_audio_channels )
       {
-       char tmp[64]; int i, id = audio_id;
+       char tmp[64]; int i, id = guiIntfStruct.demuxer ? ((demuxer_t *)guiIntfStruct.demuxer)->audio->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;
+//	 if ( id == -1 ) id=audio_id; //guiIntfStruct.DVD.audio_streams[i].id;
          AddMenuCheckItem( DVDAudioLanguageMenu,tmp,
 			   id == guiIntfStruct.DVD.audio_streams[i].id,
 			   ( guiIntfStruct.DVD.audio_streams[i].id << 16 ) + evSetDVDAudio );