[Mplayer-cvslog] CVS: main help_mp-en.h,1.31,1.32 help_mp-hu.h,1.34,1.35 mplayer.c,1.523,1.524 mplayer.h,1.10,1.11

[Zoltan Ponekker]

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

Modified Files:
	help_mp-en.h help_mp-hu.h mplayer.c mplayer.h 
Log Message:
add equalizer support and fix some small bug...

Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- help_mp-en.h	2 Jul 2002 22:31:47 -0000	1.31
+++ help_mp-en.h	3 Jul 2002 18:57:40 -0000	1.32
@@ -239,6 +239,7 @@
 #define MSGTR_AudioFileSelect "Select external audio channel ..."
 #define MSGTR_MessageBox "MessageBox"
 #define MSGTR_PlayList "PlayList"
+#define MSGTR_Equalizer "Equalizer"
 #define MSGTR_SkinBrowser "Skin Browser"
 
 // --- buttons ---

Index: help_mp-hu.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-hu.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- help_mp-hu.h	2 Jul 2002 22:31:47 -0000	1.34
+++ help_mp-hu.h	3 Jul 2002 18:57:40 -0000	1.35
@@ -233,6 +233,7 @@
 #define MSGTR_OtherSelect "File kiválasztása ..."
 #define MSGTR_AudioFileSelect "Külsõ audio csatorna választása ..."
 #define MSGTR_MessageBox "Üzenetablak"
+#define MSGTR_Equalizer "Equalizer"
 #define MSGTR_PlayList "Lejátszási lista"
 #define MSGTR_SkinBrowser "Skin böngészõ"
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- mplayer.c	2 Jul 2002 22:31:47 -0000	1.523
+++ mplayer.c	3 Jul 2002 18:57:40 -0000	1.524
@@ -208,6 +208,7 @@
 char* dvdsub_lang=NULL;
 static char* spudec_ifo=NULL;
 int vcd_track=0;
+char* filename=NULL; //"MI2-Trailer.avi";
 
 // cache2:
 static int stream_cache_size=0;
@@ -492,7 +493,6 @@
 // for multifile support:
 play_tree_iter_t* playtree_iter = NULL;
 
-char* filename=NULL; //"MI2-Trailer.avi";
 int file_format=DEMUXER_TYPE_UNKNOWN;
 
 int delay_corrected=1;
@@ -815,27 +815,8 @@
 #endif
        } 
 
-#if defined( HAVE_VCD ) && defined( USE_DVDREAD )
-     if ( guiIntfStruct.DiskChanged )
-      {
-#ifdef USE_DVDREAD 
-       switch ( guiIntfStruct.StreamType )
-        {
-         case STREAMTYPE_DVD: filename=DEFAULT_DVD_DEVICE; break;
-	}
-#endif
-       guiIntfStruct.DiskChanged=0;
-       guiGetEvent( guiCEvent,(char *)guiSetPlay );
-      }
-#endif
+      guiGetEvent( guiSetDefaults,NULL );
 
-#ifdef USE_SUB
-      if ( guiIntfStruct.SubtitleChanged || !guiIntfStruct.FilenameChanged )
-       {
-        if ( ( guiIntfStruct.Subtitlename )&&( guiIntfStruct.Subtitlename[0] != 0 ) ) sub_name=guiIntfStruct.Subtitlename;
-        guiIntfStruct.SubtitleChanged=0;
-       }
-#endif
       if ( ( guiIntfStruct.FilenameChanged || !filename )
 #ifdef USE_DVDREAD
            && ( guiIntfStruct.StreamType != STREAMTYPE_DVD )
@@ -862,7 +843,6 @@
          }
    	guiIntfStruct.FilenameChanged=0;
        } 
-     audio_stream=guiIntfStruct.AudioFile; 
     }
 #endif
 //---------------------------------------------------------------------------

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mplayer.h	2 Jul 2002 13:35:01 -0000	1.10
+++ mplayer.h	3 Jul 2002 18:57:40 -0000	1.11
@@ -10,6 +10,9 @@
 extern int osd_level;
 extern int osd_visible;
 
+extern char * sub_name;
+extern char * filename;
+
 extern void exit_player(char* how);
 
 #endif