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.

3 files changed, 24 insertions, 24 deletions

diff --git a/demux/demux.c b/demux/demux.c
index 1e395a94d1..7ae9328e3b 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -355,7 +355,7 @@ int demuxer_add_packet(demuxer_t *demuxer, struct sh_stream *stream,
     if (stream->type != STREAM_VIDEO && dp->pts == MP_NOPTS_VALUE)
         dp->pts = dp->dts;
 
-    mp_dbg(MSGT_DEMUXER, MSGL_DBG2,
+    mp_msg(MSGT_DEMUXER, MSGL_DBG2,
            "DEMUX: Append packet to %s, len=%d  pts=%5.3f  pos=%"PRIu64" "
            "[packs: A=%d V=%d S=%d]\n", stream_type_name(stream->type),
            dp->len, dp->pts, dp->pos, count_packs(demuxer, STREAM_AUDIO),
@@ -375,13 +375,13 @@ static bool demux_check_queue_full(demuxer_t *demux)
 overflow:
 
     if (!demux->warned_queue_overflow) {
-        mp_tmsg(MSGT_DEMUXER, MSGL_ERR, "\nToo many packets in the demuxer "
+        mp_msg(MSGT_DEMUXER, MSGL_ERR, "\nToo many packets in the demuxer "
                 "packet queue (video: %d packets in %d bytes, audio: %d "
                 "packets in %d bytes, sub: %d packets in %d bytes).\n",
                 count_packs(demux, STREAM_VIDEO), count_bytes(demux, STREAM_VIDEO),
                 count_packs(demux, STREAM_AUDIO), count_bytes(demux, STREAM_AUDIO),
                 count_packs(demux, STREAM_SUB), count_bytes(demux, STREAM_SUB));
-        mp_tmsg(MSGT_DEMUXER, MSGL_HINT, "Maybe you are playing a non-"
+        mp_msg(MSGT_DEMUXER, MSGL_HINT, "Maybe you are playing a non-"
                 "interleaved stream/file or the codec failed?\n");
     }
     demux->warned_queue_overflow = true;
@@ -401,7 +401,7 @@ static void ds_get_packets(struct sh_stream *sh)
 {
     struct demux_stream *ds = sh->ds;
     demuxer_t *demux = sh->demuxer;
-    mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_get_packets (%s) called\n",
+    mp_msg(MSGT_DEMUXER, MSGL_DBG3, "ds_get_packets (%s) called\n",
            stream_type_name(sh->type));
     while (1) {
         if (ds->head)
@@ -532,10 +532,10 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
     if (ret >= 0) {
         demuxer->params = NULL;
         if (demuxer->filetype)
-            mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s (%s)\n",
+            mp_msg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s (%s)\n",
                     demuxer->filetype, desc->desc);
         else
-            mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s\n",
+            mp_msg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s\n",
                     desc->desc);
         if (stream_manages_timeline(demuxer->stream)) {
             // Incorrect, but fixes some behavior with DVD/BD
@@ -622,7 +622,7 @@ void demux_flush(demuxer_t *demuxer)
 int demux_seek(demuxer_t *demuxer, float rel_seek_secs, int flags)
 {
     if (!demuxer->seekable) {
-        mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "Cannot seek in this file.\n");
+        mp_msg(MSGT_DEMUXER, MSGL_WARN, "Cannot seek in this file.\n");
         return 0;
     }
 
@@ -718,7 +718,7 @@ int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param)
     if (oldval) {
         if (bstrcmp0(param, oldval) == 0)
             return 0;
-        mp_tmsg(MSGT_DEMUX, MSGL_INFO, "Demuxer info %.*s changed to %.*s\n",
+        mp_msg(MSGT_DEMUX, MSGL_INFO, "Demuxer info %.*s changed to %.*s\n",
                 BSTR_P(opt), BSTR_P(param));
     }
 
@@ -734,7 +734,7 @@ int demux_info_print(demuxer_t *demuxer)
     if (!info || !info->num_keys)
         return 0;
 
-    mp_tmsg(MSGT_DEMUX, MSGL_INFO, "Clip info:\n");
+    mp_msg(MSGT_DEMUX, MSGL_INFO, "Clip info:\n");
     for (n = 0; n < info->num_keys; n++) {
         mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n", info->keys[n],
                info->values[n]);
diff --git a/demux/demux_libass.c b/demux/demux_libass.c
index 73c8b3a5c8..f304757ae3 100644
--- a/demux/demux_libass.c
+++ b/demux/demux_libass.c
@@ -73,7 +73,7 @@ static int d_check_file(struct demuxer *demuxer, enum demux_check check)
 
     bstr buf = stream_read_complete(s, NULL, 100000000);
     if (!buf.start) {
-        mp_tmsg(MSGT_ASS, MSGL_ERR, "Refusing to load subtitle file "
+        mp_msg(MSGT_ASS, MSGL_ERR, "Refusing to load subtitle file "
                 "larger than 100 MB: %s\n", demuxer->filename);
         return -1;
     }
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 5f1e2a5c0a..94af8bf6b9 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -278,7 +278,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type)
             zstream.zfree = (free_func) 0;
             zstream.opaque = (voidpf) 0;
             if (inflateInit(&zstream) != Z_OK) {
-                mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+                mp_msg(MSGT_DEMUX, MSGL_WARN,
                         "[mkv] zlib initialization failed.\n");
                 goto error;
             }
@@ -294,7 +294,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type)
                 zstream.next_out = (Bytef *) (dest + zstream.total_out);
                 result = inflate(&zstream, Z_NO_FLUSH);
                 if (result != Z_OK && result != Z_STREAM_END) {
-                    mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+                    mp_msg(MSGT_DEMUX, MSGL_WARN,
                             "[mkv] zlib decompression failed.\n");
                     talloc_free(dest);
                     dest = NULL;
@@ -323,7 +323,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type)
                 if (result == 0)
                     break;
                 if (!(result & AV_LZO_OUTPUT_FULL)) {
-                    mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+                    mp_msg(MSGT_DEMUX, MSGL_WARN,
                             "[mkv] lzo decompression failed.\n");
                     talloc_free(dest);
                     dest = NULL;
@@ -400,7 +400,7 @@ static int demux_mkv_read_info(demuxer_t *demuxer)
                 }
             }
         }
-        mp_tmsg(MSGT_DEMUX, MSGL_INFO,
+        mp_msg(MSGT_DEMUX, MSGL_INFO,
                 "[mkv] This is not one of the wanted files. "
                 "Stopping attempt to open.\n");
         res = -2;
@@ -439,18 +439,18 @@ static void parse_trackencodings(struct demuxer *demuxer,
         }
 
         if (e.type == 1) {
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track "
+            mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track "
                     "number %u has been encrypted and "
                     "decryption has not yet been\n"
                     "[mkv] implemented. Skipping track.\n",
                     track->tnum);
         } else if (e.type != 0) {
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+            mp_msg(MSGT_DEMUX, MSGL_WARN,
                     "[mkv] Unknown content encoding type for "
                     "track %u. Skipping track.\n",
                     track->tnum);
         } else if (e.comp_algo != 0 && e.comp_algo != 2 && e.comp_algo != 3) {
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+            mp_msg(MSGT_DEMUX, MSGL_WARN,
                     "[mkv] Track %u has been compressed with "
                     "an unknown/unsupported compression\n"
                     "[mkv] algorithm (%" PRIu64 "). Skipping track.\n",
@@ -458,7 +458,7 @@ static void parse_trackencodings(struct demuxer *demuxer,
         }
 #if !HAVE_ZLIB
         else if (e.comp_algo == 0) {
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+            mp_msg(MSGT_DEMUX, MSGL_WARN,
                     "[mkv] Track %u was compressed with zlib "
                     "but mpv has not been compiled\n"
                     "[mkv] with support for zlib compression. "
@@ -1171,12 +1171,12 @@ static void display_create_tracks(demuxer_t *demuxer)
             break;
         }
         if (mkv_d->tracks[i]->name)
-            mp_tmsg(MSGT_DEMUX, MSGL_V,
+            mp_msg(MSGT_DEMUX, MSGL_V,
                     "[mkv] Track ID %u: %s (%s) \"%s\"\n",
                     mkv_d->tracks[i]->tnum, type, mkv_d->tracks[i]->codec_id,
                     mkv_d->tracks[i]->name);
         else
-            mp_tmsg(MSGT_DEMUX, MSGL_V, "[mkv] Track ID %u: %s (%s)\n",
+            mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Track ID %u: %s (%s)\n",
                     mkv_d->tracks[i]->tnum, type, mkv_d->tracks[i]->codec_id);
     }
 }
@@ -1286,7 +1286,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track)
                 extradata_size = track->private_size;
             }
             if (!vi->id) {
-                mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[mkv] Unknown/unsupported "
+                mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Unknown/unsupported "
                         "CodecID (%s) or missing/bad CodecPrivate\n"
                         "[mkv] data (track %u).\n",
                         track->codec_id, track->tnum);
@@ -1652,7 +1652,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track)
     return 0;
 
  error:
-    mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[mkv] Unknown/unsupported audio "
+    mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Unknown/unsupported audio "
             "codec ID '%s' for track %u or missing/faulty\n[mkv] "
             "private codec data.\n", track->codec_id, track->tnum);
     return 1;
@@ -1707,7 +1707,7 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
     sh->default_track = track->default_track;
 
     if (!subtitle_type) {
-        mp_tmsg(MSGT_DEMUX, MSGL_ERR,
+        mp_msg(MSGT_DEMUX, MSGL_ERR,
                 "[mkv] Subtitle type '%s' is not supported.\n",
                 track->codec_id);
     }
@@ -1829,7 +1829,7 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check)
     while (1) {
         uint32_t id = ebml_read_id(s, NULL);
         if (s->eof) {
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN,
+            mp_msg(MSGT_DEMUX, MSGL_WARN,
                     "[mkv] Unexpected end of file (no clusters found)\n");
             break;
         }