* include/modules_inner.h, include/modules.h: added a shortname field to the module...

* modules/access/*: added a shortname to a few modules.

diff --git a/include/modules.h b/include/modules.h
index ed797bb3e02b4ec48e53f89c1b70850d30aa0ccb..749343873349e5c3e2661794976fc2d9f89eaaa4 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -67,6 +67,7 @@ struct module_t
     /*
      * Variables set by the module to identify itself
      */
+    char *psz_shortname;                                      /* Module name */
     char *psz_longname;                           /* Module descriptive name */
 
     /*

diff --git a/include/modules_inner.h b/include/modules_inner.h
index fe532b6c70fe25cd84028375014fef819b40c783..9cab60a6c8ed9d411af983ec58518f8459bcff4e 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -2,7 +2,7 @@
  * modules_inner.h : Macros used from within a module.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules_inner.h,v 1.43 2004/01/09 12:23:47 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -99,6 +99,7 @@
         p_module->b_unloadable = VLC_TRUE;                                    \
         p_module->b_reentrant = VLC_TRUE;                                     \
         p_module->psz_object_name = MODULE_STRING;                            \
+        p_module->psz_shortname = MODULE_STRING;                              \
         p_module->psz_longname = MODULE_STRING;                               \
         p_module->pp_shortcuts[ 0 ] = MODULE_STRING;                          \
         p_module->i_cpu = 0;                                                  \
@@ -142,6 +143,7 @@
                                 p_module->pp_shortcuts[ i_shortcut ];         \
     }                                                                         \
     p_submodule->psz_object_name = p_module->psz_object_name;                 \
+    p_submodule->psz_shortname = p_module->psz_shortname;                     \
     p_submodule->psz_longname = p_module->psz_longname;                       \
     p_submodule->psz_program = p_module->psz_program;                         \
     p_submodule->psz_capability = p_module->psz_capability;                   \
@@ -157,6 +159,9 @@
     p_submodule->pp_shortcuts[ i_shortcut ] = shortcut;                       \
     i_shortcut++
 
+#define set_shortname( desc )                                                 \
+    p_submodule->psz_shortname = desc
+
 #define set_description( desc )                                               \
     p_submodule->psz_longname = desc
 

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index b709ecfeae0b08a0c8e940d2602bbb3fcd1b9e0f..6a6860a94267df21ca65328ecedbbf2cba2fa1ea 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -140,6 +140,7 @@ static int  DemuxOpen  ( vlc_object_t * );
 static void DemuxClose ( vlc_object_t * );
 
 vlc_module_begin();
+    set_shortname( _("DirectShow") );
     set_description( _("DirectShow input") );
     add_integer( "dshow-caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 6cf22fb14f55a6c6c88553e7dbc96c514770ecda..c45696f9268d48717fc73e71ea17ac23e1032616 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -146,6 +146,7 @@ static void    CloseProgram( input_thread_t * p_input );
 #define HIERARCHY_LONGTEXT ""
 
 vlc_module_begin();
+    set_shortname( _("DVB") );
     set_description( N_("DVB input with v4l2 support") );
 
     add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
@@ -153,33 +154,33 @@ vlc_module_begin();
     add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
                  VLC_FALSE );
     add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
-                 VLC_FALSE );
+                 VLC_TRUE );
     add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT,
                  VLC_FALSE );
     add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT,
                  VLC_TRUE );
     add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE );
-    add_integer( "dvb-lnb-lof1", 9750000, NULL, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT,
-                 VLC_TRUE );
-    add_integer( "dvb-lnb-lof2", 10600000, NULL, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT,
-                 VLC_TRUE );
+    add_integer( "dvb-lnb-lof1", 9750000, NULL, LNB_LOF1_TEXT,
+                 LNB_LOF1_LONGTEXT, VLC_TRUE );
+    add_integer( "dvb-lnb-lof2", 10600000, NULL, LNB_LOF2_TEXT,
+                 LNB_LOF2_LONGTEXT, VLC_TRUE );
     add_integer( "dvb-lnb-slof", 11700000, NULL, LNB_SLOF_TEXT,
                  LNB_SLOF_LONGTEXT, VLC_TRUE );
     /* DVB-S (satellite) */
     add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
-              VLC_FALSE );
+              VLC_TRUE );
     add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
                  VLC_TRUE );
     add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
-                 VLC_FALSE );
+                 VLC_TRUE );
     add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
-                 VLC_FALSE );
+                 VLC_TRUE );
     add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE );
     add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
                  VLC_FALSE );
     /* DVB-T (terrestrial) */
-    add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT, MODULATION_LONGTEXT,
-                 VLC_TRUE );
+    add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT,
+                 MODULATION_LONGTEXT, VLC_TRUE );
     /* DVB-T (terrestrial) */
     add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT,
                  CODE_RATE_HP_LONGTEXT, VLC_TRUE );

diff --git a/modules/access/pvr/pvr.c b/modules/access/pvr/pvr.c
index cc065d02ae2945f888cfdfc26360a10febecaea0..cb1376ec685c6bb169c675be5850afb4f6824a18 100644 (file)
--- a/modules/access/pvr/pvr.c
+++ b/modules/access/pvr/pvr.c
@@ -74,6 +74,7 @@ static ssize_t Read   ( input_thread_t *, byte_t *, size_t );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_shortname( _("PVR") );
     set_description( _("MPEG Encoding cards input (with ivtv drivers)") );
     set_capability( "access", 0 );
     add_shortcut( "pvr" );

diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c
index 7f1fe58d0252d991f79a9f009a0f2fb0e906e1a3..edddf6e2b4949e0e31603ba3e319abc10f3675dc 100644 (file)
--- a/modules/access/v4l/v4l.c
+++ b/modules/access/v4l/v4l.c
@@ -90,6 +90,7 @@ static void DemuxClose ( vlc_object_t * );
     "(eg. I420 (default), RV24, etc.)")
 
 vlc_module_begin();
+    set_shortname( _("Video4Linux") );
     set_description( _("Video4Linux input") );
 
     add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL,