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

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 68086f1f4ec91a6e6c9bfba06c93c624677e58a6..5dbce84fa6923adae5298bd6e98d62eb1ef98436 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -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 )
 

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 268d2cd266e538378796752401fac390c9b58b98..54f23b16178591bccd5c78356a4362cb2fe594ab 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -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 ()
 

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 4188421b9d79db14609ea05d2126b04d0b94da83..0e9b5b6a9b379e0da8db00101be7d0bd107bd368 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -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 )

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 54904a7c7a1983fc86721f21087422c031b71d8a..42d1bcdb474e5e053ac78b9742f111418397074f 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -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 ()
 
 

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 1f3ca6f7c465c7610aa4acaf3fba11e59b91b5d5..17fba9b2a174fada362481427fb53269f45ca914 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -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 )

diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c
index 5be64f4992f0e2747bd122da949cf2ed7497cd75..109d346505b81c5106802a757365c6b5e5f29fae 100644 (file)
--- a/modules/codec/cmml/cmml.c
+++ b/modules/codec/cmml/cmml.c
@@ -78,6 +78,7 @@ vlc_module_begin ()
     add_submodule ()
         set_capability( "interface", 0 )
         set_callbacks( OpenIntf, CloseIntf )
+        add_shortcut( "cmml" )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index dc4dabe148ec98133477cafb809fe01e7df9eaac..0c10fba0a6630a3ab57927ab0df253ac903d4fe1 100644 (file)
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -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 )
 

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 157d9e808c799557b677cb0a680b428b979673cd..a98f4427ee195c8d2f9ec61ab8571229afb94e59 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -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 )

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index a7c6eafcc870c187099c014b9fb6271f44b46479..17bf9a7cf06b32e24bea3750636add750f38deec 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -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,

diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index f69aff9663195d9778b109a719d9f146d9e53a2c..7bf3b50d72ab5953245d7c11218362af93819e18 100644 (file)
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -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,

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index d2af92e09a9038b678ec43d88f6e4e84aec6b26c..ec7fdadd8cf3b668631de17d6eb4b3cd256e8921 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -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,

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index f50e968fe5f15770bafc2e5b5e00f0ace9e7225e..d3a1ff92bba6c37652c3f153b5d4dadf031e935f 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -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 )

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index e9abeccf1b03519ad6d0abb2497dd048d9da11c7..aad1e52971ad3b4434e0e235c17e253bbecb17c4 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -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 ()
 
 /*****************************************************************************

diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index 49cd6b1806c181f095b1c84c87b2a70fae7f90f2..d7c95ea408d72ae24407191818717e7b86fcffd4 100644 (file)
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -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)

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index af25cb4b5442e4033f389a3bba30f1e5cda1531d..d67cbdf08008e748c0f136aa1c8f50534c73709f 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -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 ()

diff --git a/modules/misc/stats/stats.c b/modules/misc/stats/stats.c
index 14c9691c88f96606e0b684391b82f36d698da68f..f19b9c20dc9b891bff02d449cb7f6635af72f93d 100644 (file)
--- a/modules/misc/stats/stats.c
+++ b/modules/misc/stats/stats.c
@@ -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 ()
 

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 93b2d9f34577920c05330d381b3807b3d41d515c..08f135d8707e5a781800ce428c273ef3c71cc43f 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -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 ()
 

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index ea3841380a15f55d144191d8e05d8b0d43bfd4a4..ebc137a048ad17e1c7f11574c13793ac5cf7d07b 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -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[] = {

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 91963e47204d9054c25457a19733a6f3af9107cf..dcb73107bca90fae92ccb8f68b848d847169beb4 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -125,6 +125,7 @@ vlc_module_begin ()
 
     add_submodule()
         set_capability( "video output", 150 )
+        add_shortcut( "direct3d" )
         set_callbacks( OpenVideoVista, CloseVideo )
 vlc_module_end ()
 

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index ea973d8663a051e78887f14b0ccea3e899310188..6e010729c0887452685966f35ed70b61b9140907 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -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 );