Commit b69133b0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Explicitly add formerly implicit submodule shortcuts

Except for a few cases:
 - dialog providers -> cannot be selected explicitly,
 - window providers -> cannot be selected explicitly,
 - ffmpeg-deinterlace -> "ffmpeg" does not make much sense here??
 - kate -> already duplicating its own shortcut

Note sure about packetizers: added just in case
parent 0617753d
......@@ -250,6 +250,7 @@ vlc_module_begin ()
add_submodule ()
set_description( N_("DirectShow input") )
add_shortcut( "dshow" )
set_capability( "access", 0 )
set_callbacks( AccessOpen, AccessClose )
......
......@@ -91,6 +91,7 @@ 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 ()
......
......@@ -339,6 +339,7 @@ vlc_module_begin ()
set_callbacks( DemuxOpen, DemuxClose )
add_submodule ()
add_shortcut( "v4l2" )
add_shortcut( "v4l2c" )
set_description( N_("Video4Linux2 Compressed A/V") )
set_capability( "access", 0 )
......
......@@ -101,6 +101,7 @@ vlc_module_begin ()
set_description( N_("Headphone virtual spatialization effect") )
set_capability( "audio filter2", 0 )
set_callbacks( OpenFilter, CloseFilter )
add_shortcut( "headphone" )
vlc_module_end ()
......
......@@ -131,6 +131,7 @@ vlc_module_begin ()
#ifdef ENABLE_SOUT
/* encoder submodule */
add_submodule ()
add_shortcut( "ffmpeg" )
set_section( N_("Encoding") , NULL )
set_description( N_("FFmpeg audio/video encoder") )
set_capability( "encoder", 100 )
......
......@@ -78,6 +78,7 @@ vlc_module_begin ()
add_submodule ()
set_capability( "interface", 0 )
set_callbacks( OpenIntf, CloseIntf )
add_shortcut( "cmml" )
vlc_module_end ()
/*****************************************************************************
......
......@@ -109,6 +109,7 @@ vlc_module_begin ()
# define ENC_CFG_PREFIX "sout-dmo-"
add_submodule ()
set_description( N_("DirectMedia Object encoder") )
add_shortcut( "dmo" )
set_capability( "encoder", 10 )
set_callbacks( EncoderOpen, EncoderClose )
......
......@@ -188,11 +188,13 @@ vlc_module_begin ()
set_callbacks( OpenDecoder, CloseDecoder )
add_submodule ()
add_shortcut( "flac" )
set_description( N_("Flac audio encoder") )
set_capability( "encoder", 100 )
set_callbacks( OpenEncoder, CloseEncoder )
add_submodule ()
add_shortcut( "flac" )
#endif
set_description( N_("Flac audio packetizer") )
set_capability( "packetizer", 100 )
......
......@@ -110,11 +110,13 @@ vlc_module_begin ()
set_description( N_("Theora video packetizer") )
set_capability( "packetizer", 100 )
set_callbacks( OpenPacketizer, CloseDecoder )
add_shortcut( "theora" )
add_submodule ()
set_description( N_("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,
......
......@@ -57,6 +57,7 @@ vlc_module_begin ()
#ifdef ENABLE_SOUT
/* mux submodule */
add_submodule ()
add_shortcut( "ffmpeg" )
set_description( N_("FFmpeg muxer" ) )
set_capability( "sout mux", 2 )
add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
......
......@@ -103,6 +103,8 @@ vlc_module_begin ()
set_description( N_("RTSP/RTP access and demux") )
add_shortcut( "rtsp" )
add_shortcut( "sdp" )
add_shortcut( "live" )
add_shortcut( "livedotcom" )
set_capability( "access_demux", 0 )
set_callbacks( Open, Close )
add_bool( "rtsp-tcp", 0, NULL,
......
......@@ -67,42 +67,50 @@ vlc_module_begin ()
set_description( N_("Playlist") )
add_submodule ()
set_description( N_("M3U playlist import") )
add_shortcut( "playlist" )
add_shortcut( "m3u-open" )
set_capability( "demux", 10 )
set_callbacks( Import_M3U, Close_M3U )
add_submodule ()
set_description( N_("RAM playlist import") )
add_shortcut( "playlist" )
add_shortcut( "ram-open" )
set_capability( "demux", 10 )
set_callbacks( Import_RAM, Close_RAM )
add_submodule ()
set_description( N_("PLS playlist import") )
add_shortcut( "playlist" )
add_shortcut( "pls-open" )
set_capability( "demux", 10 )
set_callbacks( Import_PLS, Close_PLS )
add_submodule ()
set_description( N_("B4S playlist import") )
add_shortcut( "playlist" )
add_shortcut( "b4s-open" )
add_shortcut( "shout-b4s" )
set_capability( "demux", 10 )
set_callbacks( Import_B4S, Close_B4S )
add_submodule ()
set_description( N_("DVB playlist import") )
add_shortcut( "playlist" )
add_shortcut( "dvb-open" )
set_capability( "demux", 10 )
set_callbacks( Import_DVB, Close_DVB )
add_submodule ()
set_description( N_("Podcast parser") )
add_shortcut( "playlist" )
add_shortcut( "podcast" )
set_capability( "demux", 10 )
set_callbacks( Import_podcast, Close_podcast )
add_submodule ()
set_description( N_("XSPF playlist import") )
add_shortcut( "playlist" )
add_shortcut( "xspf-open" )
set_capability( "demux", 10 )
set_callbacks( Import_xspf, Close_xspf )
add_submodule ()
set_description( N_("New winamp 5.2 shoutcast import") )
add_shortcut( "playlist" )
add_shortcut( "shout-winamp" )
set_capability( "demux", 10 )
set_callbacks( Import_Shoutcast, Close_Shoutcast )
......@@ -110,30 +118,36 @@ vlc_module_begin ()
SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
add_submodule ()
set_description( N_("ASX playlist import") )
add_shortcut( "playlist" )
add_shortcut( "asx-open" )
set_capability( "demux", 10 )
set_callbacks( Import_ASX, Close_ASX )
add_submodule ()
set_description( N_("Kasenna MediaBase parser") )
add_shortcut( "playlist" )
add_shortcut( "sgimb" )
set_capability( "demux", 10 )
set_callbacks( Import_SGIMB, Close_SGIMB )
add_submodule ()
set_description( N_("QuickTime Media Link importer") )
add_shortcut( "playlist" )
add_shortcut( "qtl" )
set_capability( "demux", 10 )
set_callbacks( Import_QTL, Close_QTL )
add_submodule ()
set_description( N_("Google Video Playlist importer") )
add_shortcut( "playlist" )
add_shortcut( "gvp" )
set_capability( "demux", 10 )
set_callbacks( Import_GVP, Close_GVP )
add_submodule ()
set_description( N_("Dummy ifo demux") )
add_shortcut( "playlist" )
set_capability( "demux", 12 )
set_callbacks( Import_IFO, Close_IFO )
add_submodule ()
set_description( N_("iTunes Music Library importer") )
add_shortcut( "playlist" )
add_shortcut( "itml" )
set_capability( "demux", 10 )
set_callbacks( Import_iTML, Close_iTML )
......
......@@ -68,6 +68,7 @@ vlc_module_begin ()
set_description( N_("MPEG-PS demuxer") )
set_capability( "demux", 8 )
set_callbacks( Open, Close )
add_shortcut( "ps" )
vlc_module_end ()
/*****************************************************************************
......
......@@ -63,6 +63,8 @@ vlc_module_begin ()
add_submodule ()
/* Will be loaded even without interface module. see voutgl.m */
add_shortcut( "minimal_macosx" )
add_shortcut( "miosx" )
set_description( N_("Minimal Mac OS X OpenGL video output (opens a borderless window)") )
set_capability( "opengl provider", 50 )
set_category( CAT_VIDEO)
......
......@@ -543,5 +543,6 @@ vlc_module_begin ()
set_description( N_("Skins loader demux") )
set_capability( "demux", 5 )
set_callbacks( DemuxOpen, NULL )
add_shortcut( "skins" )
vlc_module_end ()
......@@ -54,16 +54,19 @@ vlc_module_begin ()
set_section( N_( "Stats decoder" ), NULL )
set_description( N_("Stats decoder function") )
set_capability( "decoder", 0 )
add_shortcut( "stats" )
set_callbacks( OpenDecoder, CloseDecoder )
add_submodule ()
set_section( N_( "Stats demux" ), NULL )
set_description( N_("Stats demux function") )
set_capability( "demux", 0 )
add_shortcut( "stats" )
set_callbacks( OpenDemux, CloseDemux )
add_submodule ()
set_section( N_( "Stats video output" ), NULL )
set_description( N_("Stats video output function") )
set_capability( "video output", 0 )
add_shortcut( "stats" )
set_callbacks( OpenVideo, NULL )
vlc_module_end ()
......@@ -144,6 +144,7 @@ vlc_module_begin ()
add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT,
SOUT_MODE_LONGTEXT, false )
change_string_list( mode_list, mode_list_text, 0 )
add_shortcut( "deinterlace" )
set_callbacks( OpenFilter, CloseFilter )
vlc_module_end ()
......
......@@ -124,6 +124,7 @@ vlc_module_begin ()
set_capability( "video filter", 0 )
set_callbacks( Create, Destroy )
set_description( N_("Logo video filter") )
add_shortcut( "logo" )
vlc_module_end ()
static const char *const ppsz_filter_options[] = {
......
......@@ -125,6 +125,7 @@ vlc_module_begin ()
add_submodule()
set_capability( "video output", 150 )
add_shortcut( "direct3d" )
set_callbacks( OpenVideoVista, CloseVideo )
vlc_module_end ()
......
......@@ -1775,7 +1775,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
);
if ( b_vout_event )
XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
StructureNotifyMask | KeyPressMask |
StructureNotifyMask /*| KeyPressMask*/ |
ButtonPressMask | ButtonReleaseMask |
PointerMotionMask );
......
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