Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed audio/subtitle defaults to accept anything.

  • Loading branch information...
commit 4e08cb185386f9263c4ba5d9ab3f595abb6d217b 1 parent 704a6b0
@Raptor399 Raptor399 authored
View
1  CHANGELOG
@@ -9,6 +9,7 @@ Changelog:
Added support for Samsung SMT-G7400 (UPC Horizon)
Language updates:
- Updated Chinese Traditional translation (thanks, mcc!)
+ Changed audio/subtitle defaults to accept anything
1.70.1 - 2012-08-31
View
6 src/main/external-resources/PMS.conf
@@ -638,11 +638,11 @@ forced_sub_tags =
# 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".
+# "off" (e.g. "loc,off;jpn,loc;*,loc;*,*").
# XXX Can be empty, which pre-empts the default value.
-# Default: a localized list (e.g. "loc,off;jpn,loc;*,loc;*,*").
+# Default: a localized list (usually "*,*").
-# mencoder_audiosublangs =
+# mencoder_audiosublangs = *,*
# Codepage for non-unicode subtitles
# ------------------
View
6 src/main/java/net/pms/messages.properties
@@ -158,9 +158,9 @@ MEncoderVideo.122=cp949 /* Korean */
MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */
MEncoderVideo.124=UTF-8 /* Unicode */
MEncoderVideo.125=Choose Subtitles Color
-MEncoderVideo.126=loc,eng,fre,jpn,ger,und
-MEncoderVideo.127=loc,eng,fre,jpn,ger,und
-MEncoderVideo.128=loc,off;jpn,loc;*,loc;*,*
+MEncoderVideo.126=eng,fre,jpn,ger,und
+MEncoderVideo.127=eng,fre,jpn,ger,und
+MEncoderVideo.128=*,*
MEncoderVideo.129=/* Auto */
MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */
MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */
View
6 src/main/java/net/pms/messages_bg.properties
@@ -157,9 +157,9 @@ MEncoderVideo.122=cp949 /* Korean */
MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */
MEncoderVideo.124=UTF-8 /* Unicode */
MEncoderVideo.125=\u0418\u0437\u0431\u0435\u0440\u0438 \u0446\u0432\u044f\u0442 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438\u0442\u0435
-MEncoderVideo.126=loc,eng,fre,jpn,ger,und
-MEncoderVideo.127=loc,eng,fre,jpn,ger,und
-MEncoderVideo.128=loc,off;jpn,loc;*,loc;*,*
+MEncoderVideo.126=bul,eng,fre,jpn,ger,und
+MEncoderVideo.127=bul,eng,fre,jpn,ger,und
+MEncoderVideo.128=*,*
MEncoderVideo.129=/* \u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e */
MEncoderVideo.130=enca:ru:cp1251 /* \u0420\u0443\u0441\u043a\u0438 (\u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e) */
MEncoderVideo.131=enca:pl:cp1250 /* \u0418\u0437\u0442\u043e\u0447\u043d\u0430 \u0415\u0432\u0440\u043e\u043f\u0430 (\u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e) */
View
6 src/main/java/net/pms/messages_cz.properties
@@ -157,9 +157,9 @@ MEncoderVideo.122=cp949 /* korejsk\u00e9 */
MEncoderVideo.123=cp950 /* Big5, tajvansk\u00e9, kantonsk\u00e9 */
MEncoderVideo.124=UTF-8 /* Unicode */
MEncoderVideo.125=Vyberte barvu titulk\u016f
-MEncoderVideo.126=loc,cze,eng,fre,ger,und
-MEncoderVideo.127=loc,cze,eng,fre,ger,und
-MEncoderVideo.128=loc,off;jpn,loc;*,loc;*,*
+MEncoderVideo.126=cze,eng,fre,ger,und
+MEncoderVideo.127=cze,eng,fre,ger,und
+MEncoderVideo.128=*,*
NetworkTab.0=Jazyk [nutn\u00fd restart aplikace]:
NetworkTab.1=Proch\u00e1zet .RAR/.ZIP/.CBR archivy
NetworkTab.2=Generov\u00e1n\u00ed miniatur
View
6 src/main/java/net/pms/messages_de.properties
@@ -109,9 +109,9 @@ MEncoderVideo.89=\#Zum Entfernen des 24p-Ruckelns auf einem 50hz-TV:
MEncoderVideo.91=\#Zum Remuxen falls das Video MPEG-2 und ohne Untertitel ist: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync
MEncoderVideo.92=Qualit\u00e4t der DDVD-/VOB-Untertitel (0-4) (je gr\u00f6\u00dfer, desto besser)
MEncoderVideo.93=F\u00fcge Rahmen hinzu um Overscan zu kompensieren:
-MEncoderVideo.126=loc,ger,jpn,eng,und
-MEncoderVideo.127=loc,ger,jpn,eng,und
-MEncoderVideo.128=loc,off;jpn,loc;*,loc;*,*
+MEncoderVideo.126=ger,jpn,eng,und
+MEncoderVideo.127=ger,jpn,eng,und
+MEncoderVideo.128=*,*
NetworkTab.0=Sprache [erfordert Neustart von PMS]:
NetworkTab.1=Archiv-Dateien durchsuchen (.rar/.zip/.cbr)
NetworkTab.2=Miniaturansicht-Erstellung
View
6 src/main/java/net/pms/messages_fr.properties
@@ -78,9 +78,9 @@ MEncoderVideo.35=Support am\u00e9lior\u00e9 du multicoeur
MEncoderVideo.36=Utiliser le style ASS par d\u00e9faut
MEncoderVideo.37=Dossier alternatif des sous titres
MEncoderVideo.38=Remuxer uniquement lorsque la vid\u00e9o est compatible PS3 et qu'il n'y a pas de sous-titres [TS/M2T/MOV/MP4/AVI/MKV]
-MEncoderVideo.126=loc,fre,jpn,ger,eng,und
-MEncoderVideo.127=loc,fre,jpn,ger,eng,und
-MEncoderVideo.128=loc,off;jpn,loc;*,loc;*,*
+MEncoderVideo.126=fre,jpn,ger,eng,und
+MEncoderVideo.127=fre,jpn,ger,eng,und
+MEncoderVideo.128=*,*
NetworkTab.0=Langue [red\u00e9marrage obligatoire]:
NetworkTab.1=Parcourir les archives .RAR/.ZIP/.CBR
NetworkTab.2=G\u00e9n\u00e9ration des vignettes
View
6 src/main/java/net/pms/messages_nl.properties
@@ -157,9 +157,9 @@ MEncoderVideo.122=cp949 /* Koreaans */
MEncoderVideo.123=cp950 /* Big5, Thais, Kantonees */
MEncoderVideo.124=UTF-8 /* Unicode */
MEncoderVideo.125=Kies Kleur Ondertitels
-MEncoderVideo.126=loc,dut,eng,und
-MEncoderVideo.127=loc,dut,eng,und
-MEncoderVideo.128=loc,off;*,loc;*,eng;*,*
+MEncoderVideo.126=dut,eng,und
+MEncoderVideo.127=dut,eng,und
+MEncoderVideo.128=*,*
MEncoderVideo.129=/* Automatisch */
MEncoderVideo.130=enca:ru:cp1251 /* Russisch (automatisch) */
MEncoderVideo.131=enca:pl:cp1250 /* Oost Europa (automatisch) */
View
2  src/main/java/net/pms/messages_zhs.properties
@@ -159,7 +159,7 @@ 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.128=loc,off;jpn,loc;*,loc;*,*
+MEncoderVideo.128=*,*
NetworkTab.0=\u8bed\u8a00 [\u9700\u8981\u91cd\u542f\u7a0b\u5e8f]:
NetworkTab.1=\u6d4f\u89c8\u538b\u7f29\u6863\u6848 (.rar/.zip/.cbr)
NetworkTab.2=\u751f\u6210\u7f29\u7565\u56fe

4 comments on commit 4e08cb1

@chocolateboy

This commit seems to have broken "Definitely disable subtitles" i.e. (internal) subtitles are being displayed even though mencoder_disablesubs is true. Specifically, for a file with an embedded subtitle, params.sid is null in MEncoderVideo.launchTranscode (look for the first reference to "-sid") in 1.70.0 and non-null in 1.71.0.

It's easy enough to fix that specific case, but there are several other places in MEncoderVideo where params.sid is tested for nullness which may also have been affected.

@Raptor399
Owner

Sounds like the regression lies in Player.setAudioAndSubs() then.

@Raptor399
Owner

Fixed committed in 4675d5f

@chocolateboy

Nice one.

Please sign in to comment.
Something went wrong with that request. Please try again.