cvd.c: default duration scaling is smaller which seems more correct.

string review: Merge/canonicalize debug string messages.

diff --git a/modules/codec/ogt/cvd.c b/modules/codec/ogt/cvd.c
index 21da13d1c55edeed42cda0451c7cf5d8534c690e..7ccb5b2a707d9aeafb47d966e7767a41847878da 100644 (file)
--- a/modules/codec/ogt/cvd.c
+++ b/modules/codec/ogt/cvd.c
@@ -2,7 +2,7 @@
  * cvd.c : CVD Subtitle decoder thread
  *****************************************************************************
  * Copyright (C) 2003, 2004 VideoLAN
- * $Id: cvd.c,v 1.14 2004/01/25 18:20:12 bigben Exp $
+ * $Id: cvd.c,v 1.15 2004/01/25 19:27:09 rocky Exp $
  *
  * Authors: Rocky Bernstein
  *   based on code from:
@@ -48,8 +48,7 @@ vlc_module_begin();
     set_callbacks( DecoderOpen, VCDSubClose );
 
     add_integer ( MODULE_STRING "-debug", 0, NULL,
-                  N_("Set debug mask for additional debugging."),
-                  N_(DEBUG_LONGTEXT), VLC_TRUE );
+                 DEBUG_TEXT, DEBUG_LONGTEXT, VLC_TRUE );
 
     add_integer ( MODULE_STRING "-horizontal-correct", 0, NULL,
                   HORIZONTAL_CORRECT, HORIZONTAL_CORRECT_LONGTEXT, VLC_FALSE );
@@ -61,7 +60,7 @@ vlc_module_begin();
                 SUB_ASPECT_RATIO_TEXT, SUB_ASPECT_RATIO_LONGTEXT, 
                VLC_TRUE );
 
-    add_integer( MODULE_STRING "-duration-scaling", 9, NULL,
+    add_integer( MODULE_STRING "-duration-scaling", 3, NULL,
                 DURATION_SCALE_TEXT, DURATION_SCALE_LONGTEXT,
                 VLC_TRUE );
 

diff --git a/modules/codec/ogt/ogt.c b/modules/codec/ogt/ogt.c
index 72ed303e8d3bfd554925641aa5bbea4e218f9410..dafa7482ac6071b76733686833691b5d3a6f4588 100644 (file)
--- a/modules/codec/ogt/ogt.c
+++ b/modules/codec/ogt/ogt.c
@@ -2,7 +2,7 @@
  * ogt.c : Overlay Graphics Text (SVCD subtitles) decoder thread
  *****************************************************************************
  * Copyright (C) 2003, 2004 VideoLAN
- * $Id: ogt.c,v 1.11 2004/01/16 13:32:37 rocky Exp $
+ * $Id: ogt.c,v 1.12 2004/01/25 19:27:09 rocky Exp $
  *
  * Author: Rocky Bernstein
  *   based on code from:
@@ -48,8 +48,7 @@ vlc_module_begin();
     set_callbacks( DecoderOpen, VCDSubClose );
 
     add_integer ( MODULE_STRING "-debug", 0, NULL,
-                  N_("set debug mask for additional debugging."),
-                  DEBUG_LONGTEXT, VLC_TRUE );
+                 DEBUG_TEXT, DEBUG_LONGTEXT, VLC_TRUE );
 
     add_integer ( MODULE_STRING "-horizontal-correct", 0, NULL,
                   HORIZONTAL_CORRECT, HORIZONTAL_CORRECT_LONGTEXT, VLC_FALSE );

diff --git a/modules/codec/ogt/subtitle.h b/modules/codec/ogt/subtitle.h
index 3343001600d28f613ff6ad078a371f12da3429c7..77bdf5708afe9305ad4118450532d2c85684c534 100644 (file)
--- a/modules/codec/ogt/subtitle.h
+++ b/modules/codec/ogt/subtitle.h
@@ -2,7 +2,7 @@
  * subtitle.h : Common SVCD and CVD subtitles header
  *****************************************************************************
  * Copyright (C) 2003,2004 VideoLAN
- * $Id: subtitle.h,v 1.12 2004/01/25 18:20:12 bigben Exp $
+ * $Id: subtitle.h,v 1.13 2004/01/25 19:27:09 rocky Exp $
  *
  * Author: Rocky Bernstein
  *   based on code from:
@@ -35,6 +35,10 @@
 #define DECODE_DBG_PNG        64 /* Extract subtitles to PNG files. */
 #define DECODE_DBG_INFO      128
 
+#define DEBUG_TEXT N_(                                     \
+     "If nonzero, this gives additional debug information." \
+     )
+
 #define DEBUG_LONGTEXT N_( \
     "This integer when viewed in binary is a debugging mask\n" \
     "external call          1\n" \