Mercurial > mplayer.hg

changeset 16955:2026ca5663cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reordered subtitles language OSD display, since it worked bad for ogm...
author ptt
date Wed, 09 Nov 2005 23:18:38 +0000
parents 1bfa04bb4b83
children 5f5982c098b9
files mplayer.c
diffstat 1 files changed, 35 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Wed Nov 09 22:17:20 2005 +0000
+++ b/mplayer.c	Wed Nov 09 23:18:38 2005 +0000
@@ -4131,44 +4131,45 @@
       } else
       if (osd_show_vobsub_changed) {
 	  snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesOff);
-	  if (vo_vobsub && vobsub_id >= 0) {
-	      const char *language = MSGTR_OSDnone;
-	      language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
-	      snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, vobsub_id, language ? language : MSGTR_OSDunknown);
-	  }
+          switch (demuxer->type) {
+#ifdef HAVE_MATROSKA
+              case DEMUXER_TYPE_MATROSKA:
+                  if (dvdsub_id >= 0) {
+                      char lang[40] = MSGTR_OSDunknown;
+                      demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 39);
+                      lang[39] = 0;
+                      snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang);
+                  }
+                  break;
+#endif
 #ifdef HAVE_OGGVORBIS
-	  if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) {
-	      if (dvdsub_id >= 0) {
-		char *lang = demux_ogg_sub_lang(demuxer, dvdsub_id);
-		if (!lang) lang = MSGTR_OSDunknown;
-		snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang);
-	      }
-	  }
+              case DEMUXER_TYPE_OGG:
+                  if (d_dvdsub && dvdsub_id >= 0) {
+                      char *lang = demux_ogg_sub_lang(demuxer, dvdsub_id);
+                      snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang ? lang : MSGTR_OSDunknown);
+                  }
+                  break;
 #endif
+              default:
+                  if (vo_vobsub && vobsub_id >= 0) {
+                      char *language = MSGTR_OSDnone;
+                      language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
+                      snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, vobsub_id, language ? language : MSGTR_OSDunknown);
+                  }
 #ifdef USE_DVDREAD
-	  if (vo_spudec && (demuxer->type != DEMUXER_TYPE_MATROSKA)) {
-	      if (dvdsub_id >= 0) {
-		  char lang[3] = "\0\0\0";
-		  int code = 0;
-		  code = dvd_lang_from_sid(stream, dvdsub_id);
-		  if (code) {
-		      lang[0] = code >> 8;
-		      lang[1] = code;
-		  }
-		  snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, code ? lang : MSGTR_OSDnone);
-	      }
-	  }
+                  if (vo_spudec && dvdsub_id >= 0) {
+                      char lang[3] = "\0\0\0";
+                      int code = 0;
+                      code = dvd_lang_from_sid(stream, dvdsub_id);
+                      if (code) {
+                          lang[0] = code >> 8;
+                          lang[1] = code;
+                      }
+                      snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, code ? lang : MSGTR_OSDnone);
+                  }
 #endif
-#ifdef HAVE_MATROSKA
-    if (demuxer->type == DEMUXER_TYPE_MATROSKA) {
-      char lang[40] = MSGTR_OSDunknown;
-      if (dvdsub_id >= 0) {
-        demux_mkv_get_sub_lang(demuxer, dvdsub_id, lang, 39);
-        lang[39] = 0;
-	snprintf(osd_text_tmp, 63, MSGTR_OSDSubtitlesLanguage, dvdsub_id, lang);
-      }
-    }
-#endif
+                  break;
+          }
 	  osd_show_vobsub_changed--;
       } else
 #ifdef USE_SUB