Mercurial > mplayer.hg

changeset 8378:8a03d2b1c8eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better 'Audio track' support, and one 10l
author pontscho
date Thu, 05 Dec 2002 23:40:05 +0000
parents 15da31032c76
children 9ecd9081712b
files Gui/mplayer/gtk/menu.c Gui/mplayer/gtk/pl.c
diffstat 2 files changed, 36 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/mplayer/gtk/menu.c	Thu Dec 05 23:32:27 2002 +0000
+++ b/Gui/mplayer/gtk/menu.c	Thu Dec 05 23:40:05 2002 +0000
@@ -14,6 +14,7 @@
 #include "../widgets.h"
 #include "../app.h"
 
+#include "../../../libmpdemux/stream.h"
 #include "../../../libmpdemux/demuxer.h"
 
 void ActivateMenuItem( int Item )
@@ -414,7 +415,7 @@
        }
 #endif
 
-  if ( guiIntfStruct.Playing )
+//  if ( guiIntfStruct.Playing )
    {
     AspectMenu=AddSubMenu( Menu,MSGTR_MENU_AspectRatio );
     AddMenuItem( AspectMenu,MSGTR_MENU_Original,( 1 << 16 ) + evSetAspect );
@@ -423,18 +424,39 @@
     AddMenuItem( AspectMenu,"2.35",( 4 << 16 ) + evSetAspect );
    }
 
-  if ( guiIntfStruct.demuxer )
+  if ( guiIntfStruct.demuxer && guiIntfStruct.StreamType != STREAMTYPE_DVD )
    {
     int i,c = 0;
-    
+
     for ( i=0;i < MAX_A_STREAMS;i++ )
-     if ( ((demuxer_t *)guiIntfStruct.demuxer)->a_streams[i] )
-      {
-       char tmp[32];
-       snprintf( tmp,32,"Track %d",i );
-       if ( !c ) { SubMenu=AddSubMenu( Menu, "Audio track" ); c=1; }
-       AddMenuItem( SubMenu,tmp,( i << 16 ) + evSetAudio );
-      }
+     if ( ((demuxer_t *)guiIntfStruct.demuxer)->a_streams[i] ) c++;
+    
+    if ( c > 1 )
+     {
+      SubMenu=AddSubMenu( Menu,MSGTR_MENU_AudioTrack );
+      for ( i=0;i < MAX_A_STREAMS;i++ )
+       if ( ((demuxer_t *)guiIntfStruct.demuxer)->a_streams[i] )
+        {
+         char tmp[32];
+         snprintf( tmp,32,MSGTR_MENU_Track,i );
+         AddMenuItem( SubMenu,tmp,( i << 16 ) + evSetAudio );
+        }
+     }
+
+    for ( c=0,i=0;i < MAX_V_STREAMS;i++ )
+     if ( ((demuxer_t *)guiIntfStruct.demuxer)->v_streams[i] ) c++;
+    
+    if ( c > 1 )
+     {
+      SubMenu=AddSubMenu( Menu,MSGTR_MENU_VideoTrack );
+      for ( i=0;i < MAX_V_STREAMS;i++ )
+       if ( ((demuxer_t *)guiIntfStruct.demuxer)->v_streams[i] )
+        {
+         char tmp[32];
+         snprintf( tmp,32,MSGTR_MENU_Track,i );
+         AddMenuItem( SubMenu,tmp,( i << 16 ) + evSetVideo );
+        }
+     }
    }
 
   AddSeparator( Menu );
--- a/Gui/mplayer/gtk/pl.c	Thu Dec 05 23:32:27 2002 +0000
+++ b/Gui/mplayer/gtk/pl.c	Thu Dec 05 23:40:05 2002 +0000
@@ -223,9 +223,10 @@
 	 }
 	if ( plCurrent )
 	 {
-	  guiSetDF( guiIntfStruct.Filename,plCurrent->path,plCurrent->name );
-	  guiIntfStruct.FilenameChanged=1;
-	  guiIntfStruct.StreamType=STREAMTYPE_FILE;
+	  mplSetFileName( plCurrent->path,plCurrent->name,STREAMTYPE_FILE );
+//	  guiSetDF( guiIntfStruct.Filename,plCurrent->path,plCurrent->name );
+//	  guiIntfStruct.FilenameChanged=1;
+//	  guiIntfStruct.StreamType=STREAMTYPE_FILE;
 	 }
        }
   case 0: // cancel