[Mplayer-cvslog] CVS: main help_mp-en.h,1.43,1.44 mplayer.c,1.545,1.546

[Zoltan Ponekker]

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

Modified Files:
	help_mp-en.h mplayer.c 
Log Message:


- add dxr3 gui support (dialogbox, etc.)
- fix one small dvd playing bug ( dvd playing don't del the playlist)
- add some ifdef() check


Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- help_mp-en.h	14 Aug 2002 12:20:16 -0000	1.43
+++ help_mp-en.h	14 Aug 2002 23:02:42 -0000	1.44
@@ -352,6 +352,7 @@
 #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering."
 #define MSGTR_NEMFMM "Sorry, not enough memory for main window shape mask."
 #define MSGTR_IDFGCVD "Sorry, i don't find gui compatible video output driver."
+#define MSGTR_NEEDLAVCFAME "Sorry, you don't play non-mpeg files in your DXR3/H+ device without reencoding.\nPlease enable lavc or fame in DXR3/H+ configbox."
 
 // --- skin loader error messages
 #define MSGTR_SKIN_ERRORMESSAGE "[skin] error in skin config file on line %d: %s" 
@@ -482,6 +483,9 @@
 #define MSGTR_PREFERENCES_OSS_Device "Device:"
 #define MSGTR_PREFERENCES_OSS_Mixer "Mixer:"
 #define MSGTR_PREFERENCES_Message "Please remember, some function need restart the playing."
+#define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:"
+#define MSGTR_PREFERENCES_DXR3_LAVC "Use LAVC ( ffmpeg encoder )"
+#define MSGTR_PREFERENCES_DXR3_FAME "Use FAME"
 
 // --- messagebox
 #define MSGTR_MSGBOX_LABEL_FatalError "fatal error ..."

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -r1.545 -r1.546
--- mplayer.c	11 Aug 2002 17:14:41 -0000	1.545
+++ mplayer.c	14 Aug 2002 23:02:42 -0000	1.546
@@ -815,9 +815,9 @@
       guiGetEvent( guiSetDefaults,NULL );
 
       if ( ( guiIntfStruct.FilenameChanged || !filename )
-#ifdef USE_DVDREAD
-           && ( guiIntfStruct.StreamType != STREAMTYPE_DVD )
-#endif
+//#ifdef USE_DVDREAD
+//           && ( guiIntfStruct.StreamType != STREAMTYPE_DVD )
+//#endif
        )      
        {
         play_tree_t * entry = play_tree_new();
@@ -1358,7 +1358,8 @@
      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( guiSetValues,(char *)sh_video );
+     guiGetEvent( guiSetFileFormat,(char *)demuxer->file_format );
+     if ( guiGetEvent( guiSetValues,(char *)sh_video ) ) goto goto_next_file;
     }
 #endif