From a9d0016e1b6a110b4b84006a78c669705459410b Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sat, 12 Jun 2010 09:03:25 +0200 Subject: [PATCH] modules: use the new add_shortcut capability (add multiple shortcuts at a time). --- modules/3dnow/memcpy.c | 5 +- modules/access/avio.h | 3 +- modules/access/bd/bd.c | 3 +- modules/access/bda/bda.c | 24 ++-------- modules/access/cdda.c | 3 +- modules/access/dv.c | 4 +- modules/access/dvb/access.c | 18 ++----- modules/access/dvdnav.c | 4 +- modules/access/dvdread.c | 4 +- modules/access/fs.c | 10 ++-- modules/access/http.c | 7 +-- modules/access/mms/mms.c | 6 +-- modules/access/rtp/rtp.c | 6 +-- modules/access/rtsp/access.c | 4 +- modules/access/screen/xcb.c | 3 +- modules/access/v4l2.c | 3 +- modules/access/vcd/vcd.c | 3 +- modules/access/zip/zipstream.c | 3 +- modules/access_output/file.c | 3 +- modules/access_output/http.c | 4 +- modules/audio_output/directx.c | 3 +- modules/audio_output/file.c | 3 +- modules/audio_output/pulse.c | 3 +- modules/demux/cdg.c | 3 +- modules/demux/live555.cpp | 9 +--- modules/demux/mkv/mkv.cpp | 3 +- modules/demux/mpeg/es.c | 22 +++------ modules/demux/playlist/playlist.c | 48 ++++++------------- modules/demux/real.c | 3 +- modules/demux/ty.c | 3 +- modules/demux/vobsub.c | 3 +- .../macosx_dialog_provider/dialogProvider.m | 3 +- modules/gui/minimal_macosx/macosx.c | 6 +-- modules/misc/dummy/dummy.c | 3 +- modules/mmx/memcpy.c | 3 +- modules/mmxext/memcpy.c | 3 +- modules/mux/asf.c | 3 +- modules/mux/dummy.c | 4 +- modules/mux/mp4.c | 4 +- modules/mux/mpeg/ps.c | 4 +- modules/mux/ogg.c | 3 +- modules/stream_out/dummy.c | 3 +- modules/stream_out/duplicate.c | 3 +- modules/stream_out/standard.c | 6 +-- modules/video_filter/alphamask.c | 3 +- modules/video_filter/postproc.c | 3 +- modules/video_filter/rss.c | 3 +- modules/video_output/macosx.m | 3 +- modules/video_output/msw/glwin32.c | 3 +- modules/video_output/xcb/glx.c | 4 +- modules/video_output/xcb/x11.c | 3 +- modules/video_output/xcb/xvideo.c | 4 +- 52 files changed, 86 insertions(+), 211 deletions(-) diff --git a/modules/3dnow/memcpy.c b/modules/3dnow/memcpy.c index 150064576c..37f33e9367 100644 --- 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 7e956d065a..5497d346d5 100644 --- 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 20b78b06f1..ec85e83244 100644 --- 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 5fbe68eafc..24a0d6fa59 100644 --- 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 43b824b8f5..35864476ab 100644 --- 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 82c4b1b5f8..084ef27ed8 100644 --- 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 046570941d..e57fa399e5 100644 --- 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 99b45ebd92..91fffcd10b 100644 --- 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 4eef5d82ed..22919798fd 100644 --- 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 30c855ae86..0380c149c6 100644 --- 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 983fab7dac..90e465b93d 100644 --- 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 94af77b6f5..18f198c422 100644 --- 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 1d2e2721d2..cf848686dc 100644 --- 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 e0bef731ca..52c2b6b4a0 100644 --- 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 0a464e8b0a..1c76412cbc 100644 --- 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 3d56275fc2..452d29e50e 100644 --- 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 97e74547a2..d55ec01606 100644 --- 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 ae6316f9ba..ac3f87cf30 100644 --- 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 c326b79bea..91ae863669 100644 --- 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 f65c714676..6b13455e45 100644 --- 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 23cfe0af5f..9a41a8bd5e 100644 --- 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 3bee0ebd71..32f34384d8 100644 --- 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 c02ffa0958..48d531486d 100644 --- 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 9d9c0454de..c7a3b6ec7a 100644 --- 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 2b2e4a67a1..5e204c8389 100644 --- 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 01906f98d5..b797feb904 100644 --- 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 98fca75132..0103e14125 100644 --- 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 de14c4a441..a8f88e4625 100644 --- 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 7c0d0a910b..9a9cd02ea6 100644 --- 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 9c27d97e0a..a0c826af09 100644 --- 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 8877da4f31..f8283db8d7 100644 --- 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 113f60a845..77b7d3f570 100644 --- 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 d7c95ea408..c3afae0c79 100644 --- 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 3f61dd9ab9..373466c273 100644 --- 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 21ee858971..53ae7ae413 100644 --- 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 4f21a889c0..9e59bf5f2a 100644 --- 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 933bbbafbf..40dc0fd43b 100644 --- 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 51e11adaa2..e1eec70061 100644 --- 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 d5a8614500..27e4e81355 100644 --- 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 4f84074180..47f2a40b7c 100644 --- 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 0d36a269ac..a2de8607e3 100644 --- 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 fbf7a2ed59..6dbed32e35 100644 --- 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 26cfeffd6e..51cc9ea8c6 100644 --- 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 1631033830..33f8b4a29c 100644 --- 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 c2b11c43aa..eb8acf76d8 100644 --- 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 cf31d80638..db758b82c3 100644 --- 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 30ce5c7bc5..fe0c96e244 100644 --- 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 0fdcaf41cc..29cde854b1 100644 --- 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 b5647cfe78..c6173b8c31 100644 --- 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 7d148f1932..0e88a946a1 100644 --- 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 2c345b4849..b64375080b 100644 --- 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 fbc5a60612..7816bb136c 100644 --- 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) -- 2.39.2