Pass subtitle stream/transcode decision to player

Player does not have access to DLNAResource.skipTranscodeExternalSubs(). A new parameter forceSkipTranscode is sent to the player instead.
StreamHD · Jan 29, 2012 · 8e0d886 · 8e0d886
1 parent d4642c2
commit 8e0d886
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/net/pms/dlna/DLNAResource.java b/src/main/java/net/pms/dlna/DLNAResource.java
@@ -1553,6 +1553,7 @@ public InputStream getInputStream(Range range, RendererConfiguration mediarender
 			params.timeseek = timeRange.getStartOrZero();
 			params.timeend = timeRange.getEndOrZero();
 			params.shift_scr = timeseek_auto;
+			params.forceSkipTranscodeSubs = this.StreamExternalSubs();
 
 			if (this instanceof IPushOutput) {
 				params.stdin = (IPushOutput) this;

diff --git a/src/main/java/net/pms/encoders/Player.java b/src/main/java/net/pms/encoders/Player.java
@@ -188,7 +188,7 @@ public void setAudioAndSubs(String fileName, DLNAMediaInfo media, OutputParams p
 
 		// The media contains external subtitles which should be streamed directly to the
 		// renderer. Do not transcode them.
-		if (PMS.getConfiguration().getUseSubtitles() && media != null && params.mediaRenderer != null && media.getSubtitlesCodes().hasSkipTranscodeSubs(params.mediaRenderer)) {
+		if (PMS.getConfiguration().getUseSubtitles() && params.forceSkipTranscodeSubs) {
 			logger.trace("Stream subtitles to: " + params.mediaRenderer.getRendererName());
 			params.sid = null;
 			return;

diff --git a/src/main/java/net/pms/io/OutputParams.java b/src/main/java/net/pms/io/OutputParams.java
@@ -56,6 +56,7 @@ public class OutputParams {
 	public IPushOutput stdin;
 	public boolean avidemux;
 	public boolean shift_scr;
+	public boolean forceSkipTranscodeSubs;
 
 	public OutputParams(PmsConfiguration configuration) {
 		if (configuration != null) {