過去ログ取得時点をConverterコンストラクタ引数からProfileに移動

[coroid/inqubus.git] / frontend / src / saccubus / prompt / Prompt.java

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 458320d..21111d1 100644 (file)
--- a/frontend/src/saccubus/prompt/Prompt.java
+++ b/frontend/src/saccubus/prompt/Prompt.java
@@ -16,15 +16,15 @@ import org.apache.commons.cli.Options;
 import saccubus.ConvertStopFlag;
 import saccubus.ConvertStopFlag.State;
 import saccubus.converter.Converter;
-import saccubus.converter.filegetter.LoginInfo;
-import saccubus.converter.profile.CommentGetInfo;
-import saccubus.converter.profile.Ffmpeg;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.GeneralSetting;
-import saccubus.converter.profile.InputFileSetting;
-import saccubus.converter.profile.OutputFileSetting;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.SFile;
+import saccubus.converter.classic.profile.LoginInfo;
+import saccubus.converter.classic.profile.CommentGetInfo;
+import saccubus.converter.classic.profile.Ffmpeg;
+import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.converter.classic.profile.GeneralSetting;
+import saccubus.converter.classic.profile.InputFileSetting;
+import saccubus.converter.classic.profile.OutputFileSetting;
+import saccubus.converter.classic.profile.Profile;
+import saccubus.converter.classic.profile.SFile;
 import saccubus.properties.SProperties;
 import saccubus.net.TextProgressListener;
 
@@ -79,7 +79,7 @@ public class Prompt {
             throw new IOException(e);
         }
 
-        Converter conv = new Converter("dummy", "", profile, tpl, new ConvertStopFlag(scl));
+        Converter conv = new Converter("dummy", profile, tpl, new ConvertStopFlag(scl));
         ExecutorService es = Executors.newSingleThreadExecutor();
         Future<Boolean> future = es.submit((Callable<Boolean>) conv);
         try {
@@ -139,9 +139,9 @@ public class Prompt {
 
         FfmpegOption newFfmpegOption = new FfmpegOption(ffmpeg.getFfmpegOption().getExtOption(), "", "", ff, "", false,
                 "", "", false);
-        InputFileSetting newVideoSetting = new InputFileSetting(new SFile(true, new File(video)), false, false);
-        InputFileSetting newCommentSetting = new InputFileSetting(new SFile(true, new File(comm)), false, false);
-        InputFileSetting newTcommentSetting = new InputFileSetting(new SFile(true, new File(tcomm)), false, false);
+        InputFileSetting newVideoSetting = new InputFileSetting(new SFile(true, new File(video)), false, false, commentGetInfo, "");
+        InputFileSetting newCommentSetting = new InputFileSetting(new SFile(true, new File(comm)), false, false, commentGetInfo, "");
+        InputFileSetting newTcommentSetting = new InputFileSetting(new SFile(true, new File(tcomm)), false, false, commentGetInfo, "");
         OutputFileSetting newOutputFileSetting = new OutputFileSetting(new SFile(true, new File(output)), true, false,
                 true, true);
         Ffmpeg newFfmpeg = new Ffmpeg(ffmpeg.getFfmpeg(), ffmpeg.getVhook(), newFfmpegOption, ffmpeg.isVhookDisabled(), ffmpeg.
@@ -163,7 +163,7 @@ public class Prompt {
         String tag = args[2];
         String time = args.length < 4 ? "" : args[3];
         SProperties setting = SProperties.loadSetting(mail, pass);
-        Converter conv = new Converter(tag, time, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
+        Converter conv = new Converter(tag, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
                 ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         System.out.println("Saccubus on CUI");