[Mplayer-cvslog] CVS: main mplayer.c,1.624,1.625 mplayer.h,1.23,1.24

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c mplayer.h 
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: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.624
retrieving revision 1.625
diff -u -r1.624 -r1.625
--- mplayer.c	5 Dec 2002 00:18:56 -0000	1.624
+++ mplayer.c	11 Dec 2002 01:20:53 -0000	1.625
@@ -868,8 +868,8 @@
 // =================== GUI idle loop (STOP state) ===========================
 #ifdef HAVE_NEW_GUI
     if ( use_gui ) {
-
-      guiGetEvent( guiReDrawSubWindow,0 );
+      file_format=DEMUXER_TYPE_UNKNOWN;
+      guiGetEvent( guiSetDefaults,0 );
       while ( guiIntfStruct.Playing != 1 )
        {
         mp_cmd_t* cmd;                                                                                   
@@ -878,14 +878,8 @@
 	guiGetEvent( guiReDraw,NULL );
 	if ( (cmd = mp_input_get_cmd(0,0)) != NULL) guiGetEvent( guiIEvent,(char *)cmd->id );
        } 
-
-      guiGetEvent( guiSetDefaults,NULL );
-
-      if ( ( guiIntfStruct.FilenameChanged || !filename )
-//#ifdef USE_DVDREAD
-//           && ( guiIntfStruct.StreamType != STREAMTYPE_DVD )
-//#endif
-       )      
+      guiGetEvent( guiSetParameters,NULL );
+      if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM )
        {
         play_tree_t * entry = play_tree_new();
         play_tree_add_file( entry,guiIntfStruct.Filename );
@@ -905,7 +899,6 @@
 	    filename = play_tree_iter_get_file(playtree_iter,1);
 	   }
          }
-   	guiIntfStruct.FilenameChanged=0;
        } 
     }
 #endif
@@ -951,6 +944,10 @@
   }
   inited_flags|=INITED_STREAM;
 
+#ifdef HAVE_NEW_GUI
+  if ( use_gui ) guiGetEvent( guiSetStream,(char *)stream );
+#endif
+
   if(stream->type == STREAMTYPE_PLAYLIST) {
     play_tree_t* entry;
     // Handle playlist
@@ -1348,8 +1345,6 @@
 #ifdef HAVE_NEW_GUI
    if ( use_gui )
     {
-     guiGetEvent( guiSetStream,(char *)stream );
-     guiGetEvent( guiSetFileName,filename );
      if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
      if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,(char *)1 ); else guiGetEvent( guiSetAudioOnly,(char *)0 );
      guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
@@ -2700,12 +2695,11 @@
 	guiGetEvent( guiSetVolume,NULL );
 	if(guiIntfStruct.Playing==0) break; // STOP
 	if(guiIntfStruct.Playing==2) osd_function=OSD_PAUSE;
-        if ( guiIntfStruct.DiskChanged || guiIntfStruct.FilenameChanged ) goto goto_next_file;
+        if ( guiIntfStruct.DiskChanged || guiIntfStruct.NewPlay ) goto goto_next_file;
 #ifdef USE_DVDREAD
         if ( stream->type == STREAMTYPE_DVD )
 	 {
 	  dvd_priv_t * dvdp = stream->priv;
-	  /*guiIntfStruct.DVD.current_chapter=dvdp->cur_cell + 1;*/
 	  guiIntfStruct.DVD.current_chapter=dvd_chapter_from_cell(dvdp,guiIntfStruct.DVD.current_title-1, dvdp->cur_cell)+1;
 	 }
 #endif

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mplayer.h	28 Nov 2002 23:17:09 -0000	1.23
+++ mplayer.h	11 Dec 2002 01:20:53 -0000	1.24
@@ -51,6 +51,7 @@
 extern int audio_id;
 extern int video_id;
 extern int dvdsub_id;
+extern int vobsub_id;
 
 extern void exit_player(char* how);