Mercurial > mplayer.hg

diff mplayer.c @ 13129:cfce549da2f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Display the language code for subtitles from Matroska files.
author mosu
date Tue, 24 Aug 2004 21:37:41 +0000
parents 957fc21fc10a
children d1e1de316459
line wrap: on
line diff
--- a/mplayer.c	Tue Aug 24 21:29:51 2004 +0000
+++ b/mplayer.c	Tue Aug 24 21:37:41 2004 +0000
@@ -3641,7 +3641,7 @@
 		snprintf(osd_text_tmp, 63, "Subtitles: (%d)", dvdsub_id);
 	  }
 #ifdef USE_DVDREAD
-	  if (vo_spudec) {
+	  if (vo_spudec && (demuxer->type != DEMUXER_TYPE_MATROSKA)) {
 	      char lang[5] = "none";
 	      int code = 0;
 	      if (dvdsub_id >= 0) code = dvd_lang_from_sid(stream, dvdsub_id);
@@ -3653,6 +3653,17 @@
 	      snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang);
 	  }
 #endif
+#ifdef HAVE_MATROSKA
+    if (demuxer->type == DEMUXER_TYPE_MATROSKA) {
+      char lang[10] = "unknown";
+      if (dvdsub_id >= 0) {
+        demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 9);
+        lang[9] = 0;
+      } else
+        strcpy(lang, "off");
+      snprintf(osd_text_tmp, 63, "Subtitles: (%d) %s", dvdsub_id, lang);
+    }
+#endif
 	  osd_show_vobsub_changed--;
       } else
 #ifdef USE_SUB