システムコンフィグのロード処理

diff --git a/frontend/src/yukihane/inqubus/Config.java b/frontend/src/yukihane/inqubus/Config.java
index 68ce880..98072c5 100644 (file)
--- a/frontend/src/yukihane/inqubus/Config.java
+++ b/frontend/src/yukihane/inqubus/Config.java
@@ -367,7 +367,8 @@ public enum Config {
     private static final String FFMPEG_PARAM_OUT = "ffmpeg.param.out";
 
     public String getFfmpegOutOption() {
-        return config.getString(FFMPEG_PARAM_OUT, "-f ipod -g 150 -qcomp 0.7 -qmin 20 -qmax 30 -qdiff 4 -subq 6 -me_range 16 -i_qfactor 0.714286");
+        return config.getString(FFMPEG_PARAM_OUT,
+                "-f ipod -g 150 -qcomp 0.7 -qmin 20 -qmax 30 -qdiff 4 -subq 6 -me_range 16 -i_qfactor 0.714286");
     }
 
     public void setFfmpegOutOption(String s) {
@@ -441,6 +442,46 @@ public enum Config {
     }
 
     /*
+     * システム
+     */
+    private static final String SYSTEM_DOWNLOAD_THREAD = "system.download.thread";
+
+    public String getSystemDownloadThread() {
+        return config.getString(SYSTEM_DOWNLOAD_THREAD, "1");
+    }
+
+    public void setSystemDownloadThread(String s) {
+        config.setProperty(SYSTEM_DOWNLOAD_THREAD, s);
+    }
+    private static final String SYSTEM_DOWNLOAD_WAIT = "system.download.wait";
+
+    public String getSystemDownloadWait() {
+        return config.getString(SYSTEM_DOWNLOAD_WAIT, "30");
+    }
+
+    public void setSystemDownloadWait(String s) {
+        config.setProperty(SYSTEM_DOWNLOAD_WAIT, s);
+    }
+    private static final String SYSTEM_CONVERT_THREAD = "system.convert.thread";
+
+    public String getSystemConvertThread() {
+        return config.getString(SYSTEM_CONVERT_THREAD, "2");
+    }
+
+    public void setSystemConvertThread(String s) {
+        config.setProperty(SYSTEM_CONVERT_THREAD, s);
+    }
+    private static final String SYSTEM_TEMPDIR = "system.tempdir";
+
+    public String getSystemTempDir() {
+        return config.getString(SYSTEM_TEMPDIR, ".");
+    }
+
+    public void setSystemTempDir(String s) {
+        config.setProperty(SYSTEM_TEMPDIR, s);
+    }
+
+    /*
      *
      */
     public void load(String fileName) throws ConfigurationException {

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index cf414fe..ede8f55 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -1372,7 +1372,16 @@ public class ConfigDialog extends JDialog {
         for (String s : ngIds) {
             mdlNgId.addElement(s);
         }
+
+        /*
+         * システム
+         */
+        fldSystemThreadDownload.setText(p.getSystemDownloadThread());
+        fldSystemWaitDownload.setText(p.getSystemDownloadWait());
+        fldSystemThreadConvert.setText(p.getSystemConvertThread());
+        fldSystemTempDir.setText(p.getSystemTempDir());
     }
+
     private void saveConfig() {
         final Config p = Config.INSTANCE;