Commit 37ce2848 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

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.
parent fe9e45cc
...@@ -106,7 +106,6 @@ vlc_module_begin(); ...@@ -106,7 +106,6 @@ vlc_module_begin();
add_submodule(); add_submodule();
set_description( "Directory EOF"); set_description( "Directory EOF");
set_capability( "demux2", 0 ); set_capability( "demux2", 0 );
add_shortcut( "directory" );
set_callbacks( DemuxOpen, NULL ); set_callbacks( DemuxOpen, NULL );
vlc_module_end(); vlc_module_end();
...@@ -268,7 +267,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len) ...@@ -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 ) static int Control( access_t *p_access, int i_query, va_list args )
{ {
......
...@@ -228,7 +228,6 @@ vlc_module_begin(); ...@@ -228,7 +228,6 @@ vlc_module_begin();
add_submodule(); add_submodule();
set_description( _("DirectShow input") ); set_description( _("DirectShow input") );
add_shortcut( "dshow" );
set_capability( "access2", 0 ); set_capability( "access2", 0 );
set_callbacks( AccessOpen, AccessClose ); set_callbacks( AccessOpen, AccessClose );
......
...@@ -88,7 +88,6 @@ vlc_module_begin(); ...@@ -88,7 +88,6 @@ vlc_module_begin();
set_capability( "sout access", 0 ); set_capability( "sout access", 0 );
set_category( CAT_SOUT ); set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_ACO ); set_subcategory( SUBCAT_SOUT_ACO );
add_shortcut( "ftp" );
set_callbacks( OutOpen, OutClose ); set_callbacks( OutOpen, OutClose );
vlc_module_end(); vlc_module_end();
......
...@@ -80,7 +80,6 @@ vlc_module_begin(); ...@@ -80,7 +80,6 @@ vlc_module_begin();
set_description( _("Dirac video encoder") ); set_description( _("Dirac video encoder") );
set_capability( "encoder", 100 ); set_capability( "encoder", 100 );
set_callbacks( OpenEncoder, CloseEncoder ); set_callbacks( OpenEncoder, CloseEncoder );
add_shortcut( "dirac" );
add_float( ENC_CFG_PREFIX "quality", 7.0, NULL, ENC_QUALITY_TEXT, add_float( ENC_CFG_PREFIX "quality", 7.0, NULL, ENC_QUALITY_TEXT,
ENC_QUALITY_LONGTEXT, VLC_FALSE ); ENC_QUALITY_LONGTEXT, VLC_FALSE );
......
...@@ -173,6 +173,7 @@ vlc_module_begin(); ...@@ -173,6 +173,7 @@ vlc_module_begin();
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC ); set_subcategory( SUBCAT_INPUT_ACODEC );
add_shortcut( "flac" );
#ifdef USE_LIBFLAC #ifdef USE_LIBFLAC
set_description( _("Flac audio decoder") ); set_description( _("Flac audio decoder") );
...@@ -190,7 +191,6 @@ vlc_module_begin(); ...@@ -190,7 +191,6 @@ vlc_module_begin();
set_capability( "packetizer", 100 ); set_capability( "packetizer", 100 );
set_callbacks( OpenPacketizer, CloseDecoder ); set_callbacks( OpenPacketizer, CloseDecoder );
add_shortcut( "flac" );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
......
...@@ -105,13 +105,11 @@ vlc_module_begin(); ...@@ -105,13 +105,11 @@ vlc_module_begin();
set_description( _("Theora video packetizer") ); set_description( _("Theora video packetizer") );
set_capability( "packetizer", 100 ); set_capability( "packetizer", 100 );
set_callbacks( OpenPacketizer, CloseDecoder ); set_callbacks( OpenPacketizer, CloseDecoder );
add_shortcut( "theora" );
add_submodule(); add_submodule();
set_description( _("Theora video encoder") ); set_description( _("Theora video encoder") );
set_capability( "encoder", 150 ); set_capability( "encoder", 150 );
set_callbacks( OpenEncoder, CloseEncoder ); set_callbacks( OpenEncoder, CloseEncoder );
add_shortcut( "theora" );
# define ENC_CFG_PREFIX "sout-theora-" # define ENC_CFG_PREFIX "sout-theora-"
add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT, add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT,
......
...@@ -122,7 +122,6 @@ vlc_module_begin(); ...@@ -122,7 +122,6 @@ vlc_module_begin();
set_capability( "sub filter", 0 ); set_capability( "sub filter", 0 );
set_callbacks( CreateFilter, DestroyFilter ); set_callbacks( CreateFilter, DestroyFilter );
set_description( _("Logo sub filter") ); set_description( _("Logo sub filter") );
add_shortcut( "logo" );
vlc_module_end(); vlc_module_end();
static const char *ppsz_filter_options[] = { static const char *ppsz_filter_options[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment