Merge branch 'master'

[coroid/inqubus.git] / frontend / src / saccubus / properties / InputVideoSetting.java

diff --git a/frontend/src/saccubus/properties/InputVideoSetting.java b/frontend/src/saccubus/properties/InputVideoSetting.java
index e21e87e..fa676e0 100644 (file)
--- a/frontend/src/saccubus/properties/InputVideoSetting.java
+++ b/frontend/src/saccubus/properties/InputVideoSetting.java
@@ -6,7 +6,7 @@ import java.util.Properties;
 import saccubus.VideoSaveKind;
 
 /**
- * \93ü\97Í\93®\89æ\90Ý\92è\82ð\95Û\8e\9d\82·\82é\83N\83\89\83X.
+ * 入力動画設定を保持するクラス.
  * @author yuki
  */
 public class InputVideoSetting extends InputFileSetting<VideoSaveKind> {
@@ -37,15 +37,15 @@ public class InputVideoSetting extends InputFileSetting<VideoSaveKind> {
     public static InputVideoSetting load(Properties prop) {
         final VideoSaveKind kind = convertVideoSaveKind(prop);
         boolean autoNaming = Boolean.parseBoolean(prop.getProperty(PROP_VIDEO_FIX_FILE_NAME, "true"));
-        String folder = prop.getProperty(PROP_VIDEO_FIX_FILE_NAME_FOLDER, ".\\[out]video\\");
-        String file = prop.getProperty(PROP_VIDEO_FILE, ".\\video.flv");
+        String folder = prop.getProperty(PROP_VIDEO_FIX_FILE_NAME_FOLDER, "out/movie");
+        String file = prop.getProperty(PROP_VIDEO_FILE, "video.flv");
         boolean delete = Boolean.parseBoolean(prop.getProperty(PROP_DEL_VIDEO_AFTER_CONV, "false"));
         String nibrFile = prop.getProperty(PROP_NICO_BROWSER_FILE_NAME, "");
 
         return new InputVideoSetting(kind, autoNaming, new File(folder), new File(file), delete, new File(nibrFile));
     }
 
-    /** \96{\89Æ\82³\82«\82ã\82Î\82·\82Å\95Û\91¶\82µ\82Ä\82¢\82½\8fê\8d\87\81APROP_SAVE_VIDEO\82Ítrue/false\82È\82Ì\82Å\95Ï\8a·\82·\82é. */
+    /** 本家さきゅばすで保存していた場合、PROP_SAVE_VIDEOはtrue/falseなので変換する. */
     private static VideoSaveKind convertVideoSaveKind(Properties prop) {
         VideoSaveKind kind;
         String saveVideo = prop.getProperty(PROP_SAVE_VIDEO);