From: Gildas Bazin <gbazin@videolan.org>
Date: Sun, 25 Jan 2004 18:53:07 +0000 (+0000)
Subject: * ALL: removed a bunch of unused add_category_hint().
X-Git-Tag: 0.7.1~352
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b5c53865447042060a1b4922a55dcb27373eab80;p=vlc

* ALL: removed a bunch of unused add_category_hint().
---

diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c
index 8e43bf2c42..ba59fd0d24 100644
--- a/modules/access/cdda/cdda.c
+++ b/modules/access/cdda/cdda.c
@@ -2,7 +2,7 @@
  * cddax.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: cdda.c,v 1.16 2004/01/25 14:42:05 rocky Exp $
+ * $Id: cdda.c,v 1.17 2004/01/25 18:53:06 gbazin Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -29,7 +29,6 @@
 
 #include <vlc/vlc.h>
 
-
 /*****************************************************************************
  * prototypes
  *****************************************************************************/
@@ -114,8 +113,6 @@ vlc_module_begin();
     add_shortcut( "cddax" );
 
     /* Configuration options */
-    add_category_hint( N_("CDX"), NULL, VLC_TRUE );
-
     add_integer ( MODULE_STRING "-debug", 0, E_(DebugCB),
                   N_("If nonzero, this gives additional debug information."),
                   DEBUG_LONGTEXT, VLC_TRUE );
diff --git a/modules/access/dvd/dvd.c b/modules/access/dvd/dvd.c
index 06d207e150..83f456a816 100644
--- 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.10 2004/01/25 17:31:22 gbazin Exp $
+ * $Id: dvd.c,v 1.11 2004/01/25 18:53:06 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -85,7 +85,6 @@ static char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
 vlc_module_begin();
     int i;
     add_usage_hint( N_("[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]") );
-    add_category_hint( N_("dvd"), NULL, VLC_TRUE );
 
     add_string( "dvdcss-method", NULL, NULL, CSSMETHOD_TEXT,
                 CSSMETHOD_LONGTEXT, VLC_TRUE );
diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 6fc892eb56..9f826b7054 100644
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -3,7 +3,7 @@
  *               -> gives the feeling of a real room with a simple headphone
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: headphone.c,v 1.6 2003/12/20 22:57:36 babal Exp $
+ * $Id: headphone.c,v 1.7 2004/01/25 18:53:06 gbazin Exp $
  *
  * Authors: Boris Dorès <babal@via.ecp.fr>
  *
@@ -59,10 +59,10 @@ static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
      "distance between front left speaker and listener in meters.")
 
 vlc_module_begin();
-    add_category_hint( N_("headphone"), MODULE_DESCRIPTION, VLC_FALSE );
+    set_description( N_("headphone channel mixer with virtual spatialization effect") );
+
     add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT,
                  HEADPHONE_DIM_LONGTEXT, VLC_FALSE );
-    set_description( N_("headphone channel mixer with virtual spatialization effect") );
 
     set_capability( "audio filter", 0 );
     set_callbacks( Create, Destroy );
diff --git a/modules/audio_filter/converter/Modules.am b/modules/audio_filter/converter/Modules.am
index b06811762f..76462b45d7 100644
--- a/modules/audio_filter/converter/Modules.am
+++ b/modules/audio_filter/converter/Modules.am
@@ -5,6 +5,7 @@ SOURCES_float32tou8 = float32tou8.c
 SOURCES_a52tospdif = a52tospdif.c
 SOURCES_a52tofloat32 = a52tofloat32.c
 SOURCES_dtstospdif = dtstospdif.c
+SOURCES_dtstofloat32 = dtstofloat32.c
 SOURCES_fixed32tos16 = fixed32tos16.c
 SOURCES_s16tofixed32 = s16tofixed32.c
 SOURCES_fixed32tofloat32 = fixed32tofloat32.c
diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 67cf392fda..17d2781e6c 100644
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -4,7 +4,7 @@
  *   (http://liba52.sf.net/).
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52tofloat32.c,v 1.16 2004/01/25 13:37:11 kuehne Exp $
+ * $Id: a52tofloat32.c,v 1.17 2004/01/25 18:53:06 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -82,9 +82,8 @@ struct aout_filter_sys_t
     "listening room.")
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
-    add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
     set_description( _("ATSC A/52 aka AC-3 audio decoder") );
+    add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
     set_capability( "audio filter", 100 );
     set_callbacks( Create, Destroy );
 vlc_module_end();
diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index ece292b9f2..22941e95d5 100644
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -3,7 +3,7 @@
  * using MAD (MPEG Audio Decoder)
  *****************************************************************************
  * Copyright (C) 2001 by Jean-Paul Saman
- * $Id: mpgatofixed32.c,v 1.8 2003/03/30 18:14:36 gbazin Exp $
+ * $Id: mpgatofixed32.c,v 1.9 2004/01/25 18:53:06 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Jean-Paul Saman <jpsaman@wxs.nl>
@@ -57,7 +57,6 @@ struct aout_filter_sys_t
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
     set_description( _("MPEG audio decoder") );
     set_capability( "audio filter", 100 );
     set_callbacks( Create, Destroy );
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 93078c875b..badf1312e0 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -2,7 +2,7 @@
  * alsa.c : alsa plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: alsa.c,v 1.38 2004/01/25 17:58:29 murray Exp $
+ * $Id: alsa.c,v 1.39 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org> - Original Author
  *          Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
@@ -94,10 +94,9 @@ static void ALSAFill     ( aout_instance_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    add_category_hint( N_("ALSA"), NULL, VLC_FALSE );
+    set_description( _("ALSA audio output") );
     add_string( "alsadev", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
                 N_("ALSA Device Name"), NULL, VLC_FALSE );
-    set_description( _("ALSA audio output") );
     set_capability( "audio output", 150 );
     set_callbacks( Open, Close );
 vlc_module_end();
diff --git a/modules/audio_output/coreaudio.c b/modules/audio_output/coreaudio.c
index cdfa8c9f78..992ad5dd07 100644
--- a/modules/audio_output/coreaudio.c
+++ b/modules/audio_output/coreaudio.c
@@ -2,7 +2,7 @@
  * coreaudio.c: CoreAudio output plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: coreaudio.c,v 1.9 2004/01/25 17:58:29 murray Exp $
+ * $Id: coreaudio.c,v 1.10 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -224,7 +224,6 @@ vlc_module_begin();
     set_description( _("CoreAudio output") );
     set_capability( "audio output", 100 );
     set_callbacks( Open, Close );
-    add_category_hint( N_("Audio"), NULL, VLC_FALSE );
     add_integer( "coreaudio-dev", -1, NULL, ADEV_TEXT, ADEV_LONGTEXT, VLC_FALSE ); 
 vlc_module_end();
 
diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 57d964329a..3f694175f6 100644
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -2,7 +2,7 @@
  * file.c : audio output which writes the samples to a file
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: file.c,v 1.26 2004/01/25 17:58:29 murray Exp $
+ * $Id: file.c,v 1.27 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -105,14 +105,15 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
 #define FILE_LONGTEXT N_("File to which the audio samples will be written to")
 
 vlc_module_begin();
-    add_category_hint( N_("Audio"), NULL, VLC_FALSE );
+    set_description( N_("File audio output") );
+
     add_string( "audiofile-format", "s16", NULL,
                 FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE );
         change_string_list( format_list, 0, 0 );
     add_file( "audiofile", "audiofile.wav", NULL, FILE_TEXT,
               FILE_LONGTEXT, VLC_FALSE );
     add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
-    set_description( N_("File audio output") );
+
     set_capability( "audio output", 0 );
     add_shortcut( "file" );
     add_shortcut( "audiofile" );
diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index b81848f89e..68c24312f6 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -2,7 +2,7 @@
  * oss.c : OSS /dev/dsp module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2002 VideoLAN
- * $Id: oss.c,v 1.63 2004/01/25 17:58:29 murray Exp $
+ * $Id: oss.c,v 1.64 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
@@ -105,13 +105,13 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
     "of these drivers, then you need to enable this option." )
 
 vlc_module_begin();
-    add_category_hint( N_("OSS"), NULL, VLC_FALSE );
+    set_description( _("Linux OSS audio output") );
+
     add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
               N_("OSS dsp device"), NULL, VLC_FALSE );
     add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
-    set_description( _("Linux OSS audio output") );
-    set_capability( "audio output", 100 );
 
+    set_capability( "audio output", 100 );
     add_shortcut( "oss" );
     set_callbacks( Open, Close );
 vlc_module_end();
diff --git a/modules/gui/gtk/gnome.c b/modules/gui/gtk/gnome.c
index 8fa9fa0c78..d66665244d 100644
--- a/modules/gui/gtk/gnome.c
+++ b/modules/gui/gtk/gnome.c
@@ -2,7 +2,7 @@
  * gnome.c : Gnome plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: gnome.c,v 1.16 2003/05/15 22:27:37 massiot Exp $
+ * $Id: gnome.c,v 1.17 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -69,7 +69,8 @@ vlc_module_begin();
 #else
     int i = getenv( "DISPLAY" ) == NULL ? 15 : 100;
 #endif
-    add_category_hint( N_("GNOME"), NULL, VLC_FALSE );
+    set_description( _("GNOME interface") );
+
     add_bool( "gnome-tooltips", 1, E_(GtkHideTooltips),
               TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT, VLC_FALSE );
     add_bool( "gnome-toolbartext", 1, GtkHideToolbarText, TOOLBAR_TEXT,
@@ -77,7 +78,6 @@ vlc_module_begin();
     add_integer( "gnome-prefs-maxh", 480, NULL,
                  PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT, VLC_TRUE );
 
-    set_description( _("GNOME interface") );
     set_capability( "interface", i );
     set_callbacks( Open, Close );
     set_program( "gnome-vlc" );
diff --git a/modules/gui/gtk/gtk.c b/modules/gui/gtk/gtk.c
index 17e79c2d1c..f0e20e22fd 100644
--- a/modules/gui/gtk/gtk.c
+++ b/modules/gui/gtk/gtk.c
@@ -2,7 +2,7 @@
  * gtk.c : Gtk+ plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: gtk.c,v 1.21 2003/05/15 22:27:37 massiot Exp $
+ * $Id: gtk.c,v 1.22 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -68,13 +68,13 @@ vlc_module_begin();
 #else
     int i = getenv( "DISPLAY" ) == NULL ? 10 : 90;
 #endif
-    add_category_hint( N_("Gtk+"), NULL, VLC_FALSE );
+    set_description( _("Gtk+ interface") );
+
     add_bool( "gtk-tooltips", 1, E_(GtkHideTooltips),
               TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT, VLC_FALSE );
     add_integer( "gtk-prefs-maxh", 480, NULL,
                  PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT, VLC_TRUE );
 
-    set_description( _("Gtk+ interface") );
     set_capability( "interface", i );
     set_callbacks( Open, Close );
     add_shortcut( "gtk" );
diff --git a/modules/gui/kde/kde.cpp b/modules/gui/kde/kde.cpp
index 29a43fac31..7cfd2bdd60 100644
--- a/modules/gui/kde/kde.cpp
+++ b/modules/gui/kde/kde.cpp
@@ -2,7 +2,7 @@
  * kde.cpp : KDE plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: kde.cpp,v 1.14 2004/01/25 15:42:57 kuehne Exp $
+ * $Id: kde.cpp,v 1.15 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
  *
@@ -51,9 +51,8 @@ static void run(intf_thread_t *p_intf);
  *****************************************************************************/
 vlc_module_begin();
     /* int i = getenv( "DISPLAY" ) == NULL ? 8 : 85; */
-    add_category_hint( "kde", NULL, VLC_TRUE );
-    add_file( "kde-uirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL, VLC_TRUE );
     set_description( _("KDE interface") );
+    add_file( "kde-uirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL, VLC_TRUE );
     set_capability( "interface", 0 ); /* 0 used to be i, disabled because kvlc not maintained */
     set_program( "kvlc" );
     set_callbacks( open, close );
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 54185c1a12..b2581be2da 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -2,7 +2,7 @@
  * macosx.m: MacOS X module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: macosx.m,v 1.17 2004/01/25 17:01:57 murray Exp $
+ * $Id: macosx.m,v 1.18 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
@@ -61,7 +61,6 @@ vlc_module_begin();
     add_submodule();
         set_capability( "video output", 200 );
         set_callbacks( E_(OpenVideo), E_(CloseVideo) );
-        add_category_hint( N_("Video"), NULL, VLC_FALSE );
         add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_FALSE );
         add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL, OPAQUENESS_TEXT,
             OPAQUENESS_LONGTEXT, VLC_TRUE );
diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 929b4a4d65..44f4393a4d 100644
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -2,7 +2,7 @@
  * pda.c : PDA Gtk2 plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: pda.c,v 1.18 2003/12/22 14:32:56 sam Exp $
+ * $Id: pda.c,v 1.19 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *          Marc Ariberti <marcari@videolan.org>
@@ -63,9 +63,8 @@ gint E_(GtkModeManage)   ( intf_thread_t * p_intf );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
-//    add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE );
     set_description( _("PDA Linux Gtk2+ interface") );
+//    add_bool( "pda-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE );
     set_capability( "interface", 70 );
     set_callbacks( Open, Close );
     add_shortcut( "pda" );
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index c6e53a97ca..1d5eab5187 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -2,7 +2,7 @@
  * freetype.c : Put text on the video, using freetype2
  *****************************************************************************
  * Copyright (C) 2002, 2003 VideoLAN
- * $Id: freetype.c,v 1.39 2003/12/22 02:24:52 sam Exp $
+ * $Id: freetype.c,v 1.40 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -105,13 +105,16 @@ static char *ppsz_sizes_text[] = { N_("Smaller"), N_("Small"), N_("Normal"),
                                    N_("Large"), N_("Larger") };
 
 vlc_module_begin();
-    add_category_hint( N_("Fonts"), NULL, VLC_FALSE );
-    add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT, VLC_FALSE );
-    add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT, FONTSIZE_LONGTEXT, VLC_TRUE );
-    add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT, FONTSIZER_LONGTEXT,
-                 VLC_FALSE );
-        change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
     set_description( _("freetype2 font renderer") );
+
+    add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
+              VLC_FALSE );
+    add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT,
+                 FONTSIZE_LONGTEXT, VLC_TRUE );
+    add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
+                 FONTSIZER_LONGTEXT, VLC_FALSE );
+        change_integer_list( pi_sizes, ppsz_sizes_text, 0 );
+
     set_capability( "text renderer", 100 );
     add_shortcut( "text" );
     set_callbacks( Create, Destroy );
diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index 06489527cf..6b72ef7588 100644
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.50 2004/01/22 01:14:50 sigmunau Exp $
+ * $Id: sap.c,v 1.51 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *          Clément Stenac <zorglub@via.ecp.fr>
@@ -104,23 +104,19 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    add_category_hint( N_("SAP"), NULL, VLC_TRUE );
-        add_string( "sap-addr", NULL, NULL,
-                     SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, VLC_TRUE );
-
-        add_bool( "sap-ipv4", 1 , NULL,
-                     SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, VLC_TRUE);
-
-        add_bool( "sap-ipv6", 0 , NULL,
-                   SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, VLC_TRUE);
-
-        add_string( "sap-ipv6-scope", "8" , NULL,
-                    SAP_SCOPE_TEXT, SAP_SCOPE_LONGTEXT, VLC_TRUE);
+    set_description( _("SAP interface") );
 
-        add_integer( "sap-timeout", 1800, NULL,
-                     SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, VLC_TRUE);
+    add_string( "sap-addr", NULL, NULL,
+                SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, VLC_TRUE );
+    add_bool( "sap-ipv4", 1 , NULL,
+               SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, VLC_TRUE);
+    add_bool( "sap-ipv6", 0 , NULL,
+              SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, VLC_TRUE);
+    add_string( "sap-ipv6-scope", "8" , NULL,
+                SAP_SCOPE_TEXT, SAP_SCOPE_LONGTEXT, VLC_TRUE);
+    add_integer( "sap-timeout", 1800, NULL,
+                 SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, VLC_TRUE);
 
-    set_description( _("SAP interface") );
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
 vlc_module_end();
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 887eaae33d..e095ba6ba1 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -2,7 +2,7 @@
  * mp4.c: mp4/mov muxer
  *****************************************************************************
  * Copyright (C) 2001, 2002, 2003 VideoLAN
- * $Id: mp4.c,v 1.12 2004/01/25 13:29:04 gbazin Exp $
+ * $Id: mp4.c,v 1.13 2004/01/25 18:53:07 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Gildas Bazin <gbazin at videolan dot org>
@@ -62,8 +62,8 @@ static int Mux      ( sout_mux_t * );
 vlc_module_begin();
     set_description( _("MP4/MOV muxer") );
 
-    add_category_hint( "MP4/MOV muxer", NULL, VLC_TRUE );
-        add_bool( "mp4-faststart", 1, NULL, FASTSTART_TEXT, FASTSTART_LONGTEXT, VLC_TRUE );
+    add_bool( "mp4-faststart", 1, NULL, FASTSTART_TEXT, FASTSTART_LONGTEXT,
+              VLC_TRUE );
 
     set_capability( "sout mux", 5 );
     add_shortcut( "mp4" );