プロファイル編集

[coroid/inqubus.git] / frontend / src / saccubus / converter / FfmpegCommand.java

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 89b113a..d66a9bd 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -14,14 +14,14 @@ 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.FfmpegOption;
 import yukihane.saccubus.converter.profile.GeneralProfile;
 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;
 
 /**
@@ -36,10 +36,10 @@ public class FfmpegCommand extends AbstractCommand {
     private final File commentFile;
     private final File videoFile;
     private final File convertedVideoFile;
-    private final FfmpegProfile ffmpeg;
+    private final ConvertProfile ffmpeg;
 
     FfmpegCommand(TextProgressListener listener, ConvertStopFlag flag, File commentFile,
-            File videoFile, File convertedVideoFile, FfmpegProfile ffmpeg, GeneralProfile general) throws IOException {
+            File videoFile, File convertedVideoFile, ConvertProfile ffmpeg, GeneralProfile general) throws IOException {
         super(listener, flag);
         this.commentFile = commentFile;
         this.videoFile = videoFile;
@@ -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.
@@ -102,7 +102,7 @@ public class FfmpegCommand extends AbstractCommand {
     }
 
     private int converting_video(File videoFile, File convertedVideoFile, boolean addComment, String commPath,
-            boolean addTcomment, String tcommPath, FfmpegOption ov) throws InterruptedException, IOException {
+            boolean addTcomment, String tcommPath, FfmpegProfile ov) throws InterruptedException, IOException {
         File fwsFile = Cws2Fws.createFws(videoFile, TMP_CWS);
 
         List<String> cmdList = new ArrayList<String>();
@@ -239,7 +239,7 @@ public class FfmpegCommand extends AbstractCommand {
             sb.append("--enable-show-video");
             sb.append("|");
         }
-        if (getFfmpeg().isSelfAdjustFontSize()) {
+        if (!getFfmpeg().isDisableFontSizeArrange()) {
             sb.append("--enable-fix-font-size");
             sb.append("|");
         }
@@ -254,7 +254,7 @@ public class FfmpegCommand extends AbstractCommand {
         return sb.toString();
     }
 
-    private FfmpegProfile getFfmpeg() {
+    private ConvertProfile getFfmpeg() {
         return ffmpeg;
     }
 }