- Code: Select all
Index: net/pms/encoders/MEncoderVideo.java
===================================================================
--- net/pms/encoders/MEncoderVideo.java (revision 410)
+++ net/pms/encoders/MEncoderVideo.java (working copy)
@@ -1324,10 +1324,10 @@
if (subString != null && !configuration.isMencoderDisableSubs() && !avisynth()) {
if (params.sid.type == DLNAMediaSubtitle.VOBSUB) {
// vobsub not supported in MEncoder :\
- //cmdArray[cmdArray.length-4] = "-vobsub";
- //cmdArray[cmdArray.length-3] = subString.substring(0, subString.length()-4);
- cmdArray[cmdArray.length-4] = "-quiet"; //$NON-NLS-1$
- cmdArray[cmdArray.length-3] = "-quiet"; //$NON-NLS-1$
+ cmdArray[cmdArray.length-4] = "-vobsub";
+ cmdArray[cmdArray.length-3] = subString.substring(0, subString.length()-4);
+ //cmdArray[cmdArray.length-4] = "-quiet"; //$NON-NLS-1$
+ //cmdArray[cmdArray.length-3] = "-quiet"; //$NON-NLS-1$
} else {
cmdArray[cmdArray.length-4] = "-sub"; //$NON-NLS-1$
cmdArray[cmdArray.length-3] = subString.replace(",", "\\,"); // comas in mencoder separates multiple subtitles files //$NON-NLS-1$ //$NON-NLS-2$
Index: net/pms/dlna/DLNAMediaInfo.java
===================================================================
--- net/pms/dlna/DLNAMediaInfo.java (revision 410)
+++ net/pms/dlna/DLNAMediaInfo.java (working copy)
@@ -548,6 +548,17 @@
lang.lang = DLNAMediaLang.UND;
lang.id = subId++;
subtitlesCodes.add(lang);
+ } else if (line.indexOf("Subtitle:") > -1 && line.contains("dvdsub")) {
+ DLNAMediaSubtitle lang = new DLNAMediaSubtitle();
+ lang.type = DLNAMediaSubtitle.VOBSUB;
+ int a = line.indexOf("(");
+ int b = line.indexOf("):", a);
+ if (a > -1 && b > a) {
+ lang.lang = line.substring(a+1, b);
+ } else
+ lang.lang = DLNAMediaLang.UND;
+ lang.id = subId++;
+ subtitlesCodes.add(lang);
}
}
}