FFMPEG関連のオプションをインタフェース化

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index e1be1a6..20c7c02 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -6,7 +6,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import saccubus.ConvertStopFlag;
-import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.converter.profile.FfmpegOption;
 import saccubus.net.TextProgressListener;
 
 /**

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 076314e..9ac0be5 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -12,10 +12,10 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
-import saccubus.converter.classic.profile.Ffmpeg;
-import saccubus.converter.classic.profile.FfmpegOption;
-import saccubus.converter.classic.profile.GeneralSetting;
-import saccubus.converter.classic.profile.NgSetting;
+import saccubus.converter.profile.NgSetting;
+import saccubus.converter.profile.Ffmpeg;
+import saccubus.converter.profile.FfmpegOption;
+import saccubus.converter.profile.GeneralSetting;
 import saccubus.net.TextProgressListener;
 import yukihane.swf.Cws2Fws;
 

diff --git a/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java b/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
index ffe5a57..d169d9f 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
+++ b/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
@@ -1,14 +1,10 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package saccubus.converter.classic.profile;
 
 /**
  *
  * @author yuki
  */
-public class CommentGetInfo {
+public class CommentGetInfo implements saccubus.converter.profile.CommentGetInfo {
 
     private final boolean selfAdjustCommentNum;
     private final int backComment;

diff --git a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
index ef20422..c16077e 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
+++ b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
@@ -7,7 +7,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public class Ffmpeg {
+public class Ffmpeg implements saccubus.converter.profile.Ffmpeg {
 
     private final File ffmpeg;
     private final File vhook;
@@ -39,6 +39,7 @@ public class Ffmpeg {
         this.ngSetting = ngSetting;
     }
 
+    @Override
     public FfmpegOption getFfmpegOption() {
         return ffmpegOption;
     }

diff --git a/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java b/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
index ff1b014..608714c 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
+++ b/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
@@ -10,7 +10,7 @@ import java.util.Properties;
  *
  * @author yuki
  */
-public class FfmpegOption {
+public class FfmpegOption implements saccubus.converter.profile.FfmpegOption {
 
     private final String extOption;
     private final String inOption;

diff --git a/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java b/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
index f10c4df..79dcd55 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
@@ -3,7 +3,7 @@ package saccubus.converter.classic.profile;
 
 import java.io.File;
 
-public class GeneralSetting {
+public class GeneralSetting implements saccubus.converter.profile.GeneralSetting {
 
     private final File tempDir;
 

diff --git a/frontend/src/saccubus/converter/classic/profile/NgSetting.java b/frontend/src/saccubus/converter/classic/profile/NgSetting.java
index 70954dd..3265b18 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/NgSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/NgSetting.java
@@ -5,7 +5,7 @@ package saccubus.converter.classic.profile;
  * NG設定.
  * @author yuki
  */
-public class NgSetting {
+public class NgSetting implements saccubus.converter.profile.NgSetting {
 
     private final String word;
     private final String id;

diff --git a/frontend/src/saccubus/converter/profile/CommentGetInfo.java b/frontend/src/saccubus/converter/profile/CommentGetInfo.java
new file mode 100644 (file)
index 0000000..de31e93
--- /dev/null
+++ b/frontend/src/saccubus/converter/profile/CommentGetInfo.java
@@ -0,0 +1,12 @@
+package saccubus.converter.profile;
+
+/**
+ *
+ * @author yuki
+ */
+public interface CommentGetInfo {
+
+    boolean isselfAdjustCommentNum();
+
+    int getBackComment();
+}

diff --git a/frontend/src/saccubus/converter/profile/Ffmpeg.java b/frontend/src/saccubus/converter/profile/Ffmpeg.java
new file mode 100644 (file)
index 0000000..cee5d09
--- /dev/null
+++ b/frontend/src/saccubus/converter/profile/Ffmpeg.java
@@ -0,0 +1,34 @@
+package saccubus.converter.profile;
+
+import java.io.File;
+
+/**
+ *
+ * @author yuki
+ */
+public interface Ffmpeg {
+
+    FfmpegOption getFfmpegOption();
+
+    File getFfmpeg();
+
+    int getFontIndex();
+
+    File getFont();
+
+    boolean isCommentOpaque();
+
+    boolean isSelfAdjustFontSize();
+
+    int getShadowIndex();
+
+    boolean isShowConverting();
+
+    boolean isVhookDisabled();
+
+    File getVhook();
+
+    int getMaxNumOfComment();
+
+    NgSetting getNgSetting();
+}

diff --git a/frontend/src/saccubus/converter/profile/FfmpegOption.java b/frontend/src/saccubus/converter/profile/FfmpegOption.java
new file mode 100644 (file)
index 0000000..9d3abdf
--- /dev/null
+++ b/frontend/src/saccubus/converter/profile/FfmpegOption.java
@@ -0,0 +1,16 @@
+package saccubus.converter.profile;
+
+/**
+ *
+ * @author yuki
+ */
+public interface FfmpegOption {
+
+    String getExtOption();
+
+    String getInOption();
+
+    String getMainOption();
+
+    String getOutOption();
+}

diff --git a/frontend/src/saccubus/converter/profile/GeneralSetting.java b/frontend/src/saccubus/converter/profile/GeneralSetting.java
new file mode 100644 (file)
index 0000000..bb2a866
--- /dev/null
+++ b/frontend/src/saccubus/converter/profile/GeneralSetting.java
@@ -0,0 +1,12 @@
+package saccubus.converter.profile;
+
+import java.io.File;
+
+/**
+ *
+ * @author yuki
+ */
+public interface GeneralSetting {
+
+    File getTempDir();
+}

diff --git a/frontend/src/saccubus/converter/profile/NgSetting.java b/frontend/src/saccubus/converter/profile/NgSetting.java
new file mode 100644 (file)
index 0000000..59f3666
--- /dev/null
+++ b/frontend/src/saccubus/converter/profile/NgSetting.java
@@ -0,0 +1,12 @@
+package saccubus.converter.profile;
+
+/**
+ *
+ * @author yuki
+ */
+public interface NgSetting {
+
+    String getWord();
+
+    String getId();
+}

diff --git a/frontend/src/saccubus/converter/profile/Profile.java b/frontend/src/saccubus/converter/profile/Profile.java
index 671d39e..7a23aa6 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Profile.java
+++ b/frontend/src/saccubus/converter/profile/Profile.java
@@ -1,8 +1,5 @@
 package saccubus.converter.profile;
 
-import saccubus.converter.classic.profile.CommentGetInfo;
-import saccubus.converter.classic.profile.Ffmpeg;
-import saccubus.converter.classic.profile.GeneralSetting;
 import saccubus.converter.classic.profile.InputFileSetting;
 import saccubus.converter.classic.profile.OutputFileSetting;
 import saccubus.converter.filegetter.LoginInfo;