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

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 ()

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)
 

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 ()
 

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 ()

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 ()
 
 

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 ()
 

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 )

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 ()
 

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 ()
 

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 ()

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 ()
 

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 ()
 

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 ()
 
 /*

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 ()
 
 

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 ()
 
 /*

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 */

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 ()
 
 /*****************************************************************************

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()
 

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,

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,