CVS: main mencoder.c,1.146,1.147 help_mp-de.h,1.35,1.36 help_mp-en.h,1.38,1.39

7 Aug 2002

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

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

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147

--- mencoder.c	7 Aug 2002 09:08:10 -0000	1.146
+++ mencoder.c	7 Aug 2002 18:24:25 -0000	1.147
@@ -25,7 +25,7 @@
 
 static char* banner_text=
 "\n\n"
-"MEncoder " VERSION "(C) 2000-2002 Arpad Gereoffy (see DOCS!)\n"
+"MEncoder " VERSION MSGTR_MEncoderCopyright
 "\n";
 
 #include "cpudetect.h"
@@ -359,7 +359,7 @@
   stream2=open_stream(frameno_filename,0,&i);
   if(stream2){
     demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2);
-    if(demuxer2) printf("Using pass3 control file: %s\n",frameno_filename);
+    if(demuxer2) printf(MSGTR_UsingPass3ControllFile,frameno_filename);
   }
 
   playtree = play_tree_new();
@@ -382,7 +382,7 @@
   }
 
   if(!filename && !vcd_track && !dvd_title && !tv_param_on){
-	printf("\nMissing filename!\n\n");
+	printf(MSGTR_MissingFilename);
 	mencoder_exit(1,NULL);
   }
 
@@ -406,7 +406,7 @@
   stream=open_stream(filename,vcd_track,&file_format);
 
   if(!stream){
-	printf("Cannot open file/device\n");
+	printf(MSGTR_CannotOpenFile_Device);
 	mencoder_exit(1,NULL);
   }
 
@@ -433,7 +433,7 @@
   if (dvd_auth_device) {
     //  if (dvd_auth(dvd_auth_device,f)) {
     if (dvd_auth(dvd_auth_device,filename)) {
-      mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Error in DVD auth...\n");
+      mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorDVDAuth);
       mencoder_exit(1,NULL);
     }
     mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk);
@@ -447,7 +447,7 @@
   //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id);
   demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);
   if(!demuxer){
-	printf("Cannot open demuxer\n");
+	printf(MSGTR_CannotOpenDemuxer);
 	mencoder_exit(1,NULL);
   }
 
@@ -468,11 +468,11 @@
   );
 
   if(sh_audio && out_audio_codec<0){
-    mp_msg(MSGT_MENCODER,MSGL_FATAL,"\nNo audio encoder (-oac) selected! Select one or use -nosound. Use -oac help !\n");
+    mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioEncoderSelected);
     mencoder_exit(1,NULL);
   }
   if(sh_video && out_video_codec<0){
-    mp_msg(MSGT_MENCODER,MSGL_FATAL,"\nNo video encoder (-ovc) selected! Select one, use -ovc help !\n");
+    mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoVideoEncoderSelected);
     mencoder_exit(1,NULL);
   }
 
@@ -502,7 +502,7 @@
 }
 
 if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf)){
-  mp_msg(MSGT_MENCODER,MSGL_V,"Initializing audio codec...\n");
+  mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_InitializingAudioCodec);
   if(!init_audio(sh_audio)){
     mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_CouldntInitAudioCodec);
     sh_audio=d_audio->sh=NULL;
@@ -573,7 +573,7 @@
 // set up output file:
 muxer_f=fopen(out_filename,"wb");
 if(!muxer_f) {
-  printf("Cannot open output file '%s'\n", out_filename);
+  printf(MSGTR_CannotOpenOutputFile, out_filename);
   mencoder_exit(1,NULL);
 }
 
@@ -643,7 +643,7 @@
         sh_video->vfilter=vf_open_encoder(NULL,"libdv",(char *)mux_v); break;
     }
     if(!mux_v->bih || !sh_video->vfilter){
-        mp_msg(MSGT_MENCODER,MSGL_FATAL,"Failed to open the encoder\n");
+        mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_EncoderOpenFailed);
         mencoder_exit(1,NULL);
     }
     // append 'expand' filter, it fixes stride problems and renders osd:
@@ -656,7 +656,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;
@@ -684,7 +684,7 @@
 {
     mux_v->bih->biCompression = mmioFOURCC(force_fourcc[0], force_fourcc[1],
 					    force_fourcc[2], force_fourcc[3]);
-    printf("Forcing output fourcc to %x [%.4s]\n",
+    printf(MSGTR_ForcingOutputFourcc,
 	mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression);
 }
 
@@ -777,7 +777,7 @@
 
 } // if(sh_audio)
 
-printf("Writing AVI header...\n");
+printf(MSGTR_WritingAVIHeader);
 aviwrite_write_header(muxer,muxer_f);
 
 decoded_frameno=0;
@@ -1046,7 +1046,7 @@
 
 if(skip_flag<0){
     // duplicate frame
-	if(!tv_param_on && !verbose) printf("\nduplicate %d frame(s)!!!    \n",-skip_flag);
+	if(!tv_param_on && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
     while(skip_flag<0){
 	duplicatedframes++;
 	aviwrite_write_chunk(muxer,mux_v,muxer_f,0,0);
@@ -1055,7 +1055,7 @@
 } else
 if(skip_flag>0){
     // skip frame
-	if(!tv_param_on && !verbose) printf("\nskip frame!!!    \n");
+	if(!tv_param_on && !verbose) printf(MSGTR_SkipFrame);
 	skippedframes++;
     --skip_flag;
 }
@@ -1181,7 +1181,7 @@
 #endif
 
  if(ferror(muxer_f)) {
-     mp_msg(MSGT_MENCODER,MSGL_FATAL,"%s: error writing file.\n", out_filename);
+     mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename);
      mencoder_exit(1, NULL);
  }
 
@@ -1202,29 +1202,29 @@
 }
 #endif
 
-printf("\nWriting AVI index...\n");
+printf(MSGTR_WritingAVIIndex);
 aviwrite_write_index(muxer,muxer_f);
 muxer_f_size=ftello(muxer_f);
-printf("Fixup AVI header...\n");
+printf(MSGTR_FixupAVIHeader);
 fseek(muxer_f,0,SEEK_SET);
 aviwrite_write_header(muxer,muxer_f); // update header
 if(ferror(muxer_f) || fclose(muxer_f) != 0) {
-    mp_msg(MSGT_MENCODER,MSGL_FATAL,"%s: error writing file.\n", out_filename);
+    mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename);
     mencoder_exit(1, NULL);
 }
 if(vobsub_writer)
     vobsub_out_close(vobsub_writer);
 
 if(out_video_codec==VCODEC_FRAMENO && mux_v->timer>100){
-    printf("Recommended video bitrate for 650MB CD: %d\n",(int)((650*1024*1024-muxer_f_size)/mux_v->timer/125));
-    printf("Recommended video bitrate for 700MB CD: %d\n",(int)((700*1024*1024-muxer_f_size)/mux_v->timer/125));
-    printf("Recommended video bitrate for 800MB CD: %d\n",(int)((800*1024*1024-muxer_f_size)/mux_v->timer/125));
+    printf(MSGTR_RecommendedVideoBitrate,"650MB",(int)((650*1024*1024-muxer_f_size)/mux_v->timer/125));
+    printf(MSGTR_RecommendedVideoBitrate,"700MB",(int)((700*1024*1024-muxer_f_size)/mux_v->timer/125));
+    printf(MSGTR_RecommendedVideoBitrate,"800MB",(int)((800*1024*1024-muxer_f_size)/mux_v->timer/125));
 }
 
-printf("\nVideo stream: %8.3f kbit/s  (%d bps)  size: %d bytes  %5.3f secs  %d frames\n",
+printf(MSGTR_VideoStreamResult,
     (float)(mux_v->size/mux_v->timer*8.0f/1000.0f), (int)(mux_v->size/mux_v->timer), (int)mux_v->size, (float)mux_v->timer, decoded_frameno);
 if(sh_audio)
-printf("\nAudio stream: %8.3f kbit/s  (%d bps)  size: %d bytes  %5.3f secs\n",
+printf(MSGTR_AudioStreamResult,
     (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (int)mux_a->size, (float)mux_a->timer);
 
 if(stream) free_stream(stream); // kill cache thread

Index: help_mp-de.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-de.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- help_mp-de.h	5 Aug 2002 18:37:14 -0000	1.35
+++ help_mp-de.h	7 Aug 2002 18:24:25 -0000	1.36
@@ -138,6 +138,29 @@
 #define MSGTR_Paused "\n------ PAUSE -------\r"
 #define MSGTR_PlaylistLoadUnable "\nKann Playliste %s nicht laden\n"
 
+// mencoder.c:
+
+#define MSGTR_MEncoderCopyright "(C) 2000-2002 Arpad Gereoffy (siehe DOCS!)\n"
+#define MSGTR_UsingPass3ControllFile "Verwende Pass 3 Kontrolldatei: %s\n"
+#define MSGTR_MissingFilename "\nDateiname nicht angegeben!\n\n"
+#define MSGTR_CannotOpenFile_Device "Kann Datei/Gerät nicht öffnen\n"
+#define MSGTR_ErrorDVDAuth "Fehler bei der DVD Authentifizierung...\n"
+#define MSGTR_CannotOpenDemuxer "Kann Demuxer nicht öffnen\n"
+#define MSGTR_NoAudioEncoderSelected "\nKein Audioencoder (-oac) ausgewählt! Wähle einen aus oder verwende -nosound. Verwende -oac help !\n"
+#define MSGTR_NoVideoEncoderSelected "\nKein Videoencoder (-ovc) selected! Wähle einen aus, verwende -ovc help !\n"
+#define MSGTR_CannotOpenOutputFile "Kann Ausgabedatei '%s' nicht öffnen\n"
+#define MSGTR_EncoderOpenFailed "Öffnen des Encoders fehlgeschlagen\n"
+#define MSGTR_ForcingOutputFourcc "Output-Fourcc auf %x [%.4s] gestellt\n"
+#define MSGTR_WritingAVIHeader "Schreibe AVI Header...\n"
+#define MSGTR_DuplicateFrames "\n%d doppelte(r) Frame(s)!!!    \n"
+#define MSGTR_SkipFrame "\nFrame ausgelassen!!!    \n"
+#define MSGTR_ErrorWritingFile "%s: Fehler beim Schreiben der Datei.\n"
+#define MSGTR_WritingAVIIndex "\nSchreibe AVI Index...\n"
+#define MSGTR_FixupAVIHeader "Fixiere AVI Header...\n"
+#define MSGTR_RecommendedVideoBitrate "Empfohlene Videobitrate für %s CD: %d\n"
+#define MSGTR_VideoStreamResult "\nVideostream: %8.3f kbit/s  (%d bps)  Größe: %d Bytes  %5.3f Sek.  %d Frames\n"
+#define MSGTR_AudioStreamResult "\nAudiostream: %8.3f kbit/s  (%d bps)  Größe: %d Bytes  %5.3f Sek.\n"
+
 // open.c, stream.c:
 #define MSGTR_CdDevNotfound "CD-ROM Gerät '%s' nicht gefunden!\n"
 #define MSGTR_ErrTrackSelect "Fehler beim Auswählen des VCD Tracks!"

Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp-en.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- help_mp-en.h	5 Aug 2002 18:37:14 -0000	1.38
+++ help_mp-en.h	7 Aug 2002 18:24:25 -0000	1.39
@@ -140,6 +140,30 @@
 #define MSGTR_Paused "\n------ PAUSED -------\r"
 #define MSGTR_PlaylistLoadUnable "\nUnable to load playlist %s\n"
 
+// mencoder.c:
+
+#define MSGTR_MEncoderCopyright "(C) 2000-2002 Arpad Gereoffy (see DOCS!)\n"
+#define MSGTR_UsingPass3ControllFile "Using pass3 control file: %s\n"
+#define MSGTR_MissingFilename "\nMissing filename!\n\n"
+#define MSGTR_CannotOpenFile_Device "Cannot open file/device\n"
+#define MSGTR_ErrorDVDAuth "Error in DVD auth...\n"
+#define MSGTR_CannotOpenDemuxer "Cannot open demuxer\n"
+#define MSGTR_NoAudioEncoderSelected "\nNo audio encoder (-oac) selected! Select one or use -nosound. Use -oac help !\n"
+#define MSGTR_NoVideoEncoderSelected "\nNo video encoder (-ovc) selected! Select one, use -ovc help !\n"
+#define MSGTR_InitializingAudioCodec "Initializing audio codec...\n"
+#define MSGTR_CannotOpenOutputFile "Cannot open output file '%s'\n"
+#define MSGTR_EncoderOpenFailed "Failed to open the encoder\n"
+#define MSGTR_ForcingOutputFourcc "Forcing output fourcc to %x [%.4s]\n"
+#define MSGTR_WritingAVIHeader "Writing AVI header...\n"
+#define MSGTR_DuplicateFrames "\nduplicate %d frame(s)!!!    \n"
+#define MSGTR_SkipFrame "\nskip frame!!!    \n"
+#define MSGTR_ErrorWritingFile "%s: error writing file.\n"
+#define MSGTR_WritingAVIIndex "\nWriting AVI index...\n"
+#define MSGTR_FixupAVIHeader "Fixup AVI header...\n"
+#define MSGTR_RecommendedVideoBitrate "Recommended video bitrate for %s CD: %d\n"
+#define MSGTR_VideoStreamResult "\nVideo stream: %8.3f kbit/s  (%d bps)  size: %d bytes  %5.3f secs  %d frames\n"
+#define MSGTR_AudioStreamResult "\nAudio stream: %8.3f kbit/s  (%d bps)  size: %d bytes  %5.3f secs\n"
+
 // open.c, stream.c:
 #define MSGTR_CdDevNotfound "CD-ROM Device '%s' not found!\n"
 #define MSGTR_ErrTrackSelect "Error selecting VCD track!"

    

Johannes Feigl

tags

participants (1)