From 211fe411f29e2c16b29e8ee4ffe65d35c7c5a0b0 Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Tue, 23 Aug 2011 08:05:25 +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=E3=81=AE=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E5=90=8D?=
 =?utf8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/saccubus/worker/Convert.java                           | 6 +++---
 frontend/src/saccubus/worker/TestFrame.java                         | 2 +-
 frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java | 2 +-
 frontend/src/saccubus/worker/profile/OutputProfile.java             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/saccubus/worker/Convert.java b/frontend/src/saccubus/worker/Convert.java
index 2bc3e2e..2cd23b1 100644
--- a/frontend/src/saccubus/worker/Convert.java
+++ b/frontend/src/saccubus/worker/Convert.java
@@ -70,10 +70,10 @@ public class Convert extends SwingWorker<ConvertResult, ConvertProgress> {
     @Override
     protected ConvertResult doInBackground() throws Exception {
         try {
-            transformedComment = File.createTempFile("vhk", ".tmp", profile.getTempDir());
 
-            final HideCondition hide = profile.getNgSetting();
-            if (commentFile != null) {
+            if (profile.getOutputProfile().isCommentOverlay()) {
+                transformedComment = File.createTempFile("vhk", ".tmp", profile.getTempDir());
+                final HideCondition hide = profile.getNgSetting();
                 publish(new ConvertProgress("コメントの中間ファイルへの変換中"));
                 final boolean conv = ConvertToVideoHook.convert(commentFile, transformedComment, hide.getId(), hide.
                         getWord());
diff --git a/frontend/src/saccubus/worker/TestFrame.java b/frontend/src/saccubus/worker/TestFrame.java
index e2f2848..eb1322e 100644
--- a/frontend/src/saccubus/worker/TestFrame.java
+++ b/frontend/src/saccubus/worker/TestFrame.java
@@ -447,7 +447,7 @@ public class TestFrame extends JFrame {
                 }
 
                 @Override
-                public boolean isAddComment() {
+                public boolean isCommentOverlay() {
                     return false;
                 }
 
diff --git a/frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java b/frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java
index 6732b70..48d6756 100644
--- a/frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java
+++ b/frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java
@@ -31,7 +31,7 @@ public class OutputFileSetting implements saccubus.worker.profile.OutputProfile
     }
 
     @Override
-    public boolean isAddComment() {
+    public boolean isCommentOverlay() {
         return addComment;
     }
 
diff --git a/frontend/src/saccubus/worker/profile/OutputProfile.java b/frontend/src/saccubus/worker/profile/OutputProfile.java
index a39b8d7..4dc0da0 100644
--- a/frontend/src/saccubus/worker/profile/OutputProfile.java
+++ b/frontend/src/saccubus/worker/profile/OutputProfile.java
@@ -16,7 +16,7 @@ public interface OutputProfile {
      * コメントを付与して変換を行うのであればtrue.
      * {@link #isConvert()}がfalseの場合未定義.
      */
-    boolean isAddComment();
+    boolean isCommentOverlay();
 
     /**
      * @return {@link #isConvert()}がtrueの場合に
-- 
2.11.0