From 3f1dcaf94e2a51f6e947067b7daf738d653adc10 Mon Sep 17 00:00:00 2001
From: Rocky Bernstein <rocky@videolan.org>
Date: Sun, 25 Jan 2004 19:27:09 +0000
Subject: [PATCH] cvd.c: default duration scaling is smaller which seems more
 correct.

string review: Merge/canonicalize debug string messages.
---
 modules/codec/ogt/cvd.c      | 7 +++----
 modules/codec/ogt/ogt.c      | 5 ++---
 modules/codec/ogt/subtitle.h | 6 +++++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/codec/ogt/cvd.c b/modules/codec/ogt/cvd.c
index 21da13d1c5..7ccb5b2a70 100644
--- 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 72ed303e8d..dafa7482ac 100644
--- 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 3343001600..77bdf5708a 100644
--- 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" \
-- 
2.39.5