avfilter設定用項目追加

diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java
index 65ec3df..1bbcc08 100644 (file)
--- a/frontend/src/saccubus/MainFrame.java
+++ b/frontend/src/saccubus/MainFrame.java
@@ -276,63 +276,47 @@ public class MainFrame extends JFrame {
         gridBagConstraints58.weightx = 1.0;
         gridBagConstraints58.fill = GridBagConstraints.HORIZONTAL;
         gridBagConstraints58.gridy = 0;
-        GridBagConstraints gridBagConstraints57 = new GridBagConstraints();
-        gridBagConstraints57.fill = GridBagConstraints.BOTH;
-        gridBagConstraints57.gridy = 2;
-        gridBagConstraints57.weightx = 1.0;
-        gridBagConstraints57.insets = new Insets(0, 0, 5, 5);
-        gridBagConstraints57.gridx = 1;
-        GridBagConstraints gridBagConstraints56 = new GridBagConstraints();
-        gridBagConstraints56.gridx = 0;
-        gridBagConstraints56.insets = new Insets(0, 5, 5, 5);
-        gridBagConstraints56.anchor = GridBagConstraints.WEST;
-        gridBagConstraints56.gridy = 2;
-        ExtOptionLabel = new JLabel();
-        ExtOptionLabel.setText("出力動画の拡張子");
-        GridBagConstraints gridBagConstraints55 = new GridBagConstraints();
-        gridBagConstraints55.gridx = 0;
-        gridBagConstraints55.fill = GridBagConstraints.HORIZONTAL;
-        gridBagConstraints55.weightx = 1.0;
-        gridBagConstraints55.gridwidth = 2;
-        gridBagConstraints55.gridy = 1;
-        GridBagConstraints gridBagConstraints54 = new GridBagConstraints(0, 2,
-                2, 1, 1.0, 0.0, GridBagConstraints.CENTER,
+
+
+        final GridBagConstraints gbcFFmpegOptionComboBoxPanel = new GridBagConstraints(0, 0, 2, 1, 1.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0);
+
+        final Insets ffmpegOptionInsets = new Insets(0, 0, 5, 5);
+
+        final GridBagConstraints gbcExtOptionLabel = new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0,
+                GridBagConstraints.WEST, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcExtOptionField = new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcMainOptionLabel = new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0,
+                GridBagConstraints.WEST, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcMainOptionField = new GridBagConstraints(1, 3, 1, 1, 1.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcInputOptionLabel = new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0,
+                GridBagConstraints.WEST, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcInputOptionField = new GridBagConstraints(1, 4, 1, 1, 1.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcOutputOptionLabel = new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0,
+                GridBagConstraints.WEST, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcOutputOptionField = new GridBagConstraints(1, 5, 1, 1, 1.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcAvfilterOptionLabel = new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0,
+                GridBagConstraints.WEST, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+        final GridBagConstraints gbcAvfilterOptionField = new GridBagConstraints(1, 6, 1, 1, 1.0, 0.0,
+                GridBagConstraints.CENTER, GridBagConstraints.BOTH, ffmpegOptionInsets, 0, 0);
+
+
+        GridBagConstraints gridBagConstraints54 = new GridBagConstraints(0, 2, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER,
                 GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0);
         gridBagConstraints54.gridwidth = 3;
-        GridBagConstraints gridBagConstraints53 = new GridBagConstraints(1, 3,
-                2, 1, 1.0, 0.0, GridBagConstraints.CENTER,
-                GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0);
-        gridBagConstraints53.gridy = 5;
-        gridBagConstraints53.gridheight = 1;
-        gridBagConstraints53.weightx = 1.0;
-        gridBagConstraints53.gridwidth = 1;
-        GridBagConstraints gridBagConstraints52 = new GridBagConstraints(2, 2,
-                1, 1, 1.0, 0.0, GridBagConstraints.CENTER,
-                GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0);
-        gridBagConstraints52.gridy = 4;
-        gridBagConstraints52.gridwidth = 1;
-        gridBagConstraints52.weightx = 1.0;
-        gridBagConstraints52.gridx = 1;
-        GridBagConstraints gridBagConstraints51 = new GridBagConstraints(2, 1,
-                1, 1, 1.0, 0.0, GridBagConstraints.CENTER,
-                GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0);
-        gridBagConstraints51.gridy = 3;
-        gridBagConstraints51.gridwidth = 1;
-        gridBagConstraints51.weightx = 1.0;
-        gridBagConstraints51.gridx = 1;
-        GridBagConstraints gridBagConstraints50 = new GridBagConstraints(0, 3,
-                1, 1, 0.0, 0.0, GridBagConstraints.WEST,
-                GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0);
-        gridBagConstraints50.gridy = 5;
-        GridBagConstraints gridBagConstraints49 = new GridBagConstraints(0, 2,
-                2, 1, 0.0, 0.0, GridBagConstraints.WEST,
-                GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0);
-        gridBagConstraints49.gridy = 4;
-        gridBagConstraints49.gridwidth = 1;
-        GridBagConstraints gridBagConstraints48 = new GridBagConstraints(0, 1,
-                1, 1, 0.0, 0.0, GridBagConstraints.WEST,
-                GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 0);
-        gridBagConstraints48.gridy = 3;
 
         GridBagConstraints gridBagConstraints33 = new GridBagConstraints();
         gridBagConstraints33.gridx = 0;
@@ -368,6 +352,7 @@ public class MainFrame extends JFrame {
         gridBagConstraints1.fill = GridBagConstraints.HORIZONTAL;
         gridBagConstraints1.anchor = GridBagConstraints.NORTH;
         gridBagConstraints1.weighty = 1.0;
+
         this.setIconImage(WinIcon);
         contentPane = (JPanel) this.getContentPane();
         contentPane.setLayout(borderLayout1);
@@ -412,15 +397,19 @@ public class MainFrame extends JFrame {
                 BorderFactory.createEtchedBorder(), "拡張vhookライブラリの設定"));
         FFmpegSettingPanel.setBorder(BorderFactory.createTitledBorder(
                 BorderFactory.createEtchedBorder(), "FFmpegの設定"));
-        FFmpegSettingPanel.setLayout(gridBagLayout9);
+        FFmpegSettingPanel.setLayout(gblFFmpegSettingPanel);
         FontPathLabel.setText("フォントパス");
         SettingFontPathButton.setText("参照");
         SettingFontPathButton.addActionListener(new MainFrame_SettingFontPathButton_actionAdapter(
                 this));
         showConvVideoCheckBox.setText("変換中の画像を表示する");
+
+        extOptionLabel.setText("出力動画の拡張子");
         inputOptionLabel.setText("入力オプション");
         outputOptionLabel.setText("出力オプション");
         mainOptionLabel.setText("メインオプション");
+        avfilterOptionLabel.setText("avfilterオプション");
+
         FontIndexLabel.setText("フォント番号");
         VideoID_Label.setText("URL/ID");
         WayBackLabel.setText("過去ログ");
@@ -462,16 +451,19 @@ public class MainFrame extends JFrame {
                 3, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
                 GridBagConstraints.BOTH, new Insets(0, 0, 5, 5), 0, 0));
         PathSettingPanel.add(VhookPathLabel, gridBagConstraints54);
-        FFmpegSettingPanel.add(outputOptionField, gridBagConstraints53);
-        FFmpegSettingPanel.add(inputOptionField, gridBagConstraints52);
-        FFmpegSettingPanel.add(mainOptionField, gridBagConstraints51);
-        FFmpegSettingPanel.add(mainOptionLabel, gridBagConstraints48);
-        FFmpegSettingPanel.add(inputOptionLabel, gridBagConstraints49);
-        FFmpegSettingPanel.add(outputOptionLabel, gridBagConstraints50);
-        FFmpegSettingPanel.add(getFFmpegOptionComboBoxPanel(),
-                gridBagConstraints55);
-        FFmpegSettingPanel.add(ExtOptionLabel, gridBagConstraints56);
-        FFmpegSettingPanel.add(getExtOptionField(), gridBagConstraints57);
+
+        FFmpegSettingPanel.add(getFFmpegOptionComboBoxPanel(), gbcFFmpegOptionComboBoxPanel);
+        FFmpegSettingPanel.add(extOptionLabel, gbcExtOptionLabel);
+        FFmpegSettingPanel.add(extOptionField, gbcExtOptionField);
+        FFmpegSettingPanel.add(mainOptionField, gbcMainOptionField);
+        FFmpegSettingPanel.add(mainOptionLabel, gbcMainOptionLabel);
+        FFmpegSettingPanel.add(inputOptionField, gbcInputOptionField);
+        FFmpegSettingPanel.add(inputOptionLabel, gbcInputOptionLabel);
+        FFmpegSettingPanel.add(outputOptionField, gbcOutputOptionField);
+        FFmpegSettingPanel.add(outputOptionLabel, gbcOutputOptionLabel);
+        FFmpegSettingPanel.add(avfilterOptionLabel, gbcAvfilterOptionLabel);
+        FFmpegSettingPanel.add(avfilterOptionField, gbcAvfilterOptionField);
+
         VideoInfoPanel.add(DoButton, gridBagConstraints71);
         VideoInfoPanel.add(OpPanel, new GridBagConstraints(0, 0, 1, 1, 1.0,
                 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
@@ -621,7 +613,7 @@ public class MainFrame extends JFrame {
     private JPanel VhookSettingPanel = new JPanel();
     private GridBagLayout gridBagLayout8 = new GridBagLayout();
     private JPanel FFmpegSettingPanel = new JPanel();
-    private GridBagLayout gridBagLayout9 = new GridBagLayout();
+    private GridBagLayout gblFFmpegSettingPanel = new GridBagLayout();
     private JLabel FontPathLabel = new JLabel();
     private JTextField fontPathField = new JTextField();
     private JButton SettingFontPathButton = new JButton();
@@ -792,12 +784,16 @@ public class MainFrame extends JFrame {
 
     /* 変換・保存する */
     private Converter Converter = null;
+    private final JLabel extOptionLabel = new JLabel();
+    private final JTextField extOptionField = new JTextField();
+    private JLabel mainOptionLabel = new JLabel();
+    private JTextField mainOptionField = new JTextField();
     private JLabel inputOptionLabel = new JLabel();
     private JTextField inputOptionField = new JTextField();
     private JLabel outputOptionLabel = new JLabel();
     private JTextField outputOptionField = new JTextField();
-    private JLabel mainOptionLabel = new JLabel();
-    private JTextField mainOptionField = new JTextField();
+    private final JLabel avfilterOptionLabel = new JLabel();
+    private final JTextField avfilterOptionField = new JTextField();
     private JLabel FontIndexLabel = new JLabel();
     private JTextField fontIndexField = new JTextField();
     private JLabel VideoID_Label = new JLabel();
@@ -1152,8 +1148,6 @@ public class MainFrame extends JFrame {
      * @return javax.swing.JComboBox
      */
     private final OptionComboBoxModel FFmpegOptionModel = new OptionComboBoxModel();
-    private JLabel ExtOptionLabel = null;
-    private JTextField extOptionField = null;
     private JCheckBox disableVhookCheckBox = null;
     private JTextField viewCommentField = null;
     private JLabel ViewCommentLabel = null;
@@ -1232,19 +1226,6 @@ public class MainFrame extends JFrame {
     }
 
     /**
-     * This method initializes ExtOptionField
-     *
-     * @return javax.swing.JTextField
-     */
-    private JTextField getExtOptionField() {
-        if (extOptionField == null) {
-            extOptionField = new JTextField();
-            extOptionField.setName("extOptionField");
-        }
-        return extOptionField;
-    }
-
-    /**
      * This method initializes NotUseVhookCheckBox
      *
      * @return javax.swing.JCheckBox