Use global disable subtitles option instead of transcoder specific op…

…tion
ps3mediaserver · Aug 27, 2012 · 86d14f2 · 86d14f2
1 parent d96888a
commit 86d14f2
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/src/main/java/net/pms/encoders/VLCVideo.java b/src/main/java/net/pms/encoders/VLCVideo.java
@@ -60,7 +60,6 @@ public class VLCVideo extends Player {
 	protected JCheckBox hardwareAccel;
 	protected JTextField audioPri;
 	protected JTextField subtitlePri;
-	protected JCheckBox subtitleEnabled;
 	protected JTextField scale;
 	protected JCheckBox codecOverride;
 	protected JTextField codecVideo;
@@ -290,7 +289,7 @@ public ProcessWrapper launchTranscode(String fileName, DLNAResource dlna, DLNAMe
 			} else { // Load by ID (better)
 				cmdList.add("--sub-track=" + params.sid.getId());
 			}
-		} else if (subtitleEnabled.isSelected()) { // Not specified, use language from GUI if enabled
+		} else if (!pmsconfig.isMencoderDisableSubs()){ // Not specified, use language from GUI if enabled
 			cmdList.add("--sub-language=" + subtitlePri.getText());
 		} else {
 			cmdList.add("--sub-" + disableSuffix);
@@ -378,14 +377,7 @@ public void itemStateChanged(ItemEvent e) {
 				pmsconfig.setVlcAudioSyncEnabled(e.getStateChange() == ItemEvent.SELECTED);
 			}
 		});
-		mainPanel.append(subtitleEnabled = new JCheckBox(Messages.getString("VlcTrans.5"), pmsconfig.isVlcSubtitleEnabled()), 3);
-		subtitleEnabled.setContentAreaFilled(false);
-		subtitleEnabled.addItemListener(new ItemListener() {
-			@Override
-			public void itemStateChanged(ItemEvent e) {
-				pmsconfig.setVlcSubtitleEnabled(e.getStateChange() == ItemEvent.SELECTED);
-			}
-		});
+		mainPanel.nextLine();
 
 		mainPanel.append(Messages.getString("VlcTrans.6"), audioPri = new JTextField(pmsconfig.getVlcAudioPri()));
 		audioPri.addKeyListener(new KeyAdapter() {