modules: use the new add_shortcut capability (add multiple shortcuts at a time).

diff --git a/modules/3dnow/memcpy.c b/modules/3dnow/memcpy.c
index 150064576c59e956d120c96248c407eec3251ccb..37f33e936792139f61de96e93d0e200f059cf4ba 100644 (file)
--- a/modules/3dnow/memcpy.c
+++ b/modules/3dnow/memcpy.c
@@ -44,10 +44,7 @@ vlc_module_begin ()
     set_category( CAT_ADVANCED )
     set_subcategory( SUBCAT_ADVANCED_MISC )
     set_description( N_("3D Now! memcpy") )
-    add_shortcut( "3dn" )
-    add_shortcut( "3dnow" )
-    add_shortcut( "memcpy3dn" )
-    add_shortcut( "memcpy3dnow" )
+    add_shortcut( "3dn", "3dnow", "memcpy3dn", "memcpy3dnow" )
     set_capability( "memcpy", 100 )
     set_callbacks( Activate, NULL )
 vlc_module_end ()

diff --git a/modules/access/avio.h b/modules/access/avio.h
index 7e956d065a79453c59f88653152fdaf45ecc62c2..5497d346d5176d0e6733eba6081c94ec116ac18c 100644 (file)
--- a/modules/access/avio.h
+++ b/modules/access/avio.h
@@ -36,7 +36,6 @@ void CloseAvio(vlc_object_t *);
     set_category(CAT_INPUT)                 \
     set_subcategory(SUBCAT_INPUT_ACCESS)    \
     set_capability("access", -1)            \
-    add_shortcut("avio")                    \
-    add_shortcut("rtmp")                    \
+    add_shortcut("avio", "rtmp")            \
     set_callbacks(OpenAvio, CloseAvio)
 

diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c
index 20b78b06f1f4d51155344851812802b8dea192eb..ec85e83244f56993270dce7d983a34f11ce37933 100644 (file)
--- a/modules/access/bd/bd.c
+++ b/modules/access/bd/bd.c
@@ -65,8 +65,7 @@ vlc_module_begin ()
     add_integer( "bd-caching", DEFAULT_PTS_DELAY / 1000, NULL,
         CACHING_TEXT, CACHING_LONGTEXT, true )
     set_capability( "access_demux", 60 )
-    add_shortcut( "bd" )
-    add_shortcut( "file" )
+    add_shortcut( "bd", "file" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index 5fbe68eafcc64fc49f8fccd0a462ab27ff54d493..24a0d6fa594436f974488626a628f5384bf405b4 100644 (file)
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -293,25 +293,11 @@ vlc_module_begin ()
         change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL )
 
     set_capability( "access", 0 )
-    add_shortcut( "dvb" )      /* Generic name */
-
-    add_shortcut( "dvb-s" )    /* Satellite */
-    add_shortcut( "dvbs" )
-    add_shortcut( "qpsk" )
-    add_shortcut( "satellite" )
-
-    add_shortcut( "dvb-c" )    /* Cable */
-    add_shortcut( "dvbc" )
-    add_shortcut( "qam" )
-    add_shortcut( "cable" )
-
-    add_shortcut( "dvbt" )    /* Terrestrial */
-    add_shortcut( "dvb-t" )
-    add_shortcut( "ofdm" )
-    add_shortcut( "terrestrial" )
-
-    add_shortcut( "atsc" )     /* Atsc */
-    add_shortcut( "usdigital" )
+    add_shortcut( "dvb",                                    /* Generic name */
+                  "dvb-s", "dvbs", "qpsk", "satellite",     /* Satellite */
+                  "dvb-c", "dvbc", "qam", "cable",          /* Cable */
+                  "dvbt", "dvb-t", "ofdm", "terrestrial",   /* Terrestrial */
+                  "atsc", "usdigital" )                     /* Atsc */
 
     set_callbacks( Open, Close )
 vlc_module_end ()

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 43b824b8f5dacdf97fbe0cfd669578f0f612a8fb..35864476abc37231447dd8c87227c19a721c3594 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -90,8 +90,7 @@ vlc_module_begin ()
             N_( "CDDB Server port to use." ), true )
 #endif
 
-    add_shortcut( "cdda" )
-    add_shortcut( "cddasimple" )
+    add_shortcut( "cdda", "cddasimple" )
 vlc_module_end ()
 
 

diff --git a/modules/access/dv.c b/modules/access/dv.c
index 82c4b1b5f8719dfe7d0589c0829c3615e3ef8f9e..084ef27ed86ce8c2a21701b00f82273d1bdd45be 100644 (file)
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -69,9 +69,7 @@ vlc_module_begin ()
     add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true )
         change_safe()
     set_capability( "access", 0 )
-    add_shortcut( "dv" )
-    add_shortcut( "dv1394" )
-    add_shortcut( "raw1394" )
+    add_shortcut( "dv", "dv1394", "raw1394" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 046570941d304955d1f56651b95294129149acbe..e57fa399e56b448ebce086d1631a6e41a8a87db5 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -266,19 +266,11 @@ vlc_module_begin ()
 #endif
 
     set_capability( "access", 0 )
-    add_shortcut( "dvb" )      /* Generic name */
-
-    add_shortcut( "dvb-s" )    /* Satellite */
-    add_shortcut( "qpsk" )
-    add_shortcut( "satellite" )
-
-    add_shortcut( "dvb-c" )    /* Cable */
-    add_shortcut( "cable" )
-
-    add_shortcut( "dvb-t" )    /* Terrestrial */
-    add_shortcut( "terrestrial" )
-
-    add_shortcut( "atsc" )     /* Atsc */
+    add_shortcut( "dvb",                        /* Generic name */
+                  "dvb-s", "qpsk", "satellite", /* Satellite */
+                  "dvb-c", "cable",             /* Cable */
+                  "dvb-t", "terrestrial",       /* Terrestrial */
+                  "atsc" )                      /* Atsc */
     add_shortcut( "usdigital" )
 
     set_callbacks( Open, Close )

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 99b45ebd922dae6bb6d09d274132f702ce89e528..91fffcd10be7b3aa0ae8cc973becd7e201500f50 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -96,9 +96,7 @@ vlc_module_begin ()
     add_bool( "dvdnav-menu", true, NULL,
         MENU_TEXT, MENU_LONGTEXT, false )
     set_capability( "access_demux", 5 )
-    add_shortcut( "dvd" )
-    add_shortcut( "dvdnav" )
-    add_shortcut( "file" )
+    add_shortcut( "dvd", "dvdnav", "file" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 4eef5d82ed913b2695b34d740cebcaf75c3fabdc..22919798fd9e2326eadb55f3033be405a64b4172 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -90,9 +90,7 @@ vlc_module_begin ()
         CACHING_TEXT, CACHING_LONGTEXT, true )
     add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */
     set_capability( "access_demux", 0 )
-    add_shortcut( "dvd" )
-    add_shortcut( "dvdread" )
-    add_shortcut( "dvdsimple" )
+    add_shortcut( "dvd", "dvdread", "dvdsimple" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/access/fs.c b/modules/access/fs.c
index 30c855ae860eb228d94131c6108e9c0aae878c1e..0380c149c6f6b5621d8f896a1938b85b688cec54 100644 (file)
--- a/modules/access/fs.c
+++ b/modules/access/fs.c
@@ -69,9 +69,7 @@ vlc_module_begin ()
         change_safe()
     add_obsolete_string( "file-cat" )
     set_capability( "access", 50 )
-    add_shortcut( "file" )
-    add_shortcut( "fd" )
-    add_shortcut( "stream" )
+    add_shortcut( "file", "fd", "stream" )
     set_callbacks( Open, Close )
 
     add_submodule()
@@ -84,9 +82,9 @@ vlc_module_begin ()
     add_string( "ignore-filetypes", "m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa",
                 NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false )
 #ifndef HAVE_FDOPENDIR
-    add_shortcut( "file" )
+    add_shortcut( "file", "directory", "dir" )
+#else
+    add_shortcut( "directory", "dir" )
 #endif
-    add_shortcut( "directory" )
-    add_shortcut( "dir" )
     set_callbacks( DirOpen, DirClose )
 vlc_module_end ()

diff --git a/modules/access/http.c b/modules/access/http.c
index 983fab7dac4ffe4c17c097c78fcc189a7948ca89..90e465b93d73bf231030ed75466eb54c358a3e0d 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -141,11 +141,8 @@ vlc_module_begin ()
 #endif
     add_obsolete_string("http-user")
     add_obsolete_string("http-pwd")
-    add_shortcut( "http" )
-    add_shortcut( "https" )
-    add_shortcut( "unsv" )
-    add_shortcut( "itpc" ) /* iTunes Podcast */
-    add_shortcut( "icyx" )
+    /* 'itpc' = iTunes Podcast */
+    add_shortcut( "http", "https", "unsv", "itpc", "icyx" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 94af77b6f59702b4be7183366f8c6743a437d564..18f198c4226eb489cfa9dc76e6d6daa71ddb62d1 100644 (file)
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -88,11 +88,7 @@ vlc_module_begin ()
     add_string( "mmsh-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
                     false )
 
-    add_shortcut( "mms" )
-    add_shortcut( "mmsu" )
-    add_shortcut( "mmst" )
-    add_shortcut( "mmsh" )
-    add_shortcut( "http" )
+    add_shortcut( "mms", "mmsu", "mmst", "mmsh", "http" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/access/rtp/rtp.c b/modules/access/rtp/rtp.c
index 1d2e2721d283af1f15ed6de728301671ac306616..cf848686dc476e52cd343e11128e9c1d73ad97a2 100644 (file)
--- a/modules/access/rtp/rtp.c
+++ b/modules/access/rtp/rtp.c
@@ -115,11 +115,9 @@ vlc_module_begin ()
                  RTP_MAX_MISORDER_LONGTEXT, true)
         change_integer_range (0, 32767)
 
-    add_shortcut ("dccp")
     /*add_shortcut ("sctp")*/
-    add_shortcut ("rtptcp") /* "tcp" is already taken :( */
-    add_shortcut ("rtp")
-    add_shortcut ("udplite")
+    add_shortcut ("dccp", "rtptcp", /* "tcp" is already taken :( */
+                  "rtp", "udplite")
 vlc_module_end ()
 
 /*

diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index e0bef731ca86bbe88aef83bcfc41b51e81444dc7..52c2b6b4a006f5d643cd84939178282082129e2c 100644 (file)
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -58,9 +58,7 @@ vlc_module_begin ()
         change_safe()
     set_capability( "access", 10 )
     set_callbacks( Open, Close )
-    add_shortcut( "realrtsp" )
-    add_shortcut( "rtsp" )
-    add_shortcut( "pnm" )
+    add_shortcut( "realrtsp", "rtsp", "pnm" )
 vlc_module_end ()
 
 

diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index 0a464e8b0aa3a418656b4bee1b2b2ef0db958f4c..1c76412cbc81642785fb93a483aa93e60dc389f9 100644 (file)
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -91,8 +91,7 @@ vlc_module_begin ()
     add_bool ("screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
               FOLLOW_MOUSE_LONGTEXT, true)
 
-    add_shortcut ("screen")
-    add_shortcut ("window")
+    add_shortcut ("screen", "window")
 vlc_module_end ()
 
 /*

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 3d56275fc20bc6dfdebd45a42ee087bc5f27af47..452d29e50e1cfb441b8b1992613005b4c83b3faf 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -375,8 +375,7 @@ vlc_module_begin ()
     set_callbacks( DemuxOpen, DemuxClose )
 
     add_submodule ()
-    add_shortcut( "v4l2" )
-    add_shortcut( "v4l2c" )
+    add_shortcut( "v4l2", "v4l2c" )
     set_description( N_("Video4Linux2 Compressed A/V") )
     set_capability( "access", 0 )
     /* use these when open as access_demux fails; VLC will use another demux */

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 97e74547a2c2cdebd213b2f1a8557488be6c5958..d55ec016063af1483b09f13a4bbed2142735c70a 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -59,8 +59,7 @@ vlc_module_begin ()
     add_usage_hint( N_("[vcd:][device][@[title][,[chapter]]]") )
     add_integer( "vcd-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
-    add_shortcut( "vcd" )
-    add_shortcut( "svcd" )
+    add_shortcut( "vcd", "svcd" )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c
index ae6316f9bae4fc3ad97c00d77763f86f4f461810..ac3f87cf30fa5368982acf8d5c111e90117d0b54 100644 (file)
--- a/modules/access/zip/zipstream.c
+++ b/modules/access/zip/zipstream.c
@@ -52,8 +52,7 @@ vlc_module_begin()
         set_subcategory( SUBCAT_INPUT_ACCESS )
         set_description( N_( "Zip access" ) )
         set_capability( "access", 0 )
-        add_shortcut( "unzip" )
-        add_shortcut( "zip" )
+        add_shortcut( "unzip", "zip" )
         set_callbacks( AccessOpen, AccessClose )
 vlc_module_end()
 

diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index c326b79bea99bd551c2c316d1a1f47f1be1d6062..91ae8636690cc11a0e1c7c6b687d38f513cc1317 100644 (file)
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -72,8 +72,7 @@ vlc_module_begin ()
     set_capability( "sout access", 50 )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_ACO )
-    add_shortcut( "file" )
-    add_shortcut( "stream" )
+    add_shortcut( "file", "stream" )
     add_bool( SOUT_CFG_PREFIX "append", false, NULL, APPEND_TEXT,APPEND_LONGTEXT,
               true )
     add_bool( SOUT_CFG_PREFIX "sync", false, NULL, SYNC_TEXT,SYNC_LONGTEXT,

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index f65c7146768264fe6a8e00bc77ceab1ec2596872..6b13455e452bd691b8bcd93bffed099f425588e8 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -95,9 +95,7 @@ vlc_module_begin ()
     set_description( N_("HTTP stream output") )
     set_capability( "sout access", 0 )
     set_shortname( "HTTP" )
-    add_shortcut( "http" )
-    add_shortcut( "https" )
-    add_shortcut( "mmsh" )
+    add_shortcut( "http", "https", "mmsh" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_ACO )
     add_string( SOUT_CFG_PREFIX "user", "", NULL,

diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 23cfe0af5f64e72fb448eeaf1f0dfb51450f7d43..9a41a8bd5e15bf3c98d02fa66185d20e9872ea7f 100644 (file)
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -130,8 +130,7 @@ vlc_module_begin ()
     set_capability( "audio output", 100 )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_shortcut( "directx" )
-    add_shortcut( "directsound" )
+    add_shortcut( "directx", "directsound" )
 
     add_string( "directx-audio-device-name", "default", NULL,
              DEVICE_TEXT, DEVICE_LONGTEXT, false )

diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index 3bee0ebd7136c6f529b67396f9c880d391111d05..32f34384d86d6e6a7b1064555f4f38539f54dbb2 100644 (file)
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -123,8 +123,7 @@ vlc_module_begin ()
     add_bool( "audiofile-wav", true, NULL, WAV_TEXT, WAV_LONGTEXT, true )
 
     set_capability( "audio output", 0 )
-    add_shortcut( "file" )
-    add_shortcut( "audiofile" )
+    add_shortcut( "file", "audiofile" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index c02ffa09589c8c7c71a2c0d72d2a97d6f8c30a51..48d531486dcfad244d246b1dd3c714763b05e92e 100644 (file)
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -103,8 +103,7 @@ vlc_module_begin ()
     set_capability( "audio output", 160 )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_shortcut( "pulseaudio" )
-    add_shortcut( "pa" )
+    add_shortcut( "pulseaudio", "pa" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index 9d9c0454dea3a52418fe228dbf3a3382a05638e0..c7a3b6ec7a84fd9298511d08c270e66a5758a388 100644 (file)
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -45,8 +45,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_capability( "demux", 3 )
     set_callbacks( Open, Close )
-    add_shortcut( "cdg" )
-    add_shortcut( "subtitle" )
+    add_shortcut( "cdg", "subtitle" )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 2b2e4a67a1741448c6b5a1a2460f26f2a63e3048..5e204c8389e42c26e87880bf15c026a2edc57f1d 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -99,18 +99,13 @@ vlc_module_begin ()
     set_capability( "demux", 50 )
     set_shortname( "RTP/RTSP")
     set_callbacks( Open, Close )
-    add_shortcut( "live" )
-    add_shortcut( "livedotcom" )
+    add_shortcut( "live", "livedotcom" )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
 
     add_submodule ()
         set_description( N_("RTSP/RTP access and demux") )
-        add_shortcut( "rtsp" )
-        add_shortcut( "pnm" )
-        add_shortcut( "sdp" )
-        add_shortcut( "live" )
-        add_shortcut( "livedotcom" )
+        add_shortcut( "rtsp", "pnm", "sdp", "live", "livedotcom" )
         set_capability( "access_demux", 0 )
         set_callbacks( Open, Close )
         add_bool( "rtsp-tcp", false, NULL,

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 01906f98d57e702961ee5375ab00295ffe99e851..b797feb90499cb3ca419b23fec42af5116105175 100644 (file)
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -69,8 +69,7 @@ vlc_module_begin ()
             N_("Dummy Elements"),
             N_("Read and discard unknown EBML elements (not good for broken files)."), true );
 
-    add_shortcut( "mka" )
-    add_shortcut( "mkv" )
+    add_shortcut( "mka", "mkv" )
 vlc_module_end ()
 
 class demux_sys_t;

diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index 98fca75132345d19dfe0b257383cec7e48bf0759..0103e1412532469e33276668a6026a542e25c45b 100644 (file)
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -57,22 +57,12 @@ vlc_module_begin ()
     set_capability( "demux", 155 )
     set_callbacks( OpenAudio, Close )
 
-    add_shortcut( "mpga" )
-    add_shortcut( "mp3" )
-
-    add_shortcut( "m4a" )
-    add_shortcut( "mp4a" )
-    add_shortcut( "aac" )
-
-    add_shortcut( "ac3" )
-    add_shortcut( "a52" )
-
-    add_shortcut( "eac3" )
-
-    add_shortcut( "dts" )
-
-    add_shortcut( "mlp" )
-    add_shortcut( "thd" )
+    add_shortcut( "mpga", "mp3",
+                  "m4a", "mp4a", "aac",
+                  "ac3", "a52",
+                  "eac3",
+                  "dts",
+                  "mlp", "thd" )
 
     add_submodule()
     set_description( N_("MPEG-4 video" ) )

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index de14c4a4411232511b2e7b9bef451de3177ca2dd..a8f88e4625e02a77274890c50fb74149c32fb54f 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -70,79 +70,64 @@ vlc_module_begin ()
     set_description( N_("Playlist") )
     add_submodule ()
         set_description( N_("M3U playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "m3u" )
-        add_shortcut( "m3u8" )
-        add_shortcut( "m3u-open" )
+        add_shortcut( "playlist", "m3u", "m3u8", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "b4s-open", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "shout-winamp" )
         set_capability( "demux", 10 )
         set_callbacks( Import_Shoutcast, Close_Shoutcast )
         add_bool( "shoutcast-show-adult", false, NULL,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
     add_submodule ()
         set_description( N_("ASX playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "asx-open" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "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" )
+        add_shortcut( "playlist", "gvp" )
         set_capability( "demux", 10 )
         set_callbacks( Import_GVP, Close_GVP )
     add_submodule ()
@@ -152,20 +137,17 @@ vlc_module_begin ()
         set_callbacks( Import_IFO, Close_IFO )
     add_submodule ()
         set_description( N_("iTunes Music Library importer") )
-        add_shortcut( "playlist" )
-        add_shortcut( "itml" )
+        add_shortcut( "playlist", "itml" )
         set_capability( "demux", 10 )
         set_callbacks( Import_iTML, Close_iTML )
     add_submodule ()
         set_description( N_("WPL playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "wpl" )
+        add_shortcut( "playlist", "wpl" )
         set_capability( "demux", 10 )
         set_callbacks( Import_WPL, Close_WPL )
     add_submodule ()
         set_description( N_("ZPL playlist import") )
-        add_shortcut( "playlist" )
-        add_shortcut( "zpl" )
+        add_shortcut( "playlist", "zpl" )
         set_capability( "demux", 10 )
         set_callbacks( Import_ZPL, Close_ZPL )
 vlc_module_end ()

diff --git a/modules/demux/real.c b/modules/demux/real.c
index 7c0d0a910bc745f141737ac78ad4fd9585fc4422..9a9cd02ea662642262dafee4c8733d4a996c61e8 100644 (file)
--- a/modules/demux/real.c
+++ b/modules/demux/real.c
@@ -72,8 +72,7 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_callbacks( Open, Close )
-    add_shortcut( "real" )
-    add_shortcut( "rm" )
+    add_shortcut( "real", "rm" )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index 9c27d97e0a848c2d1c0acd42ab2a70e33f05d3cb..a0c826af095fde2f763e81cd198018648a5f2b4a 100644 (file)
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -66,8 +66,7 @@ vlc_module_begin ()
      * Something must be wrong.
      */
     set_callbacks( Open, Close )
-    add_shortcut("ty")
-    add_shortcut("tivo")
+    add_shortcut("ty", "tivo")
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 8877da4f31d086af4d700285d6e80430be9a50c7..f8283db8d7854bc2c67f6f6aba3566274bf7b6cd 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -56,8 +56,7 @@ vlc_module_begin ()
 
     set_callbacks( Open, Close )
 
-    add_shortcut( "vobsub" )
-    add_shortcut( "subtitle" )
+    add_shortcut( "vobsub", "subtitle" )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/gui/macosx_dialog_provider/dialogProvider.m b/modules/gui/macosx_dialog_provider/dialogProvider.m
index 113f60a84528258d201e37fa3c22bf87d45fd850..77b7d3f570038c06df11c92208c39beb051d845f 100644 (file)
--- a/modules/gui/macosx_dialog_provider/dialogProvider.m
+++ b/modules/gui/macosx_dialog_provider/dialogProvider.m
@@ -93,8 +93,7 @@ struct intf_sys_t
 vlc_module_begin()
     /* Minimal interface. see intf.m */
     set_shortname("Mac OS X Dialogs")
-    add_shortcut("macosx_dialog_provider")
-    add_shortcut("miosx")
+    add_shortcut("macosx_dialog_provider", "miosx")
     set_description("Minimal Mac OS X Dialog Provider")
     set_capability("interface", 0)
 

diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index d7c95ea408d72ae24407191818717e7b86fcffd4..c3afae0c7989037a26aa45f6087ac68e6e1e68b2 100644 (file)
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -53,8 +53,7 @@ void CloseVideoGL ( vlc_object_t * );
 vlc_module_begin ()
     /* Minimal interface. see intf.m */
     set_shortname( "Minimal Macosx" )
-    add_shortcut( "minimal_macosx" )
-    add_shortcut( "miosx" )
+    add_shortcut( "minimal_macosx", "miosx" )
     set_description( N_("Minimal Mac OS X interface") )
     set_capability( "interface", 50 )
     set_callbacks( OpenIntf, CloseIntf )
@@ -63,8 +62,7 @@ vlc_module_begin ()
 
     add_submodule ()
         /* Will be loaded even without interface module. see voutgl.m */
-        add_shortcut( "minimal_macosx" )
-        add_shortcut( "miosx" )
+        add_shortcut( "minimal_macosx", "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/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 3f61dd9ab9b02ae934c3ee96ebfa01451865f6a9..373466c273380eae37974052a053af02e9779041 100644 (file)
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -119,8 +119,7 @@ vlc_module_begin ()
         set_description( N_("libc memcpy") )
         set_capability( "memcpy", 50 )
         set_callbacks( OpenDummy, NULL )
-        add_shortcut( "c" )
-        add_shortcut( "libc" )
+        add_shortcut( "c", "libc" )
 vlc_module_end ()
 
 static int OpenDummy( vlc_object_t *obj )

diff --git a/modules/mmx/memcpy.c b/modules/mmx/memcpy.c
index 21ee85897121fd626de5850e9609a2bfb315181f..53ae7ae41354bef2edac1070c77d2977131e0202 100644 (file)
--- a/modules/mmx/memcpy.c
+++ b/modules/mmx/memcpy.c
@@ -44,8 +44,7 @@ vlc_module_begin ()
     set_category( CAT_ADVANCED )
     set_subcategory( SUBCAT_ADVANCED_MISC )
     set_description( N_("MMX memcpy") )
-    add_shortcut( "mmx" )
-    add_shortcut( "memcpymmx" )
+    add_shortcut( "mmx", "memcpymmx" )
     set_capability( "memcpy", 100 )
     set_callbacks( Activate, NULL )
 vlc_module_end ()

diff --git a/modules/mmxext/memcpy.c b/modules/mmxext/memcpy.c
index 4f21a889c08578b4dccfe7680daf7c3a891f934f..9e59bf5f2abd945062596d63cae33a673a1253df 100644 (file)
--- a/modules/mmxext/memcpy.c
+++ b/modules/mmxext/memcpy.c
@@ -44,8 +44,7 @@ vlc_module_begin ()
     set_category( CAT_ADVANCED )
     set_subcategory( SUBCAT_ADVANCED_MISC )
     set_description( N_("MMX EXT memcpy") )
-    add_shortcut( "mmxext" )
-    add_shortcut( "memcpymmxext" )
+    add_shortcut( "mmxext", "memcpymmxext" )
     set_capability( "memcpy", 200 )
     set_callbacks( Activate, NULL )
 vlc_module_end ()

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index 933bbbafbf42e07f678a0cb4e1dc3ab69022318c..40dc0fd43b9d1dd9badc2ff603a6c1a296e8d73e 100644 (file)
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -76,8 +76,7 @@ vlc_module_begin ()
     set_shortname( "ASF" )
 
     set_capability( "sout mux", 5 )
-    add_shortcut( "asf" )
-    add_shortcut( "asfh" )
+    add_shortcut( "asf", "asfh" )
     set_callbacks( Open, Close )
 
     add_string( SOUT_CFG_PREFIX "title", "", NULL, TITLE_TEXT, TITLE_LONGTEXT,

diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c
index 51e11adaa2b2f243ebc53002b31d446da9e7e3c8..e1eec70061635e1c738ca186171676ed0cc0f9e7 100644 (file)
--- a/modules/mux/dummy.c
+++ b/modules/mux/dummy.c
@@ -46,9 +46,7 @@ vlc_module_begin ()
     set_capability( "sout mux", 5 )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_MUX )
-    add_shortcut( "dummy" )
-    add_shortcut( "raw" )
-    add_shortcut( "es" )
+    add_shortcut( "dummy", "raw", "es" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index d5a8614500094dde07a50c708cab0db391e812e6..27e4e81355f3b61045d424d20536260cae994f85 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -64,9 +64,7 @@ vlc_module_begin ()
               FASTSTART_TEXT, FASTSTART_LONGTEXT,
               true )
     set_capability( "sout mux", 5 )
-    add_shortcut( "mp4" )
-    add_shortcut( "mov" )
-    add_shortcut( "3gp" )
+    add_shortcut( "mp4", "mov", "3gp" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 4f840741800da0502c74a0bc6c9d67cf2494bf4e..47f2a40b7c6f6afcaf1367b3e292aff9ef45d5c4 100644 (file)
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -66,9 +66,7 @@ vlc_module_begin ()
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_MUX )
     set_capability( "sout mux", 50 )
-    add_shortcut( "ps" )
-    add_shortcut( "mpeg1" )
-    add_shortcut( "dvd" )
+    add_shortcut( "ps", "mpeg1", "dvd" )
     set_callbacks( Open, Close )
 
     add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 0d36a269ac4d6989fbca26138151707a37c5e8f2..a2de8607e32aba42a985b140998c510cd0833f76 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -52,8 +52,7 @@ vlc_module_begin ()
     set_capability( "sout mux", 10 )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_MUX )
-    add_shortcut( "ogg" )
-    add_shortcut( "ogm" )
+    add_shortcut( "ogg", "ogm" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index fbf7a2ed59585132f5f0a12cf0b28de318b58e6b..6dbed32e35d319f420547a3d9aecfaa02711c066 100644 (file)
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -50,8 +50,7 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
 vlc_module_begin ()
     set_description( N_("Dummy stream output") )
     set_capability( "sout stream", 50 )
-    add_shortcut( "dummy" )
-    add_shortcut( "drop" )
+    add_shortcut( "dummy", "drop" )
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 26cfeffd6e75ff88bc12b53a7d1cb7ad30ca83ad..51cc9ea8c6a79ff8a96b493c3c27d521e3f823ba 100644 (file)
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -43,8 +43,7 @@ static void     Close   ( vlc_object_t * );
 vlc_module_begin ()
     set_description( N_("Duplicate stream output") )
     set_capability( "sout stream", 50 )
-    add_shortcut( "duplicate" )
-    add_shortcut( "dup" )
+    add_shortcut( "duplicate", "dup" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
     set_callbacks( Open, Close )

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 1631033830ebc01809f7b7049199c41a3a43ff5a..33f8b4a29cfe01bdb15dc6cc44aa38c2012e9655 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -100,11 +100,7 @@ vlc_module_begin ()
     set_shortname( N_("Standard"))
     set_description( N_("Standard stream output") )
     set_capability( "sout stream", 50 )
-    add_shortcut( "standard" )
-    add_shortcut( "std" )
-    add_shortcut( "file" )
-    add_shortcut( "http" )
-    add_shortcut( "udp" )
+    add_shortcut( "standard", "std", "file", "http", "udp" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
 

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index c2b11c43aa1e3f4ca5d7642bc52e7df0a15662d6..eb8acf76d851c122dd50d40fc3a7639a1f709ed2 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -65,8 +65,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
     set_capability( "video filter2", 0 )
-    add_shortcut( "alphamask" )
-    add_shortcut( "mask" )
+    add_shortcut( "alphamask", "mask" )
     set_callbacks( Create, Destroy )
 
     add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,

diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index cf31d806381064a409158001d1cfa53ef156b084..db758b82c339c0638d7ccf83c064151639e528a1 100644 (file)
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -74,8 +74,7 @@ static int PPNameCallback( vlc_object_t *, char const *,
 vlc_module_begin ()
     set_description( N_("Video post processing filter") )
     set_shortname( N_("Postproc" ) )
-    add_shortcut( "postprocess" ) /* name is "postproc" */
-    add_shortcut( "pp" )
+    add_shortcut( "postprocess", "pp" ) /* name is "postproc" */
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 30ce5c7bc5db7e5211aac7b5034080ca6af75ecb..fe0c96e2443ed7b967b1f8ca87087fa62d421ca9 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -223,8 +223,7 @@ vlc_module_begin ()
         change_integer_list( pi_title_modes, ppsz_title_modes, NULL )
 
     set_description( N_("RSS and Atom feed display") )
-    add_shortcut( "rss" )
-    add_shortcut( "atom" )
+    add_shortcut( "rss", "atom" )
 vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 0fdcaf41cc0ade3a2b40b24d6675300f27163528..29cde854b132d8022ed92f96ccbdf587c58ba8e5 100644 (file)
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -72,8 +72,7 @@ vlc_module_begin ()
     set_capability("vout display", 300)
     set_callbacks(Open, Close)
 
-    add_shortcut("macosx")
-    add_shortcut("vout_macosx")
+    add_shortcut("macosx", "vout_macosx")
 vlc_module_end ()
 
 /**

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index b5647cfe78283c5e8ac09909a03f7acac50c7634..c6173b8c3176a6cb4940ebb81f2336f4b7eea9f2 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -54,8 +54,7 @@ vlc_module_begin()
     set_shortname("OpenGL")
     set_description(N_("OpenGL video output"))
     set_capability("vout display", 20)
-    add_shortcut("glwin32")
-    add_shortcut("opengl")
+    add_shortcut("glwin32", "opengl")
     set_callbacks(Open, Close)
 vlc_module_end()
 

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 7d148f19320ea16cdda497286f8b6e041acbc7b2..0e88a946a1e64969c5649f92dd5eb08a4d83991c 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -55,9 +55,7 @@ vlc_module_begin ()
     set_capability ("vout display", 50)
     set_callbacks (Open, Close)
 
-    add_shortcut ("xcb-glx")
-    add_shortcut ("glx")
-    add_shortcut ("opengl")
+    add_shortcut ("xcb-glx", "glx", "opengl")
 vlc_module_end ()
 
 struct vout_display_sys_t

diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 2c345b4849c7c9e359fb914c5f225968319d41b2..b64375080bb2cbfd2ad127939cbdf9a20b389569 100644 (file)
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -54,8 +54,7 @@ vlc_module_begin ()
     set_subcategory (SUBCAT_VIDEO_VOUT)
     set_capability ("vout display", 75)
     set_callbacks (Open, Close)
-    add_shortcut ("xcb-x11")
-    add_shortcut ("x11")
+    add_shortcut ("xcb-x11", "x11")
 
     add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
 vlc_module_end ()

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index fbc5a606121000e25e2abd76929f6de6dc1d3f1a..7816bb136cae331a67235ade54acfb948473f3eb 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -66,9 +66,7 @@ vlc_module_begin ()
                  ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true)
     add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
         add_deprecated_alias ("xvideo-shm")
-    add_shortcut ("xcb-xv")
-    add_shortcut ("xv")
-    add_shortcut ("xvideo")
+    add_shortcut ("xcb-xv", "xv", "xvideo")
 vlc_module_end ()
 
 #define MAX_PICTURES (128)