Fix usage of add_shortcut.

Note that shortcuts are inherited from the main module to submodules, so it is
totally useless to duplicate them paste add_submodule. If you think this is
wrong, I do not necessarily disagree, but it would need a RFC.

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 4311edc1b2d55d9794f7d44e58e0c93331eb66cc..da8bdfd47ce036bab48cfcdc29ac36aa7c3f14cd 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -106,7 +106,6 @@ vlc_module_begin();
     add_submodule();
         set_description( "Directory EOF");
         set_capability( "demux2", 0 );
-        add_shortcut( "directory" );
         set_callbacks( DemuxOpen, NULL );
 vlc_module_end();
 
@@ -268,7 +267,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len)
 }
 
 /*****************************************************************************
- * DemuxOpen:
+ * Control:
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 5285686ccb5dc2e36a77b08a58bbf8e9965a66df..0d243128028f14af6659a9286f68da2d571834c5 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -228,7 +228,6 @@ vlc_module_begin();
 
     add_submodule();
     set_description( _("DirectShow input") );
-    add_shortcut( "dshow" );
     set_capability( "access2", 0 );
     set_callbacks( AccessOpen, AccessClose );
 

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 665ec67b1f3c2b08c2d1d54132ebdc49709d1374..976eb9395bcb5c43808326c79d95d43dac58bfd9 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -88,7 +88,6 @@ vlc_module_begin();
     set_capability( "sout access", 0 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_ACO );
-    add_shortcut( "ftp" );
     set_callbacks( OutOpen, OutClose );
 vlc_module_end();
 

diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 97253cf9f358ef59b1194c7a44013b9149be65e7..74e2c1a14594262bab27496994f377c7ed4266a6 100644 (file)
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -80,7 +80,6 @@ vlc_module_begin();
     set_description( _("Dirac video encoder") );
     set_capability( "encoder", 100 );
     set_callbacks( OpenEncoder, CloseEncoder );
-    add_shortcut( "dirac" );
     add_float( ENC_CFG_PREFIX "quality", 7.0, NULL, ENC_QUALITY_TEXT,
                ENC_QUALITY_LONGTEXT, VLC_FALSE );
 

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 8f2009336b9ea08db3bcd4be76966f74b0c6bacf..c77f9dcc3ac69db518f3f106224d18db2d75b784 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -173,6 +173,7 @@ vlc_module_begin();
 
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACODEC );
+    add_shortcut( "flac" );
 
 #ifdef USE_LIBFLAC
     set_description( _("Flac audio decoder") );
@@ -190,7 +191,6 @@ vlc_module_begin();
     set_capability( "packetizer", 100 );
     set_callbacks( OpenPacketizer, CloseDecoder );
 
-    add_shortcut( "flac" );
 vlc_module_end();
 
 /*****************************************************************************

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index fadd7dca15ebfa263b0a5569d3f8b6d90d694800..d0ea28586a0e5a84d71936e15fa6338095fbfb21 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -105,13 +105,11 @@ vlc_module_begin();
     set_description( _("Theora video packetizer") );
     set_capability( "packetizer", 100 );
     set_callbacks( OpenPacketizer, CloseDecoder );
-    add_shortcut( "theora" );
 
     add_submodule();
     set_description( _("Theora video encoder") );
     set_capability( "encoder", 150 );
     set_callbacks( OpenEncoder, CloseEncoder );
-    add_shortcut( "theora" );
 
 #   define ENC_CFG_PREFIX "sout-theora-"
     add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT,

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index d13b6ee03e0ed8fbb0d66e10f25c1a0a2d367dad..98aea9d4a235d19c49be806f6f05a179dc00b06c 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -122,7 +122,6 @@ vlc_module_begin();
     set_capability( "sub filter", 0 );
     set_callbacks( CreateFilter, DestroyFilter );
     set_description( _("Logo sub filter") );
-    add_shortcut( "logo" );
 vlc_module_end();
 
 static const char *ppsz_filter_options[] = {