From db80f6973084ae36336589776a4b9e6f3f590ddd Mon Sep 17 00:00:00 2001 From: yukihane Date: Wed, 31 Aug 2011 16:20:57 +0900 Subject: [PATCH] =?utf8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E3=83=97=E3=83=AD?= =?utf8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E6=A7=8B=E7=AF=89=E6=99=82?= =?utf8?q?=E3=81=ABffmpeg=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?= =?utf8?q?=E3=82=92=E3=82=B3=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0=E3=81=8B?= =?utf8?q?=E3=82=89=E3=81=A7=E3=81=AA=E3=81=8F=E7=94=BB=E9=9D=A2=E8=A8=AD?= =?utf8?q?=E5=AE=9A=E3=81=8B=E3=82=89=E8=AA=AD=E3=82=80=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- frontend/src/yukihane/inqubus/gui/MainFrame.java | 27 +++++++++++------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java index 082b46a..4643fea 100644 --- a/frontend/src/yukihane/inqubus/gui/MainFrame.java +++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java @@ -1287,11 +1287,8 @@ public class MainFrame extends JFrame { private final boolean adjustRatio; private InqubusFfmpegProfile() throws IOException { - // TODO FFMPEGオプションは、後でメイン画面でも設定できるようにするかも - final Config p = Config.INSTANCE; - final String opf = p.getFfmpegOptionFile(); - if (StringUtils.isNotEmpty(opf)) { - final File file = new File(opf); + final File file = pnlInputFfmpeg.mdlFfmpegOption.getSelectedFile(); + if (file != null) { final FfmpegOption ffop = FfmpegOption.load(file); this.extOption = ffop.getExtOption(); this.inOption = ffop.getInOption(); @@ -1302,17 +1299,17 @@ public class MainFrame extends JFrame { this.resizeWidth = ffop.getResizeWidth(); this.resizeHeight = ffop.getResizeHeight(); this.adjustRatio = ffop.isAdjustRatio(); - return; + } else { + this.extOption = pnlInputFfmpeg.fldFfmpegOptionExtension.getText(); + this.inOption = pnlInputFfmpeg.fldFfmpegOptionIn.getText(); + this.mainOption = pnlInputFfmpeg.fldFfmpegOptionMain.getText(); + this.outOption = pnlInputFfmpeg.fldFfmpegOptionOut.getText(); + this.avOption = pnlInputFfmpeg.fldFfmpegOptionAv.getText(); + this.resize = pnlInputFfmpeg.cbFfmpegOptionResize.isSelected(); + this.resizeWidth = Integer.parseInt(pnlInputFfmpeg.fldFfmpegOptionResizeWidth.getText()); + this.resizeHeight = Integer.parseInt(pnlInputFfmpeg.fldFfmpegOptionResizeHeight.getText()); + this.adjustRatio = pnlInputFfmpeg.cbFfmpegOptionKeepAspect.isSelected(); } - this.extOption = p.getFfmpegExtension(); - this.inOption = p.getFfmpegInOption(); - this.mainOption = p.getFfmpegMainOption(); - this.outOption = p.getFfmpegOutOption(); - this.avOption = p.getFfmpegAvOption(); - this.resize = p.getFfmpegResizeEnable(); - this.resizeWidth = Integer.parseInt(p.getFfmpegResizeWidth()); - this.resizeHeight = Integer.parseInt(p.getFfmpegResizeHeight()); - this.adjustRatio = p.getFfmpegKeepAspect(); } @Override -- 2.11.0