From: yukihane <yukihane.feather@gmail.com>
Date: Mon, 1 Aug 2011 12:53:06 +0000 (+0900)
Subject: 変数名変更
X-Git-Tag: rel20110806_ver1.5.0~8^2~1
X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=commitdiff_plain;h=8cc63309e1cf81466e56b74e036c7675c3d91190

変数名変更
---

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 1989d4b..b5542ea 100644
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -99,7 +99,7 @@ public class FfmpegCommand extends AbstractCommand {
         return false;
     }
 
-    private int converting_video(File videoFile, File convertedVideoFile, boolean addComment, String vhook_path,
+    private int converting_video(File videoFile, File convertedVideoFile, boolean addComment, String commPath,
             boolean addTcomment, String tcommPath, FfmpegOption ov) throws InterruptedException, IOException {
         File fwsFile = Cws2Fws.createFws(videoFile, TMP_CWS);
 
@@ -132,7 +132,7 @@ public class FfmpegCommand extends AbstractCommand {
             }
         }
 
-        List<String> avfilterArgs = getAvfilterOptions(ov, addComment, vhook_path, addTcomment, tcommPath);
+        List<String> avfilterArgs = getAvfilterOptions(ov, addComment, commPath, addTcomment, tcommPath);
 
         if (!avfilterArgs.isEmpty()) {
             cmdList.add("-vfilters");
@@ -179,7 +179,7 @@ public class FfmpegCommand extends AbstractCommand {
         }
     }
 
-    private List<String> getAvfilterOptions(FfmpegOption ov, boolean addComment, String vhook_path, boolean addTcomment,
+    private List<String> getAvfilterOptions(FfmpegOption ov, boolean addComment, String commPath, boolean addTcomment,
             String tcommPath) throws UnsupportedEncodingException {
         final List<String> avfilterArgs = new ArrayList<String>();
         final String avfilterOption = ov.getAvfilterOption();
@@ -187,14 +187,14 @@ public class FfmpegCommand extends AbstractCommand {
             avfilterArgs.add(avfilterOption);
         }
         final String vhookArg = (getFfmpeg().isVhookDisabled())
-                ? null : getVhookArg(addComment, vhook_path, addTcomment, tcommPath);
+                ? null : getVhookArg(addComment, commPath, addTcomment, tcommPath);
         if (vhookArg != null) {
             avfilterArgs.add(vhookArg);
         }
         return avfilterArgs;
     }
 
-    private String getVhookArg(boolean addComment, String vhook_path, boolean addTcomment,
+    private String getVhookArg(boolean addComment, String commPath, boolean addTcomment,
             String tcommPath) throws UnsupportedEncodingException {
         StringBuilder sb = new StringBuilder();
         sb.append("vhext=");
@@ -202,7 +202,7 @@ public class FfmpegCommand extends AbstractCommand {
         if (addComment) {
             sb.append("|");
             sb.append("--data-user:");
-            sb.append(URLEncoder.encode(vhook_path.replace("\\", "/"), "Shift_JIS"));
+            sb.append(URLEncoder.encode(commPath.replace("\\", "/"), "Shift_JIS"));
         }
         if (addTcomment) {
             sb.append("|");