From ddf8e553126fab5b7d3c243e0f8085ef76fa0d78 Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Mon, 22 Aug 2011 04:59:52 +0900
Subject: [PATCH] =?utf8?q?=E3=83=97=E3=83=AD=E3=83=95=E3=82=A1=E3=82=A4?=
 =?utf8?q?=E3=83=AB=E7=B7=A8=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/saccubus/converter/FfmpegCommand.java          |  4 ++--
 frontend/src/saccubus/converter/classic/profile/Ffmpeg.java |  6 +++---
 .../src/saccubus/converter/classic/profile/NgSetting.java   |  2 +-
 .../yukihane/saccubus/converter/profile/ConvertProfile.java | 13 ++++++++++++-
 .../src/yukihane/saccubus/converter/profile/NgSetting.java  | 12 ------------
 5 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 frontend/src/yukihane/saccubus/converter/profile/NgSetting.java

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 72346e3..d66a9bd 100644
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -14,7 +14,6 @@ import java.util.logging.Logger;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
-import yukihane.saccubus.converter.profile.NgSetting;
 import yukihane.saccubus.converter.profile.ConvertProfile;
 import yukihane.saccubus.converter.profile.FfmpegProfile;
 import yukihane.saccubus.converter.profile.GeneralProfile;
@@ -22,6 +21,7 @@ import saccubus.net.TextProgressListener;
 import yukihane.mediainfowrapper.Info;
 import yukihane.mediainfowrapper.MediaInfo;
 import yukihane.mediainfowrapper.Size;
+import yukihane.saccubus.converter.profile.ConvertProfile.HideCondition;
 import yukihane.swf.Cws2Fws;
 
 /**
@@ -69,7 +69,7 @@ public class FfmpegCommand extends AbstractCommand {
     }
 
     private boolean exec() throws InterruptedException, IOException {
-        final NgSetting ngSetting = getFfmpeg().getNgSetting();
+        final HideCondition ngSetting = getFfmpeg().getNgSetting();
         if (commentFile != null) {
             sendText("コメントの中間ファイルへの変換中");
             boolean conv = ConvertToVideoHook.convert(commentFile, commentMiddleFile, ngSetting.getId(), ngSetting.
diff --git a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
index 620da76..fc2dfe7 100644
--- a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
+++ b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
@@ -20,11 +20,11 @@ public class Ffmpeg implements yukihane.saccubus.converter.profile.ConvertProfil
     private final boolean showConverting;
     private final boolean selfAdjustFontSize;
     private final boolean commentOpaque;
-    private final NgSetting ngSetting;
+    private final HideCondition ngSetting;
 
     public Ffmpeg(File ffmpegPath, File vhookPath, FfmpegOption ffmpegOption, boolean vhookDisabled,
             int videoShowNum, File fontPath, int fontIndex, int shadowIndex, boolean showConvertingVideo,
-            boolean selfAdjustFontSize, boolean opaqueComment, NgSetting ngSetting) {
+            boolean selfAdjustFontSize, boolean opaqueComment, HideCondition ngSetting) {
         this.ffmpeg = ffmpegPath;
         this.vhook = vhookPath;
         this.ffmpegOption = ffmpegOption;
@@ -85,7 +85,7 @@ public class Ffmpeg implements yukihane.saccubus.converter.profile.ConvertProfil
         return maxNumOfComment;
     }
 
-    public NgSetting getNgSetting() {
+    public HideCondition getNgSetting() {
         return ngSetting;
     }
 }
diff --git a/frontend/src/saccubus/converter/classic/profile/NgSetting.java b/frontend/src/saccubus/converter/classic/profile/NgSetting.java
index c427644..f821e62 100644
--- 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 implements yukihane.saccubus.converter.profile.NgSetting {
+public class NgSetting implements yukihane.saccubus.converter.profile.ConvertProfile.HideCondition {
 
     private final String word;
     private final String id;
diff --git a/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java b/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
index 6a17a2c..6ba251d 100644
--- a/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
@@ -40,5 +40,16 @@ public interface ConvertProfile {
     /** @return 1画面中に表示する最大コメント数. 負値の場合は既定値(30)と同等. */
     int getMaxNumOfComment();
 
-    NgSetting getNgSetting();
+    HideCondition getNgSetting();
+
+    /**
+     *
+     * @author yuki
+     */
+    public interface HideCondition {
+
+        String getWord();
+
+        String getId();
+    }
 }
diff --git a/frontend/src/yukihane/saccubus/converter/profile/NgSetting.java b/frontend/src/yukihane/saccubus/converter/profile/NgSetting.java
deleted file mode 100644
index c1538aa..0000000
--- a/frontend/src/yukihane/saccubus/converter/profile/NgSetting.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package yukihane.saccubus.converter.profile;
-
-/**
- *
- * @author yuki
- */
-public interface NgSetting {
-
-    String getWord();
-
-    String getId();
-}
-- 
2.11.0