[Mplayer-cvslog] CVS: main/Gui app.c,1.17,1.18 app.h,1.12,1.13 interface.c,1.62,1.63 interface.h,1.31,1.32

[Zoltan Ponekker]

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

Modified Files:
	app.c app.h interface.c interface.h 
Log Message:


- audio track handling in menu (idea from Rüdiger Kuhlmann)
- some userfriendly changes in menu


Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- app.c	27 Nov 2002 23:11:39 -0000	1.17
+++ app.c	29 Nov 2002 00:58:22 -0000	1.18
@@ -62,7 +62,8 @@
   { evSetURL,		 "evSetURL"	       },
   { evLoadAudioFile,	 "evLoadAudioFile"     },
   { evDropSubtitle,      "evDropSubtitle"      },
-  { evSetAspect,	 "evSetAspect"	       }
+  { evSetAspect,	 "evSetAspect"	       },
+  { evSetAudio,		 "evSetAudio"	       }
  };
 
 int evBoxs = sizeof( evNames ) / sizeof( evName );

Index: app.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- app.h	27 Nov 2002 23:11:39 -0000	1.12
+++ app.h	29 Nov 2002 00:58:22 -0000	1.13
@@ -57,7 +57,8 @@
 #define evPlayNetwork       41
 #define evLoadAudioFile	    42
 #define evSetAspect         44
-// 45 ...
+#define evSetAudio	    45
+// 46 ...
 
 #define evExit              1000
 

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- interface.c	28 Nov 2002 23:17:10 -0000	1.62
+++ interface.c	29 Nov 2002 00:58:22 -0000	1.63
@@ -454,6 +454,9 @@
    case guiReDrawSubWindow:
 	wsPostRedisplay( &appMPlayer.subWindow );
 	break;
+   case guiSetDemuxer:
+	guiIntfStruct.demuxer=(void *)arg;
+	break;
    case guiSetShVideo:
 	 {
 	  if ( !appMPlayer.subWindow.isFullScreen )

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- interface.h	28 Nov 2002 00:44:09 -0000	1.31
+++ interface.h	29 Nov 2002 00:58:22 -0000	1.32
@@ -59,6 +59,7 @@
    guiUnknowErrorStruct error;
    
    void * sh_video;
+   void * demuxer;
    void * event_struct;
 
    int    DiskChanged;
@@ -123,6 +124,7 @@
 #define guiSetDefaults	    12
 #define guiSetValues	    13
 #define guiSetFileFormat    14
+#define guiSetDemuxer       15
 
 #define guiSetStop  0
 #define guiSetPlay  1