ffmpegオプションファイルコンフィグ保存

diff --git a/frontend/src/saccubus/OptionComboBoxModel.java b/frontend/src/saccubus/OptionComboBoxModel.java
index d92f3de..7a589ad 100644 (file)
--- a/frontend/src/saccubus/OptionComboBoxModel.java
+++ b/frontend/src/saccubus/OptionComboBoxModel.java
@@ -38,12 +38,12 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
        private static final FFmpegSelectedItem DEFAULT_ITEM = new FFmpegSelectedItem(
                        0, null, "外部ファイルを用いず、下に直接入力する。");
 
-       protected void reload() {
-               File original_file = ((FFmpegSelectedItem) getSelectedItem()).getFile();
+       final void reload() {
+               File original_file = getSelectedItem().getFile();
                reload(original_file);
        }
 
-       protected void reload(File original_file) {
+       final void reload(File original_file) {
                int original_index = -1;
                int index = 1;
                // リストクリア
@@ -76,7 +76,8 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
        /**
         * 選ばれているオブジェクトを返す
         */
-       public Object getSelectedItem() {
+    @Override
+       public FFmpegSelectedItem getSelectedItem() {
                return getElementAt(Index);
        }
 
@@ -91,6 +92,7 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
        /**
         * オブジェクトから、インデックスを探す。
         */
+    @Override
        public void setSelectedItem(Object anItem) {
                if (anItem == null) {
                        Index = 0;
@@ -103,6 +105,7 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
        /**
         * インデックスからオブジェクトを返す。
         */
+    @Override
        public FFmpegSelectedItem getElementAt(int index) {
                if (index == 0) {
                        return DEFAULT_ITEM;
@@ -117,6 +120,7 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
         * サイズを返す。
         */
 
+    @Override
        public int getSize() {
                return Size;
        }

diff --git a/frontend/src/yukihane/inqubus/Config.java b/frontend/src/yukihane/inqubus/Config.java
index 008df66..4cbc80b 100644 (file)
--- a/frontend/src/yukihane/inqubus/Config.java
+++ b/frontend/src/yukihane/inqubus/Config.java
@@ -319,15 +319,6 @@ public enum Config {
     public void setFfmpegDllPath(String s) {
         config.setProperty(FFMPEG_DLLPATH, s);
     }
-    private static final String FFMPEG_PARAM_DIRECT = "ffmpeg.param.direct";
-
-    public boolean getFfmpegParamInputDirect() {
-        return config.getBoolean(FFMPEG_PARAM_DIRECT, true);
-    }
-
-    public void setFfmpegParamInputDirect(boolean s) {
-        config.setProperty(FFMPEG_PARAM_DIRECT, s);
-    }
     private static final String FFMPEG_PARAM_OPTIONFILE = "ffmpeg.param.optionfile";
 
     public String getFfmpegOptionFile() {

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index 39128ed..0eb8c19 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -10,12 +10,12 @@ import static javax.swing.GroupLayout.PREFERRED_SIZE;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
 import javax.swing.ComboBoxModel;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListModel;
@@ -1209,7 +1209,8 @@ public class ConfigDialog extends JDialog {
     private final JTextField fldFfmpegDllPath;
     private final JButton btnFfmpegDllPath;
     // ffmpeg - ffmpegパラメータ
-    private final JComboBox<FFmpegSelectedItem> cmbFfmpegOptionFile = new JComboBox<>(new OptionComboBoxModel());
+    private final OptionComboBoxModel mdlFfmpegOption = new OptionComboBoxModel();
+    private final JComboBox<FFmpegSelectedItem> cmbFfmpegOptionFile = new JComboBox<>(mdlFfmpegOption);
     private final JTextField fldFfmpegOptionExtension;
     private final JTextField fldFfmpegOptionMain;
     private final JTextField fldFfmpegOptionIn;
@@ -1433,8 +1434,8 @@ public class ConfigDialog extends JDialog {
         /*
          * ffmpeg - ffmpegパラメータ
          */
-        // TODO p.setFfmpegParamInputDirect(rbFfmpegOptionDirectInput.isSelected());
-        // TODO cmbFfmpegOptionFile
+        final File fileFfmpegOption = mdlFfmpegOption.getSelectedFile();
+        p.setFfmpegOptionFile(fileFfmpegOption != null ? fileFfmpegOption.getPath() : "");
         p.setFfmpegExtension(fldFfmpegOptionExtension.getText());
         p.setFfmpegMainOption(fldFfmpegOptionMain.getText());
         p.setFfmpegInOption(fldFfmpegOptionIn.getText());