[Mplayer-cvslog] CVS: main help_mp-de.h,1.34,1.35 help_mp-en.h,1.37,1.38 mplayer.c,1.541,1.542

Johannes Feigl jaf at mplayerhq.hu
Mon Aug 5 20:37:17 CEST 2002


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

Modified Files:
	help_mp-de.h help_mp-en.h mplayer.c 
Log Message:
moved messages to help_mp-??.h

Index: help_mp-de.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-de.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- help_mp-de.h	5 Aug 2002 06:46:54 -0000	1.34
+++ help_mp-de.h	5 Aug 2002 18:37:14 -0000	1.35
@@ -118,6 +118,25 @@
 #define MSGTR_Playing "Spiele %s\n"
 #define MSGTR_NoSound "Audio: kein Ton!!!\n"
 #define MSGTR_FPSforced "FPS fixiert auf %5.3f  (ftime: %5.3f)\n"
+#define MSGTR_CompiledWithRuntimeDetection "Kompiliert mit RUNTIME CPU Detection - Warnung, das ist nicht optimal! Um die beste Performance zu erhalten kompiliere MPlayer von den Sourcen mit --disable-runtime-cpudetection\n"
+#define MSGTR_CompiledWithCPUExtensions "Kompiliert für x86 CPU mit folgenden Erweiterungen:"
+#define MSGTR_AvailableVideoOutputPlugins "Verfügbare Videoausgabe-Plugins:\n"
+#define MSGTR_AvailableVideoOutputDrivers "Verfügbare Videoausgabe-Treiber:\n"
+#define MSGTR_AvailableAudioOutputDrivers "Verfügbare Audioausgabe-Treiber:\n"
+#define MSGTR_AvailableAudioCodecs "Verfügbare Audiocodocs:\n"
+#define MSGTR_AvailableVideoCodecs "Verfügbare Videocodecs:\n"
+#define MSGTR_UsingRTCTiming "Verwende Linux Hardware RTC-Timing (%ldHz)\n"
+#define MSGTR_CannotReadVideoPropertiers "Video: Kann Eigenschaften nicht lesen\n"
+#define MSGTR_NoStreamFound "Kein Streams gefunden\n"
+#define MSGTR_InitializingAudioCodec "Initialisiere Audiocodec...\n"
+#define MSGTR_ErrorInitializingVODevice "Fehler beim Öffenen/Initialisieren des ausgewählten Videoausgabe (-vo) Treibers!\n"
+#define MSGTR_ForcedVideoCodec "Videocodec fixiert: %s\n"
+#define MSGTR_AODescription_AOAuthor "AO: Beschreibung: %s\nAO: Autor: %s\n"
+#define MSGTR_AOComment "AO: Hinweis: %s\n"
+#define MSGTR_Video_NoVideo "Video: kein Video!!!\n"
+#define MSGTR_NotInitializeVOPorVO "\nFATAL: Konnte Videofilter (-vop) oder Videoausgabe-Treiber (-vo) nicht initialisieren!\n"
+#define MSGTR_Paused "\n------ PAUSE -------\r"
+#define MSGTR_PlaylistLoadUnable "\nKann Playliste %s nicht laden\n"
 
 // open.c, stream.c:
 #define MSGTR_CdDevNotfound "CD-ROM Gerät '%s' nicht gefunden!\n"

Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- help_mp-en.h	4 Aug 2002 01:48:54 -0000	1.37
+++ help_mp-en.h	5 Aug 2002 18:37:14 -0000	1.38
@@ -120,6 +120,25 @@
 #define MSGTR_Playing "Playing %s\n"
 #define MSGTR_NoSound "Audio: no sound!!!\n"
 #define MSGTR_FPSforced "FPS forced to be %5.3f  (ftime: %5.3f)\n"
+#define MSGTR_CompiledWithRuntimeDetection "Compiled with RUNTIME CPU Detection - warning, it's not optimal! To get best performance, recompile mplayer from sources with --disable-runtime-cpudetection\n"
+#define MSGTR_CompiledWithCPUExtensions "Compiled for x86 CPU with extensions:"
+#define MSGTR_AvailableVideoOutputPlugins "Available video output plugins:\n"
+#define MSGTR_AvailableVideoOutputDrivers "Available video output drivers:\n"
+#define MSGTR_AvailableAudioOutputDrivers "Available audio output drivers:\n"
+#define MSGTR_AvailableAudioCodecs "Available audio codecs:\n"
+#define MSGTR_AvailableVideoCodecs "Available video codecs:\n"
+#define MSGTR_UsingRTCTiming "Using Linux's hardware RTC timing (%ldHz)\n"
+#define MSGTR_CannotReadVideoPropertiers "Video: can't read properties\n"
+#define MSGTR_NoStreamFound "No stream found\n"
+#define MSGTR_InitializingAudioCodec "Initializing audio codec...\n"
+#define MSGTR_ErrorInitializingVODevice "Error opening/initializing the selected video_out (-vo) device!\n"
+#define MSGTR_ForcedVideoCodec "Forced video codec: %s\n"
+#define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Author: %s\n"
+#define MSGTR_AOComment "AO: Comment: %s\n"
+#define MSGTR_Video_NoVideo "Video: no video!!!\n"
+#define MSGTR_NotInitializeVOPorVO "\nFATAL: Couldn't initialize video filters (-vop) or video output (-vo) !\n"
+#define MSGTR_Paused "\n------ PAUSED -------\r"
+#define MSGTR_PlaylistLoadUnable "\nUnable to load playlist %s\n"
 
 // open.c, stream.c:
 #define MSGTR_CdDevNotfound "CD-ROM Device '%s' not found!\n"

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -r1.541 -r1.542
--- mplayer.c	5 Aug 2002 12:57:54 -0000	1.541
+++ mplayer.c	5 Aug 2002 18:37:14 -0000	1.542
@@ -539,9 +539,9 @@
       gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
       gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
 #ifdef RUNTIME_CPUDETECT
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled with RUNTIME CPU Detection - warning, it's not optimal! To get best performance, recompile mplayer from sources with --disable-runtime-cpudetection\n");
+  mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection);
 #else
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"Compiled for x86 CPU with extensions:");
+  mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions);
 #ifdef HAVE_MMX
   mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
 #endif
@@ -611,14 +611,14 @@
 #endif
 
     if(vo_plugin_args && vo_plugin_args[0] && strcmp(vo_plugin_args[0],"help")==0){
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "Available video output plugins:\n");
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputPlugins);
       vf_list_plugins();
       printf("\n");
       exit(0);
     }
 
     if(video_driver && strcmp(video_driver,"help")==0){
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "Available video output drivers:\n");
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoOutputDrivers);
       i=0;
       while (video_out_drivers[i]) {
         const vo_info_t *info = video_out_drivers[i++]->get_info ();
@@ -629,7 +629,7 @@
     }
 
     if(audio_driver && strcmp(audio_driver,"help")==0){
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "Available audio output drivers:\n");
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioOutputDrivers);
       i=0;
       while (audio_out_drivers[i]) {
         const ao_info_t *info = audio_out_drivers[i++]->info;
@@ -648,13 +648,13 @@
 }
 
     if(audio_codec && strcmp(audio_codec,"help")==0){
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "Available audio codecs:\n");
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
       list_codecs(1);
       printf("\n");
       exit(0);
     }
     if(video_codec && strcmp(video_codec,"help")==0){
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "Available video codecs:\n");
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
       list_codecs(0);
       printf("\n");
       exit(0);
@@ -720,7 +720,7 @@
     	    close (rtc_fd);
 	    rtc_fd = -1;
 	} else
-	    mp_msg(MSGT_CPLAYER, MSGL_INFO, "Using Linux's hardware RTC timing (%ldHz)\n", irqp);
+	    mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_UsingRTCTiming, irqp);
     }
   }
 #ifdef HAVE_NEW_GUI
@@ -1127,7 +1127,7 @@
 
   current_module="video_read_properties";
   if(!video_read_properties(sh_video)) {
-    mp_msg(MSGT_CPLAYER,MSGL_ERR,"Video: can't read properties\n");
+    mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoPropertiers);
     sh_video=d_video->sh=NULL;
   } else {
     mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d  fourcc:0x%X  size:%dx%d  fps:%5.2f  ftime:=%6.4f\n",
@@ -1154,7 +1154,7 @@
 fflush(stdout);
 
 if(!sh_video && !sh_audio){
-    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"No stream found\n");
+    mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound);
     goto goto_next_file; // exit_player(MSGTR_Exit_error);
 }
 
@@ -1250,7 +1250,7 @@
 current_module="init_audio_codec";
 
 if(sh_audio){
-  mp_msg(MSGT_CPLAYER,MSGL_V,"Initializing audio codec...\n");
+  mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_InitializingAudioCodec);
   if(!init_audio(sh_audio)){
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
     sh_audio=d_audio->sh=NULL;
@@ -1270,7 +1270,7 @@
 
 vo_config_count=0;
 if((video_out->preinit(vo_subdevice))!=0){
-    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error opening/initializing the selected video_out (-vo) device!\n");
+    mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
     goto goto_next_file; // exit_player(MSGTR_Exit_error);
 }
 #ifdef X11_FULLSCREEN
@@ -1293,7 +1293,7 @@
 codecs_reset_selection(0);
 if(video_codec){
     // forced codec by name:
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"Forced video codec: %s\n",video_codec);
+    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_ForcedVideoCodec,video_codec);
     init_video(sh_video,video_codec,-1,-1);
 } else {
     int status;
@@ -1396,10 +1396,10 @@
       sh_audio->channels,
       audio_out_format_name(sh_audio->sample_format)
   );
-  mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
+  mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AODescription_AOAuthor,
       info->name, info->author);
   if(strlen(info->comment) > 0)
-      mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", info->comment);
+      mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AOComment, info->comment);
 
   if(!audio_out->init(force_srate?force_srate:sh_audio->samplerate,
       sh_audio->channels,sh_audio->sample_format,0)){
@@ -1425,7 +1425,7 @@
   uninit_player(INITED_AO); // close device
 }
 if(!sh_video){
-   mp_msg(MSGT_CPLAYER,MSGL_INFO,"Video: no video!!!\n");
+   mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
    if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks\n",d_video->packs);
    ds_free_packs(d_video);
    d_video->id=-2;
@@ -1576,7 +1576,7 @@
     mp_dbg(MSGT_AVSYNC,MSGL_DBG2,"*** ftime=%5.3f ***\n",frame_time);
 
     if(sh_video->vf_inited<0){
-	mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\nFATAL: Couldn't initialize video filters (-vop) or video output (-vo) !\n");
+	mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_NotInitializeVOPorVO);
 	eof=1; goto goto_next_file;
     }
 
@@ -1880,7 +1880,7 @@
     mp_cmd_t* cmd;
 #endif
       if(!quiet) {
-	mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\n------ PAUSED -------\r");
+	mp_msg(MSGT_CPLAYER,MSGL_STATUS,MSGTR_Paused);
 	fflush(stdout);
       }
 #ifdef HAVE_NEW_GUI
@@ -2408,7 +2408,7 @@
     case MP_CMD_LOADLIST : {
       play_tree_t* e = parse_playlist_file(cmd->args[0].v.s);
       if(!e)
-	mp_msg(MSGT_CPLAYER,MSGL_ERR,"\nUnable to load playlist %s\n",cmd->args[0].v.s);
+	mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_PlaylistLoadUnable,cmd->args[0].v.s);
       else {
 	// Go back to the start point
 	while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)




More information about the MPlayer-cvslog mailing list