From: yukihane <yukihane.feather@gmail.com>
Date: Tue, 30 Aug 2011 13:39:29 +0000 (+0900)
Subject: ffmpegオプションファイル保存と読み込み
X-Git-Tag: test20110903_ver2.a.0~77
X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=commitdiff_plain;h=f056423a0663194f57fba6b9e4110e16281b8e77

ffmpegオプションファイル保存と読み込み
---

diff --git a/frontend/src/saccubus/OptionComboBoxModel.java b/frontend/src/saccubus/OptionComboBoxModel.java
index 7a589ad..63f9538 100644
--- a/frontend/src/saccubus/OptionComboBoxModel.java
+++ b/frontend/src/saccubus/OptionComboBoxModel.java
@@ -13,7 +13,7 @@ import javax.swing.DefaultComboBoxModel;
  * @author Account01
  *
  */
-public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem> {
+public final class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem> {
 	/**
 	 *
 	 */
@@ -27,7 +27,8 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
 	private int Index = 0;
 
 	public OptionComboBoxModel() {
-		reload();
+		File original_file = getSelectedItem().getFile();
+		reload(original_file);
 	}
 
 	/**
@@ -38,12 +39,7 @@ public class OptionComboBoxModel extends DefaultComboBoxModel<FFmpegSelectedItem
 	private static final FFmpegSelectedItem DEFAULT_ITEM = new FFmpegSelectedItem(
 			0, null, "外部ファイルを用いず、下に直接入力する。");
 
-	final void reload() {
-		File original_file = getSelectedItem().getFile();
-		reload(original_file);
-	}
-
-	final void reload(File original_file) {
+	public void reload(File original_file) {
 		int original_index = -1;
 		int index = 1;
 		// リストクリア
diff --git a/frontend/src/yukihane/inqubus/Config.java b/frontend/src/yukihane/inqubus/Config.java
index 4cbc80b..4940c2e 100644
--- a/frontend/src/yukihane/inqubus/Config.java
+++ b/frontend/src/yukihane/inqubus/Config.java
@@ -322,7 +322,7 @@ public enum Config {
     private static final String FFMPEG_PARAM_OPTIONFILE = "ffmpeg.param.optionfile";
 
     public String getFfmpegOptionFile() {
-        return config.getString(FFMPEG_PARAM_OPTIONFILE, "");
+        return config.getString(FFMPEG_PARAM_OPTIONFILE, null);
     }
 
     public void setFfmpegOptionFile(String s) {
diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index 0eb8c19..66dc49f 100644
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -37,6 +37,7 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.WindowConstants;
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.lang.StringUtils;
 import saccubus.FFmpegSelectedItem;
 import saccubus.OptionComboBoxModel;
 import yukihane.inqubus.Config;
@@ -1328,7 +1329,8 @@ public class ConfigDialog extends JDialog {
         /*
          * ffmpeg - ffmpegパラメータ
          */
-        // TODO cmbFfmpegOptionFile
+        final String fof = p.getFfmpegOptionFile();
+        mdlFfmpegOption.reload(StringUtils.isNotEmpty(fof) ? new File(fof) : null);
         fldFfmpegOptionExtension.setText(p.getFfmpegExtension());
         fldFfmpegOptionMain.setText(p.getFfmpegMainOption());
         fldFfmpegOptionIn.setText(p.getFfmpegInOption());
@@ -1435,7 +1437,7 @@ public class ConfigDialog extends JDialog {
          * ffmpeg - ffmpegパラメータ
          */
         final File fileFfmpegOption = mdlFfmpegOption.getSelectedFile();
-        p.setFfmpegOptionFile(fileFfmpegOption != null ? fileFfmpegOption.getPath() : "");
+        p.setFfmpegOptionFile(fileFfmpegOption != null ? fileFfmpegOption.getPath() : null);
         p.setFfmpegExtension(fldFfmpegOptionExtension.getText());
         p.setFfmpegMainOption(fldFfmpegOptionMain.getText());
         p.setFfmpegInOption(fldFfmpegOptionIn.getText());