Permalink
Browse files

rm remaining references to broken audio/subtitle code

  • Loading branch information...
1 parent 95dcfa7 commit 3fd861c2c657468bbc04e3f9079d87b699f32d3d @chocolateboy chocolateboy committed Sep 24, 2012
@@ -594,10 +594,9 @@ mencoder_decode =
# -----------------------
# GUI Option: Audio language priority (list)
# A comma-separated list of language codes that defines the priority for
-# MEncoder when choosing audio languages, where "loc" stands for the
-# preferred local language and "und" stands for "undefined".
+# MEncoder when choosing audio languages, where "und" stands for "undefined".
# XXX Can be empty, which pre-empts the default value.
-# Default: a localized list (e.g. "loc,eng,fre,jpn,ger,und").
+# Default: a localized list (e.g. "eng,fre,jpn,ger,und").
# mencoder_audiolangs =
@@ -607,10 +606,9 @@ mencoder_decode =
# --------------------------
# GUI Option: Subtitle language priority (list)
# A comma-separated list of language codes that defines the priority for
-# MEncoder when choosing subtitle languages, where "loc" stands for the
-# preferred local language and "und" stands for "undefined".
+# MEncoder when choosing subtitle languages, where "und" stands for "undefined".
# XXX Can be empty, which pre-empts the default value.
-# Default: a localized list (e.g. "loc,eng,fre,jpn,ger,und").
+# Default: a localized list (e.g. "eng,fre,jpn,ger,und").
# mencoder_sublangs =
@@ -636,13 +634,12 @@ forced_sub_tags =
# Determine the string of audio language and subtitle language pairs
# ordered by priority for MEncoder to try to match. Audio language and
# subtitle language should be comma separated as a pair; individual pairs
-# should be semicolon separated. "*" can be used to match any language,
-# "loc" to match the local language. Subtitle language can be defined as
-# "off" (e.g. "loc,off;jpn,loc;*,loc;*,*").
+# should be semicolon separated. "*" can be used to match any language.
+# Subtitle language can be defined as "off" (e.g. "jpn,off;*,*").
# XXX Can be empty, which pre-empts the default value.
# Default: a localized list (usually "*,*").
-# mencoder_audiosublangs = *,*
+# mencoder_audiosublangs =
# Codepage for non-unicode subtitles
# ------------------
@@ -827,8 +824,8 @@ maxaudiobuffer =
minwebbuffer =
# ---< Old deprecated options >-----------------------------------------------
-#turbomode = false
-#tsmuxer_preremix_ac3 = false
+# turbomode = false
+# tsmuxer_preremix_ac3 = false
# ---< Binary tools paths >------------------------------------------
# Path to mencoder (absolute or relative from project.binaries.dir)
@@ -635,7 +635,7 @@ private String getString(String key, String def) {
* returned.
* @param key The key to look up.
* @param def The default values to return when no valid key value can be found.
- * These values should be entered as a comma separated string, whitespace
+ * These values should be entered as a comma-separated string, whitespace
* will be trimmed. For example: <code>"gnu, gnat ,moo "</code> will be
* returned as <code>{ "gnu", "gnat", "moo" }</code>.
* @return The list of value strings configured for the key.
@@ -934,11 +934,11 @@ public String getMencoderFont() {
}
/**
- * Returns the audio language priority for MEncoder as a comma separated
+ * Returns the audio language priority for MEncoder as a comma-separated
* string. For example: <code>"eng,fre,jpn,ger,und"</code>, where "und"
* stands for "undefined".
* Can be a blank string.
- * Default value is "loc,eng,fre,jpn,ger,und".
+ * Default value is locale-specific.
*
* @return The audio language priority string.
*/
@@ -951,11 +951,11 @@ public String getMencoderAudioLanguages() {
}
/**
- * Returns the subtitle language priority for MEncoder as a comma separated
- * string. For example: <code>"loc,eng,fre,jpn,ger,und"</code>, where "loc"
- * stands for the preferred local language and "und" stands for "undefined".
+ * Returns the subtitle language priority for MEncoder as a comma-separated
+ * string. For example: <code>"eng,fre,jpn,ger,und"</code>, where "und"
+ * stands for "undefined".
* Can be a blank string.
- * Default value is "loc,eng,fre,jpn,ger,und".
+ * Default value is locale-specific.
*
* @return The subtitle language priority string.
*/
@@ -995,10 +995,9 @@ public String getMencoderForcedSubTags() {
* ordered by priority for MEncoder to try to match. Audio language
* and subtitle language should be comma separated as a pair,
* individual pairs should be semicolon separated. "*" can be used to
- * match any language, "loc" to match the local language. Subtitle
- * language can be defined as "off".
+ * match any language. Subtitle language can be defined as "off".
* Can be a blank string.
- * Default value is <code>"loc,off;jpn,loc;*,loc;*,*"</code>.
+ * Default value is locale-specific, but is usually <code>"*,*"</code>.
*
* @return The audio and subtitle languages priority string.
*/
@@ -1059,7 +1058,7 @@ public boolean isMencoderForceFps() {
}
/**
- * Sets the audio language priority for MEncoder as a comma separated
+ * Sets the audio language priority for MEncoder as a comma-separated
* string. For example: <code>"eng,fre,jpn,ger,und"</code>, where "und"
* stands for "undefined".
* @param value The audio language priority string.
@@ -157,8 +157,8 @@ MEncoderVideo.122=cp949 /* \u97e9\u8bed */
MEncoderVideo.123=cp950 /* Big5, \u53f0\u6e7e\u8bdd, \u7ca4\u8bed */
MEncoderVideo.124=UTF-8 /* Unicode */
MEncoderVideo.125=\u9009\u62e9\u5b57\u5e55\u989c\u8272
-MEncoderVideo.126=loc,eng,fre,jpn,ger,und
-MEncoderVideo.127=loc,eng,fre,jpn,ger,und
+MEncoderVideo.126=cht,tw,chi,chs
+MEncoderVideo.127=cht,tw,chi,chs
MEncoderVideo.128=*,*
NetworkTab.0=\u8bed\u8a00 [\u9700\u8981\u91cd\u542f\u7a0b\u5e8f]:
NetworkTab.1=\u6d4f\u89c8\u538b\u7f29\u6863\u6848 (.rar/.zip/.cbr)
@@ -89,6 +89,7 @@ public static String getLanguage(String code) {
}
}
}
+
return lang;
}
@@ -106,6 +107,7 @@ public static String getISO639_2Code(String code) {
String lang = null;
Iterator<Entry<String, String[]>> iterator = links.entrySet().iterator();
+
while (iterator.hasNext()) {
Entry<String, String[]> entry = iterator.next();
for (String c : entry.getValue()) {
@@ -157,12 +159,13 @@ public static boolean isCodeMatching(String language, String code) {
return true;
}
}
+
return false;
}
/**
* Verifies that two ISO codes match the same language. Returns true if a
- * match can be made, false otherwise. The alias "loc" can be used as code,
+ * match can be made, false otherwise. The alias "loc" can be used as a code,
* it will be replaced by the ISO code of the preferred language from the
* PMS settings.
*
@@ -193,6 +196,7 @@ public static boolean isCodesMatching(String code1, String code2) {
}
}
}
+
return false;
}

0 comments on commit 3fd861c

Please sign in to comment.