Commit a9d0016e authored by Rémi Duraffort's avatar Rémi Duraffort

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

parent 96f372a2
......@@ -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 ()
......
......@@ -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)
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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 )
......
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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 ()
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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 ()
/*
......
......@@ -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 ()
......
......@@ -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 ()
/*
......
......@@ -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 */
......
......@@ -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 ()
/*****************************************************************************
......
......@@ -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()
......
......@@ -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,
......
......@@ -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,
......
......@@ -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 )
......
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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 ()
/*****************************************************************************
......
......@@ -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,
......
......@@ -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;
......
......@@ -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" ) )
......
......@@ -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 ()
......
......@@ -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 ()
/*****************************************************************************
......
......@@ -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 ()
/*****************************************************************************
......
......@@ -56,8 +56,7 @@ vlc_module_begin ()
set_callbacks( Open, Close )
add_shortcut( "vobsub" )
add_shortcut( "subtitle" )
add_shortcut( "vobsub", "subtitle" )
vlc_module_end ()
/*****************************************************************************
......
......@@ -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)
......
......@@ -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)
......
......@@ -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 )
......
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -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,
......
......@@ -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 ()
......
......@@ -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 ()
......
......@@ -66,9 +66,7 @@ vlc_module_begin ()