Replace mp_tmsg, mp_dbg -> mp_msg, remove mp_gtext(), remove set_osd_tmsg

The tmsg stuff was for the internal gettext() based translation system,
which nobody ever attempted to use and thus was removed. mp_gtext() and
set_osd_tmsg() were also for this.

mp_dbg was once enabled in debug mode only, but since we have log level
for enabling debug messages, it seems utterly useless.

2 files changed, 10 insertions, 10 deletions

diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 1ff8769cd7..f972bc581f 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -144,7 +144,7 @@ static int setup_format(struct dec_audio *da)
         // If not set, try container samplerate.
         // (Maybe this can't happen, and it's an artifact from the past.)
         da->decoded.rate = sh_audio->wf->nSamplesPerSec;
-        mp_tmsg(MSGT_DECAUDIO, MSGL_WARN, "ad_lavc: using container rate.\n");
+        mp_msg(MSGT_DECAUDIO, MSGL_WARN, "ad_lavc: using container rate.\n");
     }
 
     struct mp_chmap lavc_chmap;
@@ -198,7 +198,7 @@ static int init(struct dec_audio *da, const char *decoder)
 
     lavc_codec = avcodec_find_decoder_by_name(decoder);
     if (!lavc_codec) {
-        mp_tmsg(MSGT_DECAUDIO, MSGL_ERR,
+        mp_msg(MSGT_DECAUDIO, MSGL_ERR,
                 "Cannot find codec '%s' in libavcodec...\n", decoder);
         uninit(da);
         return 0;
@@ -254,7 +254,7 @@ static int init(struct dec_audio *da, const char *decoder)
 
     /* open it */
     if (avcodec_open2(lavc_context, lavc_codec, NULL) < 0) {
-        mp_tmsg(MSGT_DECAUDIO, MSGL_ERR, "Could not open codec.\n");
+        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "Could not open codec.\n");
         uninit(da);
         return 0;
     }
@@ -293,7 +293,7 @@ static void uninit(struct dec_audio *da)
 
     if (lavc_context) {
         if (avcodec_close(lavc_context) < 0)
-            mp_tmsg(MSGT_DECVIDEO, MSGL_ERR, "Could not close codec.\n");
+            mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Could not close codec.\n");
         av_freep(&lavc_context->extradata);
         av_freep(&lavc_context);
     }
@@ -378,7 +378,7 @@ static int decode_new_packet(struct dec_audio *da)
         da->pts_offset = 0;
     }
 
-    mp_dbg(MSGT_DECAUDIO, MSGL_DBG2, "Decoded %d -> %d samples\n", in_len,
+    mp_msg(MSGT_DECAUDIO, MSGL_DBG2, "Decoded %d -> %d samples\n", in_len,
            priv->frame.samples);
     return 0;
 }
diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c
index 6f07b4729d..1c34c6abe9 100644
--- a/audio/decode/dec_audio.c
+++ b/audio/decode/dec_audio.c
@@ -80,7 +80,7 @@ static bool reinit_audio_buffer(struct dec_audio *da)
 static void uninit_decoder(struct dec_audio *d_audio)
 {
     if (d_audio->ad_driver) {
-        mp_tmsg(MSGT_DECAUDIO, MSGL_V, "Uninit audio decoder.\n");
+        mp_msg(MSGT_DECAUDIO, MSGL_V, "Uninit audio decoder.\n");
         d_audio->ad_driver->uninit(d_audio);
     }
     d_audio->ad_driver = NULL;
@@ -91,7 +91,7 @@ static void uninit_decoder(struct dec_audio *d_audio)
 static int init_audio_codec(struct dec_audio *d_audio, const char *decoder)
 {
     if (!d_audio->ad_driver->init(d_audio, decoder)) {
-        mp_tmsg(MSGT_DECAUDIO, MSGL_V, "Audio decoder init failed.\n");
+        mp_msg(MSGT_DECAUDIO, MSGL_V, "Audio decoder init failed.\n");
         d_audio->ad_driver = NULL;
         uninit_decoder(d_audio);
         return 0;
@@ -148,14 +148,14 @@ int audio_init_best_codec(struct dec_audio *d_audio, char *audio_decoders)
         const struct ad_functions *driver = find_driver(sel->family);
         if (!driver)
             continue;
-        mp_tmsg(MSGT_DECAUDIO, MSGL_V, "Opening audio decoder %s:%s\n",
+        mp_msg(MSGT_DECAUDIO, MSGL_V, "Opening audio decoder %s:%s\n",
                 sel->family, sel->decoder);
         d_audio->ad_driver = driver;
         if (init_audio_codec(d_audio, sel->decoder)) {
             decoder = sel;
             break;
         }
-        mp_tmsg(MSGT_DECAUDIO, MSGL_WARN, "Audio decoder init failed for "
+        mp_msg(MSGT_DECAUDIO, MSGL_WARN, "Audio decoder init failed for "
                 "%s:%s\n", sel->family, sel->decoder);
     }
 
@@ -218,7 +218,7 @@ int audio_init_filters(struct dec_audio *d_audio, int in_samplerate,
 
     char *s_from = mp_audio_config_to_str(&afs->input);
     char *s_to = mp_audio_config_to_str(&afs->output);
-    mp_tmsg(MSGT_DECAUDIO, MSGL_V,
+    mp_msg(MSGT_DECAUDIO, MSGL_V,
             "Building audio filter chain for %s -> %s...\n", s_from, s_to);
     talloc_free(s_from);
     talloc_free(s_to);