From 0869038a05b99c5935ae66f11c1ebc6b9cf1a6de Mon Sep 17 00:00:00 2001 From: yukihane Date: Tue, 6 Sep 2011 18:38:36 +0900 Subject: [PATCH] =?utf8?q?=E5=A4=89=E6=8F=9B=E4=B8=AD=E5=8B=95=E7=94=BB?= =?utf8?q?=E8=A1=A8=E7=A4=BA=E3=81=AE=E6=9C=89=E7=84=A1=E3=81=A8dll?= =?utf8?q?=E4=BD=BF=E7=94=A8=E6=9C=89=E7=84=A1=E3=81=AE=E3=82=B3=E3=83=B3?= =?utf8?q?=E3=83=95=E3=82=A3=E3=82=B0=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- frontend/src/yukihane/inqubus/config/Config.java | 18 +++++++++++ .../inqubus/config/ConfigConvertProfile.java | 6 ++-- .../src/yukihane/inqubus/gui/ConfigDialog.java | 35 +++++++++++++++++++++- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/frontend/src/yukihane/inqubus/config/Config.java b/frontend/src/yukihane/inqubus/config/Config.java index d98f4c7..7e654e8 100644 --- a/frontend/src/yukihane/inqubus/config/Config.java +++ b/frontend/src/yukihane/inqubus/config/Config.java @@ -419,6 +419,24 @@ public enum Config { public void setFfmpegKeepAspect(boolean s) { config.setProperty(FFMPEG_PARAM_KEEP_ASPECT, s); } + private static final String DISPLAY_CONVERTING = "convert.display_converting"; + + public boolean getFfmpegDisplayConverting() { + return config.getBoolean(DISPLAY_CONVERTING, true); + } + + public void setFfmpegDisplayConverting(boolean s) { + config.setProperty(DISPLAY_CONVERTING, s); + } + private static final String DLL_DISABLE = "convert.dll_disabled"; + + public boolean getFfmpegDllDisabled() { + return config.getBoolean(DLL_DISABLE, false); + } + + public void setFfmpegDllDisabled(boolean s) { + config.setProperty(DLL_DISABLE, s); + } private static final String NG_WORD = "ng.word"; @SuppressWarnings("unchecked") diff --git a/frontend/src/yukihane/inqubus/config/ConfigConvertProfile.java b/frontend/src/yukihane/inqubus/config/ConfigConvertProfile.java index d90580d..b94ea9d 100644 --- a/frontend/src/yukihane/inqubus/config/ConfigConvertProfile.java +++ b/frontend/src/yukihane/inqubus/config/ConfigConvertProfile.java @@ -37,8 +37,7 @@ public abstract class ConfigConvertProfile implements ConvertProfile { this.ffmpegProfile = new ConfigFfmpegProfile(); this.convert = p.getOutputEnable(); this.ffmpeg = new File(p.getFfmpegPath()); - // TODO コンフィグに設定なし - this.vhookDisabled = false; + this.vhookDisabled = p.getFfmpegDllDisabled(); this.commentOverlay = p.getOutputCommentOverlay(); this.vhook = new File(p.getFfmpegDllPath()); this.tempDir = new File(p.getSystemTempDir()); @@ -47,8 +46,7 @@ public abstract class ConfigConvertProfile implements ConvertProfile { this.commentOpaque = p.getCommentOpaque(); this.disableFontSizeArrange = p.getFontSizeArrangeDisable(); this.shadowIndex = p.getFontShadow(); - // TODO コンフィグに設定なし - this.showConverting = true; + this.showConverting = p.getFfmpegDisplayConverting(); this.maxNumOfComment = (p.getCommentDisplaySizeDefault()) ? -1 : Integer.parseInt(p.getCommentDisplaySizeManual()); this.ngSetting = new ConfigHideCondition(); diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java index 5dfe7fb..4d8da7c 100644 --- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java +++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java @@ -492,7 +492,6 @@ public class ConfigDialog extends JDialog { btnFfmpegDllPath.addActionListener( new FileChooseAction(ConfigDialog.this, JFileChooser.FILES_ONLY, fldFfmpegDllPath)); - GroupLayout gl_jPanel10 = new GroupLayout(pnlFfmpegBinPath); pnlFfmpegBinPath.setLayout(gl_jPanel10); gl_jPanel10.setHorizontalGroup( @@ -529,17 +528,36 @@ public class ConfigDialog extends JDialog { pnlFfmpegParam.setBorder(BorderFactory.createTitledBorder("ffmpegパラメータ")); + // ffmpeg - その他 + final JPanel pnlFffmpegEtc = new JPanel(); + pnlFffmpegEtc.setBorder(BorderFactory.createTitledBorder("その他")); + final GroupLayout glFfmpegEtc = new GroupLayout(pnlFffmpegEtc); + glFfmpegEtc.setAutoCreateContainerGaps(true); + glFfmpegEtc.setAutoCreateGaps(true); + pnlFffmpegEtc.setLayout(glFfmpegEtc); + + glFfmpegEtc.setHorizontalGroup(glFfmpegEtc.createParallelGroup() + .addComponent(cbDisplayConverting) + .addComponent(cbDllDisabled) + ); + glFfmpegEtc.setVerticalGroup(glFfmpegEtc.createSequentialGroup() + .addComponent(cbDisplayConverting) + .addComponent(cbDllDisabled) + ); + final GroupLayout glFfmpeg = new GroupLayout(pnlFfmpeg); glFfmpeg.setAutoCreateContainerGaps(true); pnlFfmpeg.setLayout(glFfmpeg); glFfmpeg.setHorizontalGroup(glFfmpeg.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(pnlFfmpegBinPath) .addComponent(pnlFfmpegParam) + .addComponent(pnlFffmpegEtc) ); glFfmpeg.setVerticalGroup(glFfmpeg.createSequentialGroup() .addComponent(pnlFfmpegBinPath, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addPreferredGap(ComponentPlacement.RELATED) .addComponent(pnlFfmpegParam) + .addComponent(pnlFffmpegEtc) ); tabbedPane.addTab("ffmpeg", pnlFfmpeg); @@ -806,6 +824,9 @@ public class ConfigDialog extends JDialog { private final JTextField fldFfmpegDllPath; // ffmpeg - ffmpegパラメータ private final FfmpegParamPanel pnlFfmpegParam = new FfmpegParamPanel(); + // ffmpeg - その他 + private final JCheckBox cbDisplayConverting = new JCheckBox("変換中動画表示"); + private final JCheckBox cbDllDisabled = new JCheckBox("拡張DLL無効化(デバッグ用)"); // NG設定 // NG設定 - NGワード private final NgRegisterPanel pnlNgWord = new NgRegisterPanel(); @@ -902,6 +923,12 @@ public class ConfigDialog extends JDialog { pnlFfmpegParam.init(p); /* + * ffmpeg - その他 + */ + cbDisplayConverting.setSelected(p.getFfmpegDisplayConverting()); + cbDllDisabled.setSelected(p.getFfmpegDllDisabled()); + + /* * NG 設定 */ final List ngWords = p.getNgWords(); @@ -1012,6 +1039,12 @@ public class ConfigDialog extends JDialog { p.setFfmpegKeepAspect(pnlFfmpegParam.cbFfmpegOptionKeepAspect.isSelected()); /* + * ffmpeg - その他 + */ + p.setFfmpegDisplayConverting(cbDisplayConverting.isSelected()); + p.setFfmpegDllDisabled(cbDllDisabled.isSelected()); + + /* * NG 設定 */ p.setNgWords(pnlNgWord.getAllElements()); -- 2.11.0