[Mplayer-cvslog] CVS: main/Gui app.c,1.11,1.12 app.h,1.6,1.7 interface.c,1.7,1.8 interface.h,1.7,1.8

[Zoltan Ponekker]

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

Modified Files:
	app.c app.h interface.c interface.h 
Log Message:
fix dvd playing under gui

Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- app.c	7 Mar 2002 15:06:01 -0000	1.11
+++ app.c	17 Apr 2002 21:12:11 -0000	1.12
@@ -38,7 +38,6 @@
  item->fontid=0;
  if ( item->label ) free( item->label ); item->label=NULL;
  item->event=0;
- item->used=0;
 }
 
 void appCopy( listItems * dest,listItems * source )

Index: app.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- app.h	12 Nov 2001 12:26:05 -0000	1.6
+++ app.h	17 Apr 2002 21:12:11 -0000	1.7
@@ -34,7 +34,6 @@
  int        pressed,disabled,tmp;
  int        key,key2;
  int        phases;
- int        used;
  float      value;
  txSample   Bitmap;
  txSample   Mask;

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- interface.c	15 Mar 2002 23:22:36 -0000	1.7
+++ interface.c	17 Apr 2002 21:12:11 -0000	1.8
@@ -14,6 +14,7 @@
 #include "app.h"
 #include "../libvo/x11_common.h"
 #include "../input/input.h"
+#include "../libmpdemux/stream.h"
 
 guiInterface_t guiIntfStruct;
 
@@ -46,6 +47,7 @@
 
 void guiGetEvent( int type,char * arg )
 {
+ dvd_priv_t * dvdp = (dvd_priv_t *) arg;
  switch ( type )
   {
    case guiXEvent:
@@ -60,6 +62,27 @@
           case guiSetPause: guiIntfStruct.Playing=2; mplState(); break;
 	 }
         break;
+   case guiSetState:
+	mplState();
+        break;
+   case guiSetFileName:
+        if ( arg ) guiSetFilename( guiIntfStruct.Filename,arg );
+        break;
+#ifdef USE_DVDREAD
+   case guiSetDVD:
+        guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
+        guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
+        guiIntfStruct.DVD.angles=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_angles;
+        guiIntfStruct.DVD.nr_of_audio_channels=dvdp->nr_of_channels;
+        memcpy( guiIntfStruct.DVD.audio_streams,dvdp->audio_streams,sizeof( dvdp->audio_streams ) );
+        guiIntfStruct.DVD.nr_of_subtitles=dvdp->nr_of_subtitles;
+        memcpy( guiIntfStruct.DVD.subtitles,dvdp->subtitles,sizeof( dvdp->subtitles ) );
+        guiIntfStruct.DVD.current_title=dvd_title + 1;
+        guiIntfStruct.DVD.current_chapter=dvd_chapter + 1;
+        guiIntfStruct.DVD.current_angle=dvd_angle + 1;
+        guiIntfStruct.Track=dvd_title + 1;
+        break;
+#endif
 #ifdef HAVE_NEW_INPUT
    case guiIEvent:
         printf( "cmd: %d\n",(int)arg );

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- interface.h	7 Mar 2002 15:06:01 -0000	1.7
+++ interface.h	17 Apr 2002 21:12:11 -0000	1.8
@@ -93,9 +93,12 @@
 
 extern guiInterface_t guiIntfStruct;
 
-#define guiXEvent 0
-#define guiCEvent 1
-#define guiIEvent 2
+#define guiXEvent      0
+#define guiCEvent      1
+#define guiIEvent      2
+#define guiSetDVD      3
+#define guiSetFileName 4
+#define guiSetState    5
 
 #define guiSetStop  0
 #define guiSetPlay  1