Translation system changes part 2: replace macros by strings

Replace all MSGTR_ macros in the source by the corresponding English
string.

1 files changed, 14 insertions, 14 deletions

diff --git a/libao2/ao_sgi.c b/libao2/ao_sgi.c
index 89d4176889..8a2899d915 100644
--- a/libao2/ao_sgi.c
+++ b/libao2/ao_sgi.c
@@ -117,7 +117,7 @@ static int fmt2sgial(int *format, int *width) {
 // to set/get/query special features/parameters
 static int control(int cmd, void *arg){
   
-  mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_INFO);
+  mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] control.\n");
   
   switch(cmd) {
   case AOCONTROL_QUERY_FORMAT:
@@ -138,7 +138,7 @@ static int init(int rate, int channels, int format, int flags) {
 
   smpfmt = fmt2sgial(&format, &smpwidth);
 
-  mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_InitInfo, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format));
+  mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] init: Samplerate: %iHz Channels: %s Format %s\n", rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format));
   
   { /* from /usr/share/src/dmedia/audio/setrate.c */
   
@@ -148,7 +148,7 @@ static int init(int rate, int channels, int format, int flags) {
     if(ao_subdevice) {
       rv = alGetResourceByName(AL_SYSTEM, ao_subdevice, AL_OUTPUT_DEVICE_TYPE);
       if (!rv) {
-	mp_tmsg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InvalidDevice);
+	mp_tmsg(MSGT_AO, MSGL_ERR, "[AO SGI] play: invalid device.\n");
 	return 0;
       }
     }
@@ -161,20 +161,20 @@ static int init(int rate, int channels, int format, int flags) {
     x[1].value.i = AL_CRYSTAL_MCLK_TYPE;
 
     if (alSetParams(rv,x, 2)<0) {
-      mp_tmsg(MSGT_AO, MSGL_WARN, MSGTR_AO_SGI_CantSetParms_Samplerate, alGetErrorString(oserror()));
+      mp_tmsg(MSGT_AO, MSGL_WARN, "[AO SGI] init: setparams failed: %s\nCould not set desired samplerate.\n", alGetErrorString(oserror()));
     }
     
     if (x[0].sizeOut < 0) {
-      mp_tmsg(MSGT_AO, MSGL_WARN, MSGTR_AO_SGI_CantSetAlRate);
+      mp_tmsg(MSGT_AO, MSGL_WARN, "[AO SGI] init: AL_RATE was not accepted on the given resource.\n");
     }
 
     if (alGetParams(rv,x, 1)<0) {
-      mp_tmsg(MSGT_AO, MSGL_WARN, MSGTR_AO_SGI_CantGetParms, alGetErrorString(oserror()));
+      mp_tmsg(MSGT_AO, MSGL_WARN, "[AO SGI] init: getparams failed: %s\n", alGetErrorString(oserror()));
     }
     
     realrate = alFixedToDouble(x[0].value.ll);
     if (frate != realrate) {
-      mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_SampleRateInfo, realrate, frate);
+      mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] init: samplerate is now %lf (desired rate is %lf)\n", realrate, frate);
     } 
     sample_rate = (int)realrate;
   }
@@ -191,7 +191,7 @@ static int init(int rate, int channels, int format, int flags) {
   ao_config = alNewConfig();
   
   if (!ao_config) {
-    mp_tmsg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InitConfigError, alGetErrorString(oserror()));
+    mp_tmsg(MSGT_AO, MSGL_ERR, "[AO SGI] init: %s\n", alGetErrorString(oserror()));
     return 0;
   }
   
@@ -200,14 +200,14 @@ static int init(int rate, int channels, int format, int flags) {
      alSetSampFmt(ao_config, smpfmt) < 0 ||
      alSetQueueSize(ao_config, sample_rate) < 0 ||
      alSetDevice(ao_config, rv) < 0) {
-    mp_tmsg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InitConfigError, alGetErrorString(oserror()));
+    mp_tmsg(MSGT_AO, MSGL_ERR, "[AO SGI] init: %s\n", alGetErrorString(oserror()));
     return 0;
   }
   
   ao_port = alOpenPort("mplayer", "w", ao_config);
   
   if (!ao_port) {
-    mp_tmsg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InitOpenAudioFailed, alGetErrorString(oserror()));
+    mp_tmsg(MSGT_AO, MSGL_ERR, "[AO SGI] init: Unable to open audio channel: %s\n", alGetErrorString(oserror()));
     return 0;
   }
   
@@ -222,7 +222,7 @@ static void uninit(int immed) {
 
   /* TODO: samplerate should be set back to the value before mplayer was started! */
 
-  mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_Uninit);
+  mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] uninit: ...\n");
 
   if (ao_config) {
     alFreeConfig(ao_config);
@@ -241,7 +241,7 @@ static void uninit(int immed) {
 // stop playing and empty buffers (for seeking/pause)
 static void reset(void) {
   
-  mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_Reset);
+  mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] reset: ...\n");
   
   alDiscardFrames(ao_port, queue_size);
 }
@@ -249,14 +249,14 @@ static void reset(void) {
 // stop playing, keep buffers (for pause)
 static void audio_pause(void) {
     
-  mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_PauseInfo);
+  mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] audio_pause: ...\n");
     
 }
 
 // resume playing, after audio_pause()
 static void audio_resume(void) {
 
-  mp_tmsg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_ResumeInfo);
+  mp_tmsg(MSGT_AO, MSGL_INFO, "[AO SGI] audio_resume: ...\n");
 
 }