(A few minor pending patches I had around)

  * ./debian/control: gnome-vlc recommends vlc-plugin-esd, and kvlc recommends
    vlc-plugin-arts.
  * ./src/misc/messages.c: message queue now prints the current object type.
  * ./modules/*: cosmetic fixes for the --long-help output.

diff --git a/debian/control b/debian/control
index 52b70ae091092e6eb2a879f29b451af2db54495b..a6692388f6627dc051e2df9c332ee532cc4f09b9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Description: development files for the VideoLAN Client
 Package: gnome-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Recommends: vlc-plugin-esd
 Conflicts: vlc-gnome (<< 0.5.0)
 Replaces: vlc-gnome (<< 0.5.0)
 Provides: vlc-gui
@@ -268,6 +269,7 @@ Description: a multimedia plugin for Mozilla, based on vlc
 Package: kvlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
+Recommends: vlc-plugin-arts
 Conflicts: vlc-kde (<< 0.5.0)
 Replaces: vlc-kde (<< 0.5.0)
 Provides: vlc-gui

diff --git a/doc/fortunes.txt b/doc/fortunes.txt
index 76b96669719a91033a957224710efbfb19fdba6a..53351ba2faa615608cbfe4df8d4abe3186711fec 100644 (file)
--- a/doc/fortunes.txt
+++ b/doc/fortunes.txt
@@ -234,3 +234,10 @@ the Boston strangler is to the woman home alone.
 
   -- #videolan
 %
+<ArkanumJ> BTW, the CVS version runs well on MacOS X, but the sound is a bit
+           broken. 
+<Dnumgis> ArkanumJ: sound is a bit broken everywhere I think
+<Dnumgis> ArkanumJ: except the places where it is completly broken
+
+  -- #videolan
+%

diff --git a/include/vlc_messages.h b/include/vlc_messages.h
index 319f6e6545b76a33743f43a7b0abf37c715ca3d0..20d85f3ed20e7c983432c3aad026581b7c085c58 100644 (file)
--- a/include/vlc_messages.h
+++ b/include/vlc_messages.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: vlc_messages.h,v 1.5 2002/07/31 20:56:50 sam Exp $
+ * $Id: vlc_messages.h,v 1.6 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -35,6 +35,7 @@ typedef struct
 {
     int     i_type;                               /* message type, see below */
     int     i_object_id;
+    int     i_object_type;
     char *  psz_module;
     char *  psz_msg;                                   /* the message itself */
 

diff --git a/modules/access/dvd/dvd.c b/modules/access/dvd/dvd.c
index de22837ba929f2c645816764c7bec526fa0121c6..15883c89404424e94af66e649f32cb5d38efdd10 100644 (file)
--- a/modules/access/dvd/dvd.c
+++ b/modules/access/dvd/dvd.c
@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: dvd.c,v 1.2 2002/08/07 00:29:36 sam Exp $
+ * $Id: dvd.c,v 1.3 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -62,8 +62,9 @@ static void UnprobeLibDVDCSS( void );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define CSSMETHOD_TEXT N_("Method to use by libdvdcss for key decryption")
+#define CSSMETHOD_TEXT N_("method to use by libdvdcss for key decryption")
 #define CSSMETHOD_LONGTEXT N_( \
+    "Set the method used by libdvdcss for key decryption.\n" \
     "title: decrypted title key is guessed from the encrypted sectors of " \
            "the stream. Thus it should work with a file as well as the " \
            "DVD device. But it sometimes takes much time to decrypt a title " \

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 7ed922bfec17f2fdbc9a9f32dd5b7e8c107981fb..94c6d197cf1fdbfcdbc2d4440a6e115b2a66ca60 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -2,7 +2,7 @@
  * ffmpeg.c: video decoder using ffmpeg library
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.5 2002/08/12 09:34:15 sam Exp $
+ * $Id: ffmpeg.c,v 1.6 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -86,7 +86,7 @@ static int      b_ffmpeginit = 0;
     "Not yet implemented !"
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL );
+    add_category_hint( N_("Ffmpeg"), NULL );
 #if LIBAVCODEC_BUILD >= 4611
     add_integer ( "ffmpeg-error-resilience", -1, NULL, 
                   "error resilience", ERROR_RESILIENCE_LONGTEXT );
@@ -99,9 +99,9 @@ vlc_module_begin();
     add_module( "ffmpeg-pp", "postprocessing",NULL, NULL,
                 N_( "ffmpeg postprocessing module" ), NULL ); 
     add_integer( "ffmpeg-pp-q", 0, NULL,
-                 "Post processing quality", POSTPROCESSING_Q_LONGTEXT );
+                 "post processing quality", POSTPROCESSING_Q_LONGTEXT );
     add_bool( "ffmpeg-pp-auto", 0, NULL,
-              "Auto-level Post processing quality", POSTPROCESSING_AQ_LONGTEXT );
+              "auto-level Post processing quality", POSTPROCESSING_AQ_LONGTEXT );
     add_bool( "ffmpeg-db-yv", 0, NULL, 
               "force vertical luminance deblocking", 
               "force vertical luminance deblocking (override other settings)" );

diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c
index 8c9bc286b71cee0b807365612133e105f79cb8c2..7e67482f0f7000d7d14d6235f1d771d5a77fa3f2 100644 (file)
--- a/modules/video_filter/crop.c
+++ b/modules/video_filter/crop.c
@@ -2,7 +2,7 @@
  * crop.c : Crop video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: crop.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: crop.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -49,10 +49,10 @@ static void UpdateStats    ( vout_thread_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define GEOMETRY_TEXT N_("Crop geometry")
+#define GEOMETRY_TEXT N_("crop geometry")
 #define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop")
 
-#define AUTOCROP_TEXT N_("Automatic cropping")
+#define AUTOCROP_TEXT N_("automatic cropping")
 #define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping")
 
 vlc_module_begin();

diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 3ea175e17bf1ef51b8f5a5c5af8f3473733a3c17..8c7d5ead4e446c88737aaa9add41e89a16423f18 100644 (file)
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -2,7 +2,7 @@
  * deinterlace.c : deinterlacer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: deinterlace.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: deinterlace.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -59,8 +59,8 @@ static void Merge        ( void *, const void *, const void *, size_t );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define MODE_TEXT N_("Deinterlace mode")
-#define MODE_LONGTEXT N_("one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\"")
+#define MODE_TEXT N_("deinterlace mode")
+#define MODE_LONGTEXT N_("One of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\"")
 
 static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", NULL };
 

diff --git a/modules/video_filter/distort.c b/modules/video_filter/distort.c
index c3ba5fa82a349ba67ea83aeb852f5d16e12c4c82..dbc830b7cf96dda76b46fdaf98cd8b7a2e8f4656 100644 (file)
--- a/modules/video_filter/distort.c
+++ b/modules/video_filter/distort.c
@@ -2,7 +2,7 @@
  * distort.c : Misc video effects plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: distort.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: distort.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -54,8 +54,8 @@ static void DistortRipple  ( vout_thread_t *, picture_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define MODE_TEXT N_("Distort mode")
-#define MODE_LONGTEXT N_("one of \"wave\" and \"ripple\"")
+#define MODE_TEXT N_("distort mode")
+#define MODE_LONGTEXT N_("Distort mode, one of \"wave\" and \"ripple\"")
 
 static char *mode_list[] = { "wave", "ripple", NULL };
 

diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index 693d8c0ea76d67f7620fbf35e0e2566700d10eae..7a8891cfcef5a358f616c0bb435feb516dbeb96f 100644 (file)
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -2,7 +2,7 @@
  * transform.c : transform image plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: transform.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: transform.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -52,7 +52,7 @@ static void Render    ( vout_thread_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define TYPE_TEXT N_("Transform type")
+#define TYPE_TEXT N_("transform type")
 #define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'")
 
 static char *type_list[] = { "90", "180", "270", "hflip", "vflip", NULL };

diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c
index b05f962164d739a082267f38a608c6058a9fbfac..f3a79e2717fbf154a852eafc3f78cbb527804c18 100644 (file)
--- a/modules/video_filter/wall.c
+++ b/modules/video_filter/wall.c
@@ -2,7 +2,7 @@
  * wall.c : Wall video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: wall.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: wall.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -48,15 +48,15 @@ static void RemoveAllVout  ( vout_thread_t *p_vout );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define COLS_TEXT N_("Number of columns")
+#define COLS_TEXT N_("number of columns")
 #define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \
     "which to split the video")
 
-#define ROWS_TEXT N_("Number of rows")
+#define ROWS_TEXT N_("number of rows")
 #define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \
     "which to split the video")
 
-#define ACTIVE_TEXT N_("Active windows")
+#define ACTIVE_TEXT N_("active windows")
 #define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \
     "defaults to all")
 

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 044a3123ec0c3fa572948b9a709377beb7eed989..19e9d7e9b16596b57397cd6a1a9da12d34dbb7b1 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -2,7 +2,7 @@
  * x11.c : X11 plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: x11.c,v 1.1 2002/08/04 17:23:44 sam Exp $
+ * $Id: x11.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -64,7 +64,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "Use shared memory to communicate between vlc and the X server.")
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL );
+    add_category_hint( N_("X11"), NULL );
     add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT );
     add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT );
     add_integer( "x11-drawable", -1, NULL, DRAWABLE_TEXT, DRAWABLE_LONGTEXT );

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index 0e6807a19c01c2677879c4bb4df7fc9ee1179617..cc7aaf19523f3f2253902d762e5c35ff46f4adc1 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -2,7 +2,7 @@
  * xvideo.c : Xvideo plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: xvideo.c,v 1.1 2002/08/04 17:23:44 sam Exp $
+ * $Id: xvideo.c,v 1.2 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Shane Harper <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -75,7 +75,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "Use shared memory to communicate between vlc and the X server.")
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL );
+    add_category_hint( N_("XVideo"), NULL );
     add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT );
     add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT );
     add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT );

diff --git a/modules/visualization/xosd/xosd.c b/modules/visualization/xosd/xosd.c
index f606d77e3bee360f320ed691ff98f9c30340d07b..fa6f5174e7a76f9504e4ce368bc5170a04b221d2 100644 (file)
--- a/modules/visualization/xosd/xosd.c
+++ b/modules/visualization/xosd/xosd.c
@@ -2,7 +2,7 @@
  * xosd.c : X On Screen Display interface
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: xosd.c,v 1.2 2002/08/19 08:30:56 sam Exp $
+ * $Id: xosd.c,v 1.3 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Loïc Minier <lool@videolan.org>
  *
@@ -72,7 +72,7 @@ static void Run          ( intf_thread_t * );
 #define FONT_LONGTEXT N_("Font used to display text in the xosd output")
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL );
+    add_category_hint( N_("XOSD module"), NULL );
     add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT );
     add_integer( "xosd-text-offset", 0, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT );
     add_integer( "xosd-shadow-offset", 1, NULL,

diff --git a/src/misc/messages.c b/src/misc/messages.c
index f36df775a51f55e02c117a4f600f58f1ce12ed42..b202366b2fcf8aea910b98b0a7c3c67c7befb1bc 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -4,7 +4,7 @@
  * modules, especially intf modules. See config.h for output configuration.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: messages.c,v 1.9 2002/08/20 18:25:42 sam Exp $
+ * $Id: messages.c,v 1.10 2002/08/26 09:12:46 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -326,10 +326,11 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
             p_item = p_bank->msg + p_bank->i_stop;
             p_bank->i_stop = (p_bank->i_stop + 1) % VLC_MSG_QSIZE;
 
-            p_item->i_type =      VLC_MSG_ERR;
-            p_item->i_object_id = p_this->i_object_id;
-            p_item->psz_module =  strdup( "message" );
-            p_item->psz_msg =     strdup( "message queue overflowed" );
+            p_item->i_type =        VLC_MSG_ERR;
+            p_item->i_object_id =   p_this->i_object_id;
+            p_item->i_object_type = p_this->i_object_type;
+            p_item->psz_module =    strdup( "message" );
+            p_item->psz_msg =       strdup( "message queue overflowed" );
 
             PrintMsg( p_this, p_item );
 
@@ -346,10 +347,11 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
     }
 
     /* Fill message information fields */
-    p_item->i_type =      i_type;
-    p_item->i_object_id = p_this->i_object_id;
-    p_item->psz_module =  strdup( psz_module );
-    p_item->psz_msg =     psz_str;
+    p_item->i_type =        i_type;
+    p_item->i_object_id =   p_this->i_object_id;
+    p_item->i_object_type = p_this->i_object_type;
+    p_item->psz_module =    strdup( psz_module );
+    p_item->psz_msg =       psz_str;
 
     PrintMsg( p_this, p_item );
 
@@ -428,6 +430,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
 
     static const char * ppsz_type[4] = { "", " error", " warning", " debug" };
     static const char *ppsz_color[4] = { WHITE, RED, YELLOW, GRAY };
+    char *psz_object = "private";
     int i_type = p_item->i_type;
 
     if( p_this->p_vlc->b_quiet || !p_this->p_vlc->msg_bank.b_configured )
@@ -441,20 +444,34 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
         return;
     }
 
+    switch( p_item->i_object_type )
+    {
+        case VLC_OBJECT_ROOT: psz_object = "root"; break;
+        case VLC_OBJECT_MODULE: psz_object = "module"; break;
+        case VLC_OBJECT_INTF: psz_object = "interface"; break;
+        case VLC_OBJECT_PLAYLIST: psz_object = "playlist"; break;
+        case VLC_OBJECT_ITEM: psz_object = "item"; break;
+        case VLC_OBJECT_INPUT: psz_object = "input"; break;
+        case VLC_OBJECT_DECODER: psz_object = "decoder"; break;
+        case VLC_OBJECT_VOUT: psz_object = "video output"; break;
+        case VLC_OBJECT_AOUT: psz_object = "audio output"; break;
+        case VLC_OBJECT_SOUT: psz_object = "stream output"; break;
+    }
+
     /* Send the message to stderr */
     if( p_this->p_vlc->b_color )
     {
         fprintf( stderr, "[" GREEN "%.2x" GRAY ":" GREEN "%.6x" GRAY "] "
-                         "%s%s: %s%s" GRAY "\n", p_this->p_vlc->i_instance,
-                         p_item->i_object_id, p_item->psz_module,
+                         "%s %s%s: %s%s" GRAY "\n", p_this->p_vlc->i_instance,
+                         p_item->i_object_id, p_item->psz_module, psz_object,
                          ppsz_type[i_type], ppsz_color[i_type],
                          p_item->psz_msg );
     }
     else
     {
-        fprintf( stderr, "[%.2x:%.6x] %s%s: %s\n",
+        fprintf( stderr, "[%.2x:%.6x] %s %s%s: %s\n",
                          p_this->p_vlc->i_instance, p_item->i_object_id,
-                         p_item->psz_module, ppsz_type[i_type],
+                         p_item->psz_module, psz_object, ppsz_type[i_type],
                          p_item->psz_msg );
     }
 }