インタフェース名変更: Ffmpeg -> FfmpegProfile

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index ec5166b..4dc18de 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -15,7 +15,7 @@ import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
 import yukihane.saccubus.converter.profile.NgSetting;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
 import yukihane.saccubus.converter.profile.NgSetting;

-import yukihane.saccubus.converter.profile.Ffmpeg;
+import yukihane.saccubus.converter.profile.FfmpegProfile;

 import yukihane.saccubus.converter.profile.FfmpegOption;
 import yukihane.saccubus.converter.profile.GeneralSetting;
 import saccubus.net.TextProgressListener;
 import yukihane.saccubus.converter.profile.FfmpegOption;
 import yukihane.saccubus.converter.profile.GeneralSetting;
 import saccubus.net.TextProgressListener;


@@ -37,10 +37,10 @@ public class FfmpegCommand extends AbstractCommand {
     private final File tcommFile;
     private final File videoFile;
     private final File convertedVideoFile;
     private final File tcommFile;
     private final File videoFile;
     private final File convertedVideoFile;

-    private final Ffmpeg ffmpeg;
+    private final FfmpegProfile ffmpeg;

 
     FfmpegCommand(TextProgressListener listener, ConvertStopFlag flag, File commentFile, File tcommFile,
 
     FfmpegCommand(TextProgressListener listener, ConvertStopFlag flag, File commentFile, File tcommFile,

-            File videoFile, File convertedVideoFile, Ffmpeg ffmpeg, GeneralSetting general) throws IOException {
+            File videoFile, File convertedVideoFile, FfmpegProfile ffmpeg, GeneralSetting general) throws IOException {

         super(listener, flag);
         this.commentFile = commentFile;
         this.tcommFile = tcommFile;
         super(listener, flag);
         this.commentFile = commentFile;
         this.tcommFile = tcommFile;


@@ -257,7 +257,7 @@ public class FfmpegCommand extends AbstractCommand {
         return sb.toString();
     }
 
         return sb.toString();
     }
 

-    private Ffmpeg getFfmpeg() {
+    private FfmpegProfile getFfmpeg() {

         return ffmpeg;
     }
 }
         return ffmpeg;
     }
 }

diff --git a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
index 8d6d7c6..47318e5 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
  */
  *
  * @author yuki
  */

-public class Ffmpeg implements yukihane.saccubus.converter.profile.Ffmpeg {
+public class Ffmpeg implements yukihane.saccubus.converter.profile.FfmpegProfile {

 
     private final File ffmpeg;
     private final File vhook;
 
     private final File ffmpeg;
     private final File vhook;

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Ffmpeg.java b/frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
similarity index 93%
rename from frontend/src/yukihane/saccubus/converter/profile/Ffmpeg.java
rename to frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
index a4ebf59..272c496 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Ffmpeg.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
@@ -6,7 +6,7 @@ import java.io.File;
  *
  * @author yuki
  */
  *
  * @author yuki
  */

-public interface Ffmpeg {
+public interface FfmpegProfile {

 
     FfmpegOption getFfmpegOption();
 
 
     FfmpegOption getFfmpegOption();
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Profile.java b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
index 1324e0b..d528776 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Profile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
@@ -18,7 +18,7 @@ public interface Profile {
 
     boolean needsConvert();
 
 
     boolean needsConvert();
 

-    Ffmpeg getFfmpeg();
+    FfmpegProfile getFfmpeg();

 
     GeneralSetting getGeneralSetting();
 }
 
     GeneralSetting getGeneralSetting();
 }