From 37ce2848cd83ba8255190cb0c810f5586cfd785c Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 4 Aug 2007 18:50:37 +0000
Subject: [PATCH] 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.

---
 modules/access/directory.c     | 3 +--
 modules/access/dshow/dshow.cpp | 1 -
 modules/access/ftp.c           | 1 -
 modules/codec/dirac.c          | 1 -
 modules/codec/flac.c           | 2 +-
 modules/codec/theora.c         | 2 --
 modules/video_filter/logo.c    | 1 -
 7 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 4311edc1b2..da8bdfd47c 100644
--- 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 5285686ccb..0d24312802 100644
--- 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 665ec67b1f..976eb9395b 100644
--- 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 97253cf9f3..74e2c1a145 100644
--- 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 8f2009336b..c77f9dcc3a 100644
--- 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 fadd7dca15..d0ea28586a 100644
--- 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 d13b6ee03e..98aea9d4a2 100644
--- 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[] = {
-- 
2.39.5