From: Rémi Denis-Courmont Date: Tue, 27 Jan 2009 21:22:05 +0000 (+0200) Subject: Trailing ; X-Git-Tag: 1.0.0-pre1~993 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;p=vlc Trailing ; --- diff --git a/modules/access/alsa.c b/modules/access/alsa.c index 670fedd8c5..ec3ef0c9ac 100644 --- a/modules/access/alsa.c +++ b/modules/access/alsa.c @@ -83,23 +83,23 @@ static void DemuxClose( vlc_object_t * ); #define ALSA_DEFAULT "hw" #define CFG_PREFIX "alsa-" -vlc_module_begin(); - set_shortname( N_("Alsa") ); - set_description( N_("Alsa audio capture input") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin() + set_shortname( N_("Alsa") ) + set_description( N_("Alsa audio capture input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) - add_shortcut( "alsa" ); - set_capability( "access_demux", 10 ); - set_callbacks( DemuxOpen, DemuxClose ); + add_shortcut( "alsa" ) + set_capability( "access_demux", 10 ) + set_callbacks( DemuxOpen, DemuxClose ) add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT, - true ); + true ) add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT, - SAMPLERATE_LONGTEXT, true ); + SAMPLERATE_LONGTEXT, true ) add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); -vlc_module_end(); + CACHING_TEXT, CACHING_LONGTEXT, true ) +vlc_module_end() /***************************************************************************** * Access: local prototypes diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c index 2c0319d996..e2b4923e72 100644 --- a/modules/access/bd/bd.c +++ b/modules/access/bd/bd.c @@ -63,7 +63,7 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "bd-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) set_capability( "access_demux", 60 ) add_shortcut( "bd" ) set_callbacks( Open, Close ) diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c index 7fb6ff1094..7c5fa97b6e 100644 --- a/modules/access/bda/bda.c +++ b/modules/access/bda/bda.c @@ -190,96 +190,96 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT, - false ); + false ) # if defined(WIN32) || defined(WINCE) add_string( "dvb-network-name", NULL, NULL, NAME_TEXT, NAME_LONGTEXT, - true ); + true ) add_string( "dvb-create-name", NULL, NULL, CREATE_TEXT, - CREATE_LONGTEXT, true ); + CREATE_LONGTEXT, true ) add_integer( "dvb-adapter", -1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, - true ); + true ) # else /* dvb-device refers to a frontend within an adapter */ add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - true ); - add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ); + true ) + add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ) add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, - true ); + true ) # endif /* DVB-S (satellite) */ add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, - INVERSION_LONGTEXT, true ); + INVERSION_LONGTEXT, true ) change_integer_list( i_inversion_list, ppsz_inversion_text, NULL ); # if defined(WIN32) || defined(WINCE) add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT, - POLARISATION_LONGTEXT, false ); + POLARISATION_LONGTEXT, false ) change_string_list( ppsz_polar_list, ppsz_polar_text, 0 ); /* Note: Polaristion H = voltage 18; V = voltage 13; */ add_integer( "dvb-network-id", 0, NULL, NETID_TEXT, NETID_LONGTEXT, - true ); + true ) add_integer( "dvb-azimuth", 0, NULL, AZIMUTH_TEXT, AZIMUTH_LONGTEXT, - true ); + true ) add_integer( "dvb-elevation", 0, NULL, ELEVATION_TEXT, - ELEVATION_LONGTEXT, true ); + ELEVATION_LONGTEXT, true ) add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT, - LONGITUDE_LONGTEXT, true ); + LONGITUDE_LONGTEXT, true ) add_string( "dvb-range", NULL, NULL, RANGE_TEXT, - RANGE_LONGTEXT, true ); + RANGE_LONGTEXT, true ) /* dvb-range corresponds to the BDA InputRange parameter which is * used by some drivers to control the diseqc */ # else add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT, - true ); + true ) add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT, - true ); + true ) add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT, - HIGH_VOLTAGE_LONGTEXT, true ); + HIGH_VOLTAGE_LONGTEXT, true ) add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT, - true ); - add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ); + true ) + add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ) # endif add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT, - LNB_LOF1_LONGTEXT, true ); + LNB_LOF1_LONGTEXT, true ) add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT, - LNB_LOF2_LONGTEXT, true ); + LNB_LOF2_LONGTEXT, true ) add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT, - LNB_SLOF_LONGTEXT, true ); + LNB_SLOF_LONGTEXT, true ) add_integer( "dvb-srate", 27500, NULL, SRATE_TEXT, SRATE_LONGTEXT, - false ); + false ) /* DVB-C (cable) */ add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT, - MODULATION_LONGTEXT, true ); + MODULATION_LONGTEXT, true ) change_integer_list( i_mod_list, ppsz_mod_text, NULL ); /* ATSC */ add_integer( "dvb-major-channel", 0, NULL, MAJOR_CHANNEL_TEXT, - MAJOR_CHANNEL_LONGTEXT, true ); + MAJOR_CHANNEL_LONGTEXT, true ) add_integer( "dvb-minor-channel", 0, NULL, MINOR_CHANNEL_TEXT, - MINOR_CHANNEL_LONGTEXT, true ); + MINOR_CHANNEL_LONGTEXT, true ) add_integer( "dvb-physical-channel", 0, NULL, PHYSICAL_CHANNEL_TEXT, - PHYSICAL_CHANNEL_LONGTEXT, true ); + PHYSICAL_CHANNEL_LONGTEXT, true ) /* DVB-T (terrestrial) */ add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT, - CODE_RATE_HP_LONGTEXT, true ); + CODE_RATE_HP_LONGTEXT, true ) change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, NULL ); add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT, - CODE_RATE_LP_LONGTEXT, true ); + CODE_RATE_LP_LONGTEXT, true ) change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, NULL ); add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, - false ); + false ) change_integer_list( i_band_list, ppsz_band_text, NULL ); add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ) change_integer_list( i_guard_list, ppsz_guard_text, NULL ); add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT, - TRANSMISSION_LONGTEXT, true ); + TRANSMISSION_LONGTEXT, true ) change_integer_list( i_transmission_list, ppsz_transmission_text, NULL ); add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, - true ); + true ) change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL ); set_capability( "access", 0 ) diff --git a/modules/access/cdda.c b/modules/access/cdda.c index a6357bf912..6748651883 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -75,7 +75,7 @@ vlc_module_begin () add_usage_hint( N_("[cdda:][device][@[track]]") ) add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) add_integer( "cdda-track", -1 , NULL, NULL, NULL, true ) change_internal () @@ -86,10 +86,10 @@ vlc_module_begin () add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), - true ); + true ) add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ), N_( "CDDB Server port to use." ), - true ); + true ) add_shortcut( "cdda" ) add_shortcut( "cddasimple" ) vlc_module_end () diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index c16272ad20..63c59facab 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -123,34 +123,34 @@ vlc_module_begin () /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB, N_("Additional debug"), - DEBUG_LONGTEXT, true ); + DEBUG_LONGTEXT, true ) add_integer( MODULE_STRING "-caching", DEFAULT_PTS_DELAY / MILLISECONDS_PER_SEC, NULL, N_("Caching value in microseconds"), - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) add_integer( MODULE_STRING "-blocks-per-read", DEFAULT_BLOCKS_PER_READ, CDDABlocksPerReadCB, N_("Number of blocks per CD read"), - BLOCKS_PER_READ_LONGTEXT, true ); + BLOCKS_PER_READ_LONGTEXT, true ) add_string( MODULE_STRING "-title-format", "Track %T. %t", NULL, N_("Format to use in playlist \"title\" field when no CDDB"), - TITLE_FMT_LONGTEXT, true ); + TITLE_FMT_LONGTEXT, true ) #if LIBCDIO_VERSION_NUM >= 73 add_bool( MODULE_STRING "-analog-output", false, NULL, N_("Use CD audio controls and output?"), N_("If set, audio controls and audio jack output are used"), - false ); + false ) #endif add_bool( MODULE_STRING "-cdtext-enabled", true, CDTextEnabledCB, N_("Do CD-Text lookups?"), N_("If set, get CD-Text information"), - false ); + false ) add_bool( MODULE_STRING "-navigation-mode", true, #if FIXED @@ -161,13 +161,13 @@ vlc_module_begin () N_("Use Navigation-style playback?"), N_("Tracks are navigated via Navagation rather than " "a playlist entries"), - false ); + false ) #if LIBCDIO_VERSION_NUM >= 72 add_string( MODULE_STRING "-paranoia", NULL, NULL, PARANOIA_TEXT, PARANOIA_LONGTEXT, - false ); + false ) change_string_list( psz_paranoia_list, psz_paranoia_list_text, 0 ); #endif /* LIBCDIO_VERSION_NUM >= 72 */ @@ -176,56 +176,56 @@ vlc_module_begin () add_string( MODULE_STRING "-cddb-title-format", "Track %T. %t - %p %A", NULL, N_("Format to use in playlist \"title\" field when using CDDB"), - CDDB_TITLE_FMT_LONGTEXT, true ); + CDDB_TITLE_FMT_LONGTEXT, true ) add_bool( MODULE_STRING "-cddb-enabled", true, CDDBEnabledCB, N_("CDDB lookups"), N_("If set, lookup CD-DA track information using the CDDB " "protocol"), - false ); + false ) add_string( MODULE_STRING "-cddb-server", "freedb.freedb.org", NULL, N_("CDDB server"), N_( "Contact this CDDB server look up CD-DA information"), - true ); + true ) add_integer( MODULE_STRING "-cddb-port", 8880, NULL, N_("CDDB server port"), N_("CDDB server uses this port number to communicate on"), - true ); + true ) add_string( MODULE_STRING "-cddb-email", "me@home", NULL, N_("email address reported to CDDB server"), N_("email address reported to CDDB server"), - true ); + true ) add_bool( MODULE_STRING "-cddb-enable-cache", true, NULL, N_("Cache CDDB lookups?"), N_("If set cache CDDB information about this CD"), - false ); + false ) add_bool( MODULE_STRING "-cddb-httpd", false, NULL, N_("Contact CDDB via the HTTP protocol?"), N_("If set, the CDDB server gets information via the CDDB HTTP " "protocol"), - true ); + true ) add_integer( MODULE_STRING "-cddb-timeout", 10, NULL, N_("CDDB server timeout"), N_("Time (in seconds) to wait for a response from the " "CDDB server"), - false ); + false ) add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL, N_("Directory to cache CDDB requests"), N_("Directory to cache CDDB requests"), - true ); + true ) add_bool( MODULE_STRING "-cdtext-prefer", true, CDTextPreferCB, N_("Prefer CD-Text info to CDDB info?"), N_("If set, CD-Text information will be preferred " "to CDDB information when both are available"), - false ); + false ) #endif /*HAVE_LIBCDDB*/ vlc_module_end () diff --git a/modules/access/directory.c b/modules/access/directory.c index c5f5ecc3dc..379c1a1475 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -88,10 +88,10 @@ vlc_module_begin () add_shortcut( "dir" ) add_shortcut( "file" ) add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT, - RECURSIVE_LONGTEXT, false ); - change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); + RECURSIVE_LONGTEXT, false ) + change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ) add_string( "ignore-filetypes", "m3u,db,nfo,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 ); + NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 4f90d0512b..2ae738d20f 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -203,16 +203,16 @@ vlc_module_begin () add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, false) add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, - true ); + true ) add_bool( "dshow-config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, - true ); + true ) add_bool( "dshow-tuner", false, NULL, TUNER_TEXT, TUNER_LONGTEXT, - true ); + true ) add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT, true ); diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c index f76cc829e2..08b9e644f2 100644 --- a/modules/access/dvb/access.c +++ b/modules/access/dvb/access.c @@ -196,70 +196,70 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, - false ); + false ) add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - true ); + true ) add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT, - false ); + false ) add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT, - true ); + true ) add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true ) add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, - true ); + true ) /* DVB-S (satellite) */ add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT, - true ); + true ) add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT, - true ); + true ) add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT, - HIGH_VOLTAGE_LONGTEXT, true ); + HIGH_VOLTAGE_LONGTEXT, true ) add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT, - true ); + true ) add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true ) add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, - false ); + false ) add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT, - LNB_LOF1_LONGTEXT, true ); + LNB_LOF1_LONGTEXT, true ) add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT, - LNB_LOF2_LONGTEXT, true ); + LNB_LOF2_LONGTEXT, true ) add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT, - LNB_SLOF_LONGTEXT, true ); + LNB_SLOF_LONGTEXT, true ) /* DVB-C (cable) */ add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT, - MODULATION_LONGTEXT, true ); + MODULATION_LONGTEXT, true ) /* DVB-T (terrestrial) */ add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, - CODE_RATE_HP_LONGTEXT, true ); + CODE_RATE_HP_LONGTEXT, true ) add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, - CODE_RATE_LP_LONGTEXT, true ); + CODE_RATE_LP_LONGTEXT, true ) add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, - true ); + true ) add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true ) add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT, - TRANSMISSION_LONGTEXT, true ); + TRANSMISSION_LONGTEXT, true ) add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, - true ); + true ) #ifdef ENABLE_HTTPD /* MMI HTTP interface */ set_section( N_("HTTP server" ), 0 ) add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, - true ); + true ) add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, - true ); + true ) add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT, - PASSWORD_LONGTEXT, true ); + PASSWORD_LONGTEXT, true ) add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT, - true ); + true ) add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, - true ); + true ) add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, - true ); + true ) add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, - true ); + true ) add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, - true ); + true ) #endif set_capability( "access", 0 ) diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 568bb5b5ac..8a67a83510 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -89,15 +89,15 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT, - ANGLE_LONGTEXT, false ); + ANGLE_LONGTEXT, false ) add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_bool( "dvdnav-menu", true, NULL, - MENU_TEXT, MENU_LONGTEXT, false ); + MENU_TEXT, MENU_LONGTEXT, false ) set_capability( "access_demux", 5 ) add_shortcut( "dvd" ) add_shortcut( "dvdnav" ) - add_shortcut( "file" ); + add_shortcut( "file" ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 5c241559dd..9575c89ef3 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -107,12 +107,12 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT, - ANGLE_LONGTEXT, false ); + ANGLE_LONGTEXT, false ) add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT, - CSSMETHOD_LONGTEXT, true ); - change_string_list( psz_css_list, psz_css_list_text, 0 ); + CSSMETHOD_LONGTEXT, true ) + change_string_list( psz_css_list, psz_css_list_text, 0 ) set_capability( "access_demux", 0 ) add_shortcut( "dvd" ) add_shortcut( "dvdread" ) diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m index 34322fd0c0..b835ce1f8f 100644 --- a/modules/access/eyetv.m +++ b/modules/access/eyetv.m @@ -70,7 +70,7 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "eyetv-channel", 0, NULL, - CHANNEL_TEXT, CHANNEL_LONGTEXT, false ); + CHANNEL_TEXT, CHANNEL_LONGTEXT, false ) set_capability( "access", 0 ) add_shortcut( "eyetv" ) diff --git a/modules/access/fake.c b/modules/access/fake.c index 6c5fe1682e..0cd8b09c1e 100644 --- a/modules/access/fake.c +++ b/modules/access/fake.c @@ -66,11 +66,11 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "fake-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_float( "fake-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) add_integer( "fake-id", 0, NULL, ID_TEXT, ID_LONGTEXT, true ) add_integer( "fake-duration", -1, NULL, DURATION_TEXT, DURATION_LONGTEXT, - true ); + true ) add_shortcut( "fake" ) set_capability( "access_demux", 10 ) diff --git a/modules/access/http.c b/modules/access/http.c index c446ecb088..dec0de8022 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -103,19 +103,19 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, - false ); + false ) add_password( "http-proxy-pwd", NULL, NULL, - PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ); + PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ) add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_string( "http-user-agent", COPYRIGHT_MESSAGE , NULL, AGENT_TEXT, - AGENT_LONGTEXT, true ); + AGENT_LONGTEXT, true ) add_bool( "http-reconnect", 0, NULL, RECONNECT_TEXT, - RECONNECT_LONGTEXT, true ); + RECONNECT_LONGTEXT, true ) add_bool( "http-continuous", 0, NULL, CONTINUOUS_TEXT, - CONTINUOUS_LONGTEXT, true ); + CONTINUOUS_LONGTEXT, true ) add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT, - FORWARD_COOKIES_LONGTEXT, true ); + FORWARD_COOKIES_LONGTEXT, true ) add_obsolete_string("http-user") add_obsolete_string("http-pwd") add_shortcut( "http" ) diff --git a/modules/access/jack.c b/modules/access/jack.c index 9809333d07..8e05040d4a 100644 --- a/modules/access/jack.c +++ b/modules/access/jack.c @@ -78,11 +78,11 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_bool( "jack-input-use-vlc-pace", false, NULL, - PACE_TEXT, PACE_LONGTEXT, true ); + PACE_TEXT, PACE_LONGTEXT, true ) add_bool( "jack-input-auto-connect", false, NULL, - AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true ); + AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true ) add_shortcut( "jack" ) set_callbacks( Open, Close ) diff --git a/modules/access/mmap.c b/modules/access/mmap.c index ec79919838..384129f005 100644 --- a/modules/access/mmap.c +++ b/modules/access/mmap.c @@ -59,7 +59,7 @@ vlc_module_begin () add_shortcut ("file") set_callbacks (Open, Close) add_bool ("file-mmap", false, NULL, - FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true); + FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true) vlc_module_end () static block_t *Block (access_t *); diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c index efc2be1523..6af74bbae7 100644 --- a/modules/access/mms/mms.c +++ b/modules/access/mms/mms.c @@ -77,16 +77,16 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "mms-caching", 19 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_integer( "mms-timeout", 5000, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, - true ); + true ) add_bool( "mms-all", 0, NULL, ALL_TEXT, ALL_LONGTEXT, true ) add_integer( "mms-maxbitrate", 0, NULL, BITRATE_TEXT, BITRATE_LONGTEXT , - false ); + false ) add_string( "mmsh-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, - false ); + false ) add_shortcut( "mms" ) add_shortcut( "mmsu" ) diff --git a/modules/access/oss.c b/modules/access/oss.c index 7d584faa0a..61999f0dc7 100644 --- a/modules/access/oss.c +++ b/modules/access/oss.c @@ -84,11 +84,11 @@ vlc_module_begin () set_callbacks( DemuxOpen, DemuxClose ) add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT, - true ); + true ) add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT, - SAMPLERATE_LONGTEXT, true ); + SAMPLERATE_LONGTEXT, true ) add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) vlc_module_end () /***************************************************************************** diff --git a/modules/access/pvr.c b/modules/access/pvr.c index 9ce4500ebc..7b8ca94817 100644 --- a/modules/access/pvr.c +++ b/modules/access/pvr.c @@ -133,36 +133,36 @@ vlc_module_begin () add_shortcut( "pvr" ) add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) add_string( "pvr-device", "/dev/video0", NULL, DEVICE_TEXT, - DEVICE_LONGTEXT, false ); + DEVICE_LONGTEXT, false ) add_string( "pvr-radio-device", "/dev/radio0", NULL, RADIO_DEVICE_TEXT, - RADIO_DEVICE_LONGTEXT, false ); + RADIO_DEVICE_LONGTEXT, false ) add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT, - NORM_LONGTEXT, false ); - change_integer_list( i_norm_list, psz_norm_list_text, NULL ); + NORM_LONGTEXT, false ) + change_integer_list( i_norm_list, psz_norm_list_text, NULL ) add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ) add_integer( "pvr-height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, - true ); + true ) add_integer( "pvr-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT, - false ); + false ) add_integer( "pvr-framerate", -1, NULL, FRAMERATE_TEXT, FRAMERATE_LONGTEXT, - true ); + true ) add_integer( "pvr-keyint", -1, NULL, KEYINT_TEXT, KEYINT_LONGTEXT, - true ); + true ) add_integer( "pvr-bframes", -1, NULL, FRAMERATE_TEXT, FRAMERATE_LONGTEXT, - true ); + true ) add_integer( "pvr-bitrate", -1, NULL, BITRATE_TEXT, BITRATE_LONGTEXT, - false ); + false ) add_integer( "pvr-bitrate-peak", -1, NULL, BITRATE_PEAK_TEXT, - BITRATE_PEAK_LONGTEXT, true ); + BITRATE_PEAK_LONGTEXT, true ) add_integer( "pvr-bitrate-mode", -1, NULL, BITRATE_MODE_TEXT, - BITRATE_MODE_LONGTEXT, true ); - change_integer_list( i_bitrates, psz_bitrates_list_text, NULL ); + BITRATE_MODE_LONGTEXT, true ) + change_integer_list( i_bitrates, psz_bitrates_list_text, NULL ) add_integer( "pvr-audio-bitmask", -1, NULL, BITMASK_TEXT, - BITMASK_LONGTEXT, true ); + BITMASK_LONGTEXT, true ) add_integer( "pvr-audio-volume", -1, NULL, VOLUME_TEXT, - VOLUME_LONGTEXT, true ); + VOLUME_LONGTEXT, true ) add_integer( "pvr-channel", -1, NULL, CHAN_TEXT, CHAN_LONGTEXT, true ) set_callbacks( Open, Close ) diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c index 86d758f0b9..57e9238dd9 100644 --- a/modules/access/rtmp/access.c +++ b/modules/access/rtmp/access.c @@ -55,7 +55,7 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "rtmp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) set_capability( "access", 0 ) set_callbacks( Open, Close ) diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c index dcb3b1f3a5..94232b24d7 100644 --- a/modules/access/rtsp/access.c +++ b/modules/access/rtsp/access.c @@ -54,7 +54,7 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "realrtsp-caching", 3000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) set_capability( "access", 10 ) set_callbacks( Open, Close ) add_shortcut( "realrtsp" ) diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c index 560a15285f..27626025bd 100644 --- a/modules/access/screen/screen.c +++ b/modules/access/screen/screen.c @@ -97,7 +97,7 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_float( "screen-fps", SCREEN_FPS, 0, FPS_TEXT, FPS_LONGTEXT, true ) #ifdef SCREEN_SUBSCREEN @@ -106,17 +106,17 @@ vlc_module_begin () add_integer( "screen-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ) add_integer( "screen-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ) add_bool( "screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT, - FOLLOW_MOUSE_LONGTEXT, true ); + FOLLOW_MOUSE_LONGTEXT, true ) #endif #ifdef SCREEN_MOUSE add_file( "screen-mouse-image", "", NULL, MOUSE_TEXT, MOUSE_LONGTEXT, - true ); + true ) #endif #ifdef WIN32 add_integer( "screen-fragment-size", 0, NULL, FRAGS_TEXT, - FRAGS_LONGTEXT, true ); + FRAGS_LONGTEXT, true ) #endif set_capability( "access_demux", 0 ) diff --git a/modules/access/smb.c b/modules/access/smb.c index 7e868228ac..93bea746c3 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -82,13 +82,13 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, - false ); + false ) add_string( "smb-pwd", NULL, NULL, PASS_TEXT, - PASS_LONGTEXT, false ); + PASS_LONGTEXT, false ) add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT, - DOMAIN_LONGTEXT, false ); + DOMAIN_LONGTEXT, false ) add_shortcut( "smb" ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/access/tcp.c b/modules/access/tcp.c index 0b26c45a89..95b049c121 100644 --- a/modules/access/tcp.c +++ b/modules/access/tcp.c @@ -53,7 +53,7 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) set_capability( "access", 0 ) add_shortcut( "tcp" ) diff --git a/modules/access/udp.c b/modules/access/udp.c index ac84535f06..b658cf5ded 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -61,7 +61,7 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) add_obsolete_integer( "rtp-late" ) add_obsolete_bool( "udp-auto-mtu" ) diff --git a/modules/access/v4l.c b/modules/access/v4l.c index f3b62a5552..042ca8f688 100644 --- a/modules/access/v4l.c +++ b/modules/access/v4l.c @@ -146,39 +146,39 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_obsolete_string( "v4l-vdev" ); add_obsolete_string( "v4l-adev" ); add_string( "v4l-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) add_obsolete_integer( "v4l-samplerate" ); add_integer( "v4l-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT, - true ); + true ) add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, true ) add_integer( "v4l-norm", VIDEO_MODE_AUTO, NULL, NORM_TEXT, NORM_LONGTEXT, - false ); + false ) change_integer_list( i_norm_list, psz_norm_list_text, NULL ); add_integer( "v4l-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT, - false ); + false ) add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, true ) add_obsolete_bool( "v4l-stereo" ); add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true ) add_integer( "v4l-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, - true ); + true ) add_integer( "v4l-brightness", -1, NULL, BRIGHTNESS_TEXT, - BRIGHTNESS_LONGTEXT, true ); + BRIGHTNESS_LONGTEXT, true ) add_integer( "v4l-colour", -1, NULL, COLOUR_TEXT, COLOUR_LONGTEXT, - true ); + true ) add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, true ) add_integer( "v4l-contrast", -1, NULL, CONTRAST_TEXT, CONTRAST_LONGTEXT, - true ); + true ) add_bool( "v4l-mjpeg", false, NULL, MJPEG_TEXT, MJPEG_LONGTEXT, - true ); + true ) add_integer( "v4l-decimation", 1, NULL, DECIMATION_TEXT, - DECIMATION_LONGTEXT, true ); + DECIMATION_LONGTEXT, true ) add_integer( "v4l-quality", 100, NULL, QUALITY_TEXT, QUALITY_LONGTEXT, - true ); + true ) add_shortcut( "v4l" ) set_capability( "access_demux", 10 ) diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c index d488b804f2..f1f49903a5 100644 --- a/modules/access/v4l2.c +++ b/modules/access/v4l2.c @@ -243,94 +243,94 @@ vlc_module_begin () set_section( N_( "Video input" ), NULL ) add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT, - STANDARD_LONGTEXT, false ); - change_integer_list( i_standards_list, psz_standards_list_text, NULL ); + STANDARD_LONGTEXT, false ) + change_integer_list( i_standards_list, psz_standards_list_text, NULL ) add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT, - true ); + true ) add_integer( CFG_PREFIX "audio-input", 0, NULL, AUDIO_INPUT_TEXT, - AUDIO_INPUT_LONGTEXT, true ); + AUDIO_INPUT_LONGTEXT, true ) add_integer( CFG_PREFIX "io", IO_METHOD_MMAP, NULL, IOMETHOD_TEXT, - IOMETHOD_LONGTEXT, true ); - change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL ); + IOMETHOD_LONGTEXT, true ) + change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL ) add_integer( CFG_PREFIX "width", -1, NULL, WIDTH_TEXT, - WIDTH_LONGTEXT, true ); + WIDTH_LONGTEXT, true ) add_integer( CFG_PREFIX "height", -1, NULL, HEIGHT_TEXT, - HEIGHT_LONGTEXT, true ); + HEIGHT_LONGTEXT, true ) add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true ) add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) set_section( N_( "Tuner" ), NULL ) add_integer( CFG_PREFIX "tuner", 0, NULL, TUNER_TEXT, TUNER_LONGTEXT, - true ); + true ) add_integer( CFG_PREFIX "tuner-frequency", -1, NULL, FREQUENCY_TEXT, - FREQUENCY_LONGTEXT, true ); + FREQUENCY_LONGTEXT, true ) add_integer( CFG_PREFIX "tuner-audio-mode", -1, NULL, TUNER_AUDIO_MODE_TEXT, - TUNER_AUDIO_MODE_LONGTEXT, true ); + TUNER_AUDIO_MODE_LONGTEXT, true ) change_integer_list( i_tuner_audio_modes_list, - psz_tuner_audio_modes_list_text, 0 ); + psz_tuner_audio_modes_list_text, 0 ) set_section( N_( "Controls" ), - N_( "v4l2 driver controls, if supported by your v4l2 driver." ) ); + N_( "v4l2 driver controls, if supported by your v4l2 driver." ) ) add_bool( CFG_PREFIX "controls-reset", false, NULL, CTRL_RESET_TEXT, - CTRL_RESET_LONGTEXT, true ); + CTRL_RESET_LONGTEXT, true ) add_integer( CFG_PREFIX "brightness", -1, NULL, BRIGHTNESS_TEXT, - BRIGHTNESS_LONGTEXT, true ); + BRIGHTNESS_LONGTEXT, true ) add_integer( CFG_PREFIX "contrast", -1, NULL, CONTRAST_TEXT, - CONTRAST_LONGTEXT, true ); + CONTRAST_LONGTEXT, true ) add_integer( CFG_PREFIX "saturation", -1, NULL, SATURATION_TEXT, - SATURATION_LONGTEXT, true ); + SATURATION_LONGTEXT, true ) add_integer( CFG_PREFIX "hue", -1, NULL, HUE_TEXT, - HUE_LONGTEXT, true ); + HUE_LONGTEXT, true ) add_integer( CFG_PREFIX "black-level", -1, NULL, BLACKLEVEL_TEXT, - BLACKLEVEL_LONGTEXT, true ); + BLACKLEVEL_LONGTEXT, true ) add_integer( CFG_PREFIX "auto-white-balance", -1, NULL, - AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true ); + AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true ) add_integer( CFG_PREFIX "do-white-balance", -1, NULL, DOWHITEBALANCE_TEXT, - DOWHITEBALANCE_LONGTEXT, true ); + DOWHITEBALANCE_LONGTEXT, true ) add_integer( CFG_PREFIX "red-balance", -1, NULL, REDBALANCE_TEXT, - REDBALANCE_LONGTEXT, true ); + REDBALANCE_LONGTEXT, true ) add_integer( CFG_PREFIX "blue-balance", -1, NULL, BLUEBALANCE_TEXT, - BLUEBALANCE_LONGTEXT, true ); + BLUEBALANCE_LONGTEXT, true ) add_integer( CFG_PREFIX "gamma", -1, NULL, GAMMA_TEXT, - GAMMA_LONGTEXT, true ); + GAMMA_LONGTEXT, true ) add_integer( CFG_PREFIX "exposure", -1, NULL, EXPOSURE_TEXT, - EXPOSURE_LONGTEXT, true ); + EXPOSURE_LONGTEXT, true ) add_integer( CFG_PREFIX "autogain", -1, NULL, AUTOGAIN_TEXT, - AUTOGAIN_LONGTEXT, true ); + AUTOGAIN_LONGTEXT, true ) add_integer( CFG_PREFIX "gain", -1, NULL, GAIN_TEXT, - GAIN_LONGTEXT, true ); + GAIN_LONGTEXT, true ) add_integer( CFG_PREFIX "hflip", -1, NULL, HFLIP_TEXT, - HFLIP_LONGTEXT, true ); + HFLIP_LONGTEXT, true ) add_integer( CFG_PREFIX "vflip", -1, NULL, VFLIP_TEXT, - VFLIP_LONGTEXT, true ); + VFLIP_LONGTEXT, true ) add_integer( CFG_PREFIX "hcenter", -1, NULL, HCENTER_TEXT, - HCENTER_LONGTEXT, true ); + HCENTER_LONGTEXT, true ) add_integer( CFG_PREFIX "vcenter", -1, NULL, VCENTER_TEXT, - VCENTER_LONGTEXT, true ); + VCENTER_LONGTEXT, true ) add_integer( CFG_PREFIX "audio-volume", -1, NULL, AUDIO_VOLUME_TEXT, - AUDIO_VOLUME_LONGTEXT, true ); + AUDIO_VOLUME_LONGTEXT, true ) add_integer( CFG_PREFIX "audio-balance", -1, NULL, AUDIO_BALANCE_TEXT, - AUDIO_BALANCE_LONGTEXT, true ); + AUDIO_BALANCE_LONGTEXT, true ) add_bool( CFG_PREFIX "audio-mute", false, NULL, AUDIO_MUTE_TEXT, - AUDIO_MUTE_LONGTEXT, true ); + AUDIO_MUTE_LONGTEXT, true ) add_integer( CFG_PREFIX "audio-bass", -1, NULL, AUDIO_BASS_TEXT, - AUDIO_BASS_LONGTEXT, true ); + AUDIO_BASS_LONGTEXT, true ) add_integer( CFG_PREFIX "audio-treble", -1, NULL, AUDIO_TREBLE_TEXT, - AUDIO_TREBLE_LONGTEXT, true ); + AUDIO_TREBLE_LONGTEXT, true ) add_integer( CFG_PREFIX "audio-loudness", -1, NULL, AUDIO_LOUDNESS_TEXT, - AUDIO_LOUDNESS_LONGTEXT, true ); + AUDIO_LOUDNESS_LONGTEXT, true ) add_string( CFG_PREFIX "set-ctrls", NULL, NULL, S_CTRLS_TEXT, - S_CTRLS_LONGTEXT, true ); + S_CTRLS_LONGTEXT, true ) - add_obsolete_string( CFG_PREFIX "dev" ); + add_obsolete_string( CFG_PREFIX "dev" ) - add_obsolete_string( CFG_PREFIX "adev" ); - add_obsolete_integer( CFG_PREFIX "audio-method" ); - add_obsolete_bool( CFG_PREFIX "stereo" ); - add_obsolete_integer( CFG_PREFIX "samplerate" ); + add_obsolete_string( CFG_PREFIX "adev" ) + add_obsolete_integer( CFG_PREFIX "audio-method" ) + add_obsolete_bool( CFG_PREFIX "stereo" ) + add_obsolete_integer( CFG_PREFIX "samplerate" ) add_shortcut( "v4l2" ) set_capability( "access_demux", 10 ) diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c index 14ce395b04..4747221462 100644 --- a/modules/access/vcd/vcd.c +++ b/modules/access/vcd/vcd.c @@ -58,7 +58,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 ); + CACHING_LONGTEXT, true ) add_shortcut( "vcd" ) add_shortcut( "svcd" ) vlc_module_end () diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c index 93bf8ec6cc..9e632344d7 100644 --- a/modules/access/vcdx/vcd.c +++ b/modules/access/vcdx/vcd.c @@ -110,44 +110,44 @@ vlc_module_begin () /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, NULL, N_("If nonzero, this gives additional debug information."), - DEBUG_LONGTEXT, true ); + DEBUG_LONGTEXT, true ) add_integer ( MODULE_STRING "-blocks-per-read", 20, NULL, N_("Number of CD blocks to get in a single read."), N_("Number of CD blocks to get in a single read."), - true ); + true ) add_bool( MODULE_STRING "-PBC", 0, NULL, N_("Use playback control?"), N_("If VCD is authored with playback control, use it. " "Otherwise we play by tracks."), - false ); + false ) add_bool( MODULE_STRING "-track-length", true, NULL, N_("Use track length as maximum unit in seek?"), N_("If set, the length of the seek bar is the track rather than " "the length of an entry."), - false ); + false ) add_bool( MODULE_STRING "-extended-info", 0, NULL, N_("Show extended VCD info?"), N_("Show the maximum amount of information under Stream and " "Media Info. Shows for example playback control navigation."), - false ); + false ) add_string( MODULE_STRING "-author-format", "%v - %F disc %c of %C", NULL, N_("Format to use in the playlist's \"author\" field."), - VCD_TITLE_FMT_LONGTEXT, true ); + VCD_TITLE_FMT_LONGTEXT, true ) add_string( MODULE_STRING "-title-format", "%I %N %L%S - %M %A %v - disc %c of %C %F", NULL, N_("Format to use in the playlist's \"title\" field."), - VCD_TITLE_FMT_LONGTEXT, false ); + VCD_TITLE_FMT_LONGTEXT, false ) vlc_module_end () diff --git a/modules/access_output/file.c b/modules/access_output/file.c index 83ded48963..4d137b524b 100644 --- a/modules/access_output/file.c +++ b/modules/access_output/file.c @@ -74,7 +74,7 @@ vlc_module_begin () add_shortcut( "file" ) add_shortcut( "stream" ) add_bool( SOUT_CFG_PREFIX "append", 0, NULL, APPEND_TEXT,APPEND_LONGTEXT, - true ); + true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/access_output/http.c b/modules/access_output/http.c index a1be5f6086..6e713e5018 100644 --- a/modules/access_output/http.c +++ b/modules/access_output/http.c @@ -101,19 +101,19 @@ vlc_module_begin () set_category( CAT_SOUT ) set_subcategory( SUBCAT_SOUT_ACO ) add_string( SOUT_CFG_PREFIX "user", "", NULL, - USER_TEXT, USER_LONGTEXT, true ); + USER_TEXT, USER_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "pwd", "", NULL, - PASS_TEXT, PASS_LONGTEXT, true ); + PASS_TEXT, PASS_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "mime", "", NULL, - MIME_TEXT, MIME_LONGTEXT, true ); + MIME_TEXT, MIME_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL, - CERT_TEXT, CERT_LONGTEXT, true ); + CERT_TEXT, CERT_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "key", NULL, NULL, - KEY_TEXT, KEY_LONGTEXT, true ); + KEY_TEXT, KEY_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "ca", NULL, NULL, - CA_TEXT, CA_LONGTEXT, true ); + CA_TEXT, CA_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, - CRL_TEXT, CRL_LONGTEXT, true ); + CRL_TEXT, CRL_LONGTEXT, true ) #if 0 //def HAVE_AVAHI_CLIENT add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL, BONJOUR_TEXT, BONJOUR_LONGTEXT, true); diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c index 5b730f44f7..0b46458101 100644 --- a/modules/access_output/rtmp.c +++ b/modules/access_output/rtmp.c @@ -60,7 +60,7 @@ vlc_module_begin () add_shortcut( "rtmp" ) set_callbacks( Open, Close ) add_bool( "rtmp-connect", false, NULL, RTMP_CONNECT_TEXT, - RTMP_CONNECT_LONGTEXT, false ); + RTMP_CONNECT_LONGTEXT, false ) vlc_module_end () /***************************************************************************** diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c index 6fc3a47f4c..f2e2e67c7f 100644 --- a/modules/access_output/shout.c +++ b/modules/access_output/shout.c @@ -114,26 +114,26 @@ vlc_module_begin () set_subcategory( SUBCAT_SOUT_ACO ) add_shortcut( "shout" ) add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream", NULL, - NAME_TEXT, NAME_LONGTEXT, false ); + NAME_TEXT, NAME_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "description", "Live stream from VLC media player", NULL, - DESCRIPTION_TEXT, DESCRIPTION_LONGTEXT, false ); + DESCRIPTION_TEXT, DESCRIPTION_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "mp3", false, NULL, - MP3_TEXT, MP3_LONGTEXT, true ); + MP3_TEXT, MP3_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "genre", "Alternative", NULL, - GENRE_TEXT, GENRE_LONGTEXT, false ); + GENRE_TEXT, GENRE_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "url", "http://www.videolan.org/vlc", NULL, - URL_TEXT, URL_LONGTEXT, false ); + URL_TEXT, URL_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "bitrate", "", NULL, - BITRATE_TEXT, BITRATE_LONGTEXT, false ); + BITRATE_TEXT, BITRATE_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "samplerate", "", NULL, - SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, false ); + SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "channels", "", NULL, - CHANNELS_TEXT, CHANNELS_LONGTEXT, false ); + CHANNELS_TEXT, CHANNELS_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "quality", "", NULL, - QUALITY_TEXT, QUALITY_LONGTEXT, false ); + QUALITY_TEXT, QUALITY_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "public", false, NULL, - PUBLIC_TEXT, PUBLIC_LONGTEXT, true ); + PUBLIC_TEXT, PUBLIC_LONGTEXT, true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index c49364833e..d87f4de25a 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -83,7 +83,7 @@ vlc_module_begin () set_subcategory( SUBCAT_SOUT_ACO ) add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "group", 1, NULL, GROUP_TEXT, GROUP_LONGTEXT, - true ); + true ) add_obsolete_integer( SOUT_CFG_PREFIX "late" ) add_obsolete_bool( SOUT_CFG_PREFIX "raw" ) diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c index f791ac3aa9..54904a7c7a 100644 --- a/modules/audio_filter/channel_mixer/headphone.c +++ b/modules/audio_filter/channel_mixer/headphone.c @@ -86,11 +86,11 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_AFILTER ) add_integer( "headphone-dim", 10, NULL, HEADPHONE_DIM_TEXT, - HEADPHONE_DIM_LONGTEXT, false ); + HEADPHONE_DIM_LONGTEXT, false ) add_bool( "headphone-compensate", 0, NULL, HEADPHONE_COMPENSATE_TEXT, - HEADPHONE_COMPENSATE_LONGTEXT, true ); + HEADPHONE_COMPENSATE_LONGTEXT, true ) add_bool( "headphone-dolby", 0, NULL, HEADPHONE_DOLBY_TEXT, - HEADPHONE_DOLBY_LONGTEXT, true ); + HEADPHONE_DOLBY_LONGTEXT, true ) set_capability( "audio filter", 0 ) set_callbacks( Create, Destroy ) diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index 221a5b9589..aa7562f6d9 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -115,10 +115,10 @@ vlc_module_begin () set_capability( "audio filter2", 2 ) add_bool( MONO_CFG "downmix", true, NULL, MONO_DOWNMIX_TEXT, - MONO_DOWNMIX_LONGTEXT, false ); + MONO_DOWNMIX_LONGTEXT, false ) add_integer( MONO_CFG "channel", -1, NULL, MONO_CHANNEL_TEXT, - MONO_CHANNEL_LONGTEXT, false ); - change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); + MONO_CHANNEL_LONGTEXT, false ) + change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_MISC ) diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 5df101897f..40bbcc16b3 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -77,14 +77,14 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_AFILTER ) add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT, - PRESET_LONGTEXT, false ); - change_string_list( preset_list, preset_list_text, 0 ); + PRESET_LONGTEXT, false ) + change_string_list( preset_list, preset_list_text, 0 ) add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT, - BANDS_LONGTEXT, true ); + BANDS_LONGTEXT, true ) add_bool( "equalizer-2pass", 0, NULL, TWOPASS_TEXT, - TWOPASS_LONGTEXT, true ); + TWOPASS_LONGTEXT, true ) add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT, - PREAMP_LONGTEXT, true ); + PREAMP_LONGTEXT, true ) set_callbacks( Open, Close ) add_shortcut( "equalizer" ) vlc_module_end () diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c index ee6ddb3b86..d0a2e351f3 100644 --- a/modules/audio_filter/normvol.c +++ b/modules/audio_filter/normvol.c @@ -86,9 +86,9 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_AFILTER ) add_shortcut( "volnorm" ) add_integer( "norm-buff-size", 20 ,NULL ,BUFF_TEXT, BUFF_LONGTEXT, - true); + true ) add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT, - LEVEL_LONGTEXT, true ); + LEVEL_LONGTEXT, true ) set_capability( "audio filter", 0 ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c index 88163f1f9f..b20a84a6e5 100644 --- a/modules/audio_filter/param_eq.c +++ b/modules/audio_filter/param_eq.c @@ -56,25 +56,25 @@ vlc_module_begin () add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),"", false ) add_float_with_range( "param-eq-lowgain", 0, -20.0, 20.0, NULL, - N_("Low freq gain (dB)"), "",false ); + N_("Low freq gain (dB)"), "",false ) add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),"", false ) add_float_with_range( "param-eq-highgain", 0, -20.0, 20.0, NULL, - N_("High freq gain (dB)"),"",false ); + N_("High freq gain (dB)"),"",false ) add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),"", false ) add_float_with_range( "param-eq-gain1", 0, -20.0, 20.0, NULL, - N_("Freq 1 gain (dB)"), "",false ); + N_("Freq 1 gain (dB)"), "",false ) add_float_with_range( "param-eq-q1", 3, 0.1, 100.0, NULL, - N_("Freq 1 Q"), "",false ); + N_("Freq 1 Q"), "",false ) add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),"", false ) add_float_with_range( "param-eq-gain2", 0, -20.0, 20.0, NULL, - N_("Freq 2 gain (dB)"),"",false ); + N_("Freq 2 gain (dB)"),"",false ) add_float_with_range( "param-eq-q2", 3, 0.1, 100.0, NULL, - N_("Freq 2 Q"),"",false ); + N_("Freq 2 Q"),"",false ) add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),"", false ) add_float_with_range( "param-eq-gain3", 0, -20.0, 20.0, NULL, - N_("Freq 3 gain (dB)"),"",false ); + N_("Freq 3 gain (dB)"),"",false ) add_float_with_range( "param-eq-q3", 3, 0.1, 100.0, NULL, - N_("Freq 3 Q"),"",false ); + N_("Freq 3 Q"),"",false ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c index 9587bfb51d..a40435d45e 100644 --- a/modules/audio_filter/scaletempo.c +++ b/modules/audio_filter/scaletempo.c @@ -51,11 +51,11 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_AFILTER ) add_integer_with_range( "scaletempo-stride", 30, 1, 2000, NULL, - N_("Stride Length"), N_("Length in milliseconds to output each stride"), true ); + N_("Stride Length"), N_("Length in milliseconds to output each stride"), true ) add_float_with_range( "scaletempo-overlap", .20, 0.0, 1.0, NULL, - N_("Overlap Length"), N_("Percentage of stride to overlap"), true ); + N_("Overlap Length"), N_("Percentage of stride to overlap"), true ) add_integer_with_range( "scaletempo-search", 14, 0, 200, NULL, - N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true ); + N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 7f841fc6db..0131a3f562 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -109,9 +109,9 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, aout_FindAndRestart, - N_("ALSA Device Name"), NULL, false ); + N_("ALSA Device Name"), NULL, false ) add_deprecated_alias( "alsadev" ) /* deprecated since 0.9.3 */ - change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback ); + change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback ) change_action_add( FindDevicesCallback, N_("Refresh list") ) set_capability( "audio output", 150 ) diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index ba40b85044..a2dc089b8a 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -234,9 +234,9 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_AOUT ) add_shortcut( "directx" ) add_integer( "directx-audio-device", 0, NULL, DEVICE_TEXT, - DEVICE_LONGTEXT, true ); + DEVICE_LONGTEXT, true ) add_bool( "directx-audio-float32", 0, 0, FLOAT_TEXT, - FLOAT_LONGTEXT, true ); + FLOAT_LONGTEXT, true ) set_callbacks( OpenAudio, CloseAudio ) vlc_module_end () diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index 2916b6382c..4b6e15f78e 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -116,12 +116,12 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_AOUT ) add_string( "audiofile-format", "s16", NULL, - FORMAT_TEXT, FORMAT_LONGTEXT, true ); - change_string_list( format_list, 0, 0 ); + FORMAT_TEXT, FORMAT_LONGTEXT, true ) + change_string_list( format_list, 0, 0 ) add_integer( "audiofile-channels", 0, NULL, - CHANNELS_TEXT, CHANNELS_LONGTEXT, true ); + CHANNELS_TEXT, CHANNELS_LONGTEXT, true ) add_file( "audiofile-file", "audiofile.wav", NULL, FILE_TEXT, - FILE_LONGTEXT, false ); + FILE_LONGTEXT, false ) add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, true ) set_capability( "audio output", 0 ) diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c index b15bbfab88..aeb203fc0a 100644 --- a/modules/audio_output/jack.c +++ b/modules/audio_output/jack.c @@ -86,9 +86,9 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) add_bool( AUTO_CONNECT_OPTION, 0, NULL, AUTO_CONNECT_TEXT, - AUTO_CONNECT_LONGTEXT, true ); + AUTO_CONNECT_LONGTEXT, true ) add_string( CONNECT_REGEX_OPTION, NULL, NULL, CONNECT_REGEX_TEXT, - CONNECT_REGEX_LONGTEXT, true ); + CONNECT_REGEX_LONGTEXT, true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index ee21df3f1d..6f81906ce5 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -113,7 +113,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) add_file( "oss-audio-device", "/dev/dsp", aout_FindAndRestart, - N_("OSS DSP device"), NULL, false ); + N_("OSS DSP device"), NULL, false ) add_deprecated_alias( "dspdev" ) /* deprecated since 0.9.3 */ add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ) diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c index 270d8ad293..795d5e325e 100644 --- a/modules/audio_output/portaudio.c +++ b/modules/audio_output/portaudio.c @@ -111,7 +111,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) add_integer( "portaudio-audio-device", 0, NULL, - DEVICE_TEXT, DEVICE_LONGTEXT, false ); + DEVICE_TEXT, DEVICE_LONGTEXT, false ) add_deprecated_alias( "portaudio-device" ) /* deprecated since 0.9.3 */ set_capability( "audio output", 0 ) set_callbacks( Open, Close ) diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 2d67ef7570..76cb524ce6 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -104,28 +104,28 @@ vlc_module_begin () add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, true ) add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT, - ERROR_LONGTEXT, true ); + ERROR_LONGTEXT, true ) add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT, - false ); + false ) add_bool( "ffmpeg-hurry-up", 1, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, - false ); + false ) add_integer( "ffmpeg-skip-frame", 0, NULL, SKIP_FRAME_TEXT, - SKIP_FRAME_LONGTEXT, true ); + SKIP_FRAME_LONGTEXT, true ) change_integer_range( -1, 4 ) add_integer( "ffmpeg-skip-idct", 0, NULL, SKIP_IDCT_TEXT, - SKIP_IDCT_LONGTEXT, true ); + SKIP_IDCT_LONGTEXT, true ) change_integer_range( -1, 4 ) add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT, - true ); + true ) add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT, - true ); + true ) change_integer_range( 0, 2 ) add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT, - SKIPLOOPF_LONGTEXT, true ); - change_integer_list( nloopf_list, nloopf_list_text, NULL ); + SKIPLOOPF_LONGTEXT, true ) + change_integer_list( nloopf_list, nloopf_list_text, NULL ) add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT, - true ); + true ) #ifdef ENABLE_SOUT /* encoder submodule */ @@ -136,59 +136,59 @@ vlc_module_begin () set_callbacks( OpenEncoder, CloseEncoder ) add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT, - ENC_HQ_LONGTEXT, false ); - change_string_list( enc_hq_list, enc_hq_list_text, 0 ); + ENC_HQ_LONGTEXT, false ) + change_string_list( enc_hq_list, enc_hq_list_text, 0 ) add_integer( ENC_CFG_PREFIX "keyint", 0, NULL, ENC_KEYINT_TEXT, - ENC_KEYINT_LONGTEXT, false ); + ENC_KEYINT_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT, - ENC_BFRAMES_LONGTEXT, false ); + ENC_BFRAMES_LONGTEXT, false ) add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT, - ENC_HURRYUP_LONGTEXT, false ); + ENC_HURRYUP_LONGTEXT, false ) add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT, - ENC_INTERLACE_LONGTEXT, true ); + ENC_INTERLACE_LONGTEXT, true ) add_bool( ENC_CFG_PREFIX "interlace-me", 1, NULL, ENC_INTERLACE_ME_TEXT, - ENC_INTERLACE_ME_LONGTEXT, true ); + ENC_INTERLACE_ME_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT, - ENC_VT_LONGTEXT, true ); + ENC_VT_LONGTEXT, true ) add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT, - ENC_PRE_ME_LONGTEXT, true ); + ENC_PRE_ME_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL, - ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true ); + ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL, - ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true ); + ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL, - ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true ); + ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL, - ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true ); + ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true ) add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL, - ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, true ); + ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "qmin", 0, NULL, - ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, true ); + ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "qmax", 0, NULL, - ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true ); + ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true ) add_bool( ENC_CFG_PREFIX "trellis", 0, NULL, - ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true ); + ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "qscale", 0, NULL, - ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true ); + ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "strict", 0, NULL, - ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, true ); + ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL, - ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, true ); + ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL, - ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, true ); + ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL, - ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, true ); + ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, true ) add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL, - ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, true ); + ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL, - ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, true ); + ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, true ) add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL, - ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, true ); + ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, true ) #if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4) /* Audio AAC encoder profile */ add_string( ENC_CFG_PREFIX "aac-profile", "low", NULL, - ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true ); + ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true ) #endif #endif /* ENABLE_SOUT */ diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c index 626b275834..7367fd067b 100644 --- a/modules/codec/dirac.c +++ b/modules/codec/dirac.c @@ -209,105 +209,105 @@ vlc_module_begin() set_callbacks( OpenEncoder, CloseEncoder ) add_float( ENC_CFG_PREFIX ENC_QUALITY_FACTOR, 5.5, NULL, - ENC_QUALITY_FACTOR_TEXT, ENC_QUALITY_FACTOR_LONGTEXT, false ); + ENC_QUALITY_FACTOR_TEXT, ENC_QUALITY_FACTOR_LONGTEXT, false ) change_float_range(0., 10.); add_integer( ENC_CFG_PREFIX ENC_TARGETRATE, -1, NULL, - ENC_TARGETRATE_TEXT, ENC_TARGETRATE_LONGTEXT, false ); + ENC_TARGETRATE_TEXT, ENC_TARGETRATE_LONGTEXT, false ) change_integer_range(-1, INT_MAX); add_bool( ENC_CFG_PREFIX ENC_LOSSLESS, false, NULL, - ENC_LOSSLESS_TEXT, ENC_LOSSLESS_LONGTEXT, false ); + ENC_LOSSLESS_TEXT, ENC_LOSSLESS_LONGTEXT, false ) add_string( ENC_CFG_PREFIX ENC_PREFILTER, "diaglp", NULL, - ENC_PREFILTER_TEXT, ENC_PREFILTER_LONGTEXT, false ); + ENC_PREFILTER_TEXT, ENC_PREFILTER_LONGTEXT, false ) change_string_list( enc_prefilter_list, enc_prefilter_list_text, 0 ); add_integer( ENC_CFG_PREFIX ENC_PREFILTER_STRENGTH, 1, NULL, - ENC_PREFILTER_STRENGTH_TEXT, ENC_PREFILTER_STRENGTH_LONGTEXT, false ); + ENC_PREFILTER_STRENGTH_TEXT, ENC_PREFILTER_STRENGTH_LONGTEXT, false ) change_integer_range(0, 10); add_string( ENC_CFG_PREFIX ENC_CHROMAFMT, "420", NULL, - ENC_CHROMAFMT_TEXT, ENC_CHROMAFMT_LONGTEXT, false ); + ENC_CHROMAFMT_TEXT, ENC_CHROMAFMT_LONGTEXT, false ) change_string_list( enc_chromafmt_list, enc_chromafmt_list_text, 0 ); add_integer( ENC_CFG_PREFIX ENC_L1SEP, -1, NULL, - ENC_L1SEP_TEXT, ENC_L1SEP_LONGTEXT, false ); + ENC_L1SEP_TEXT, ENC_L1SEP_LONGTEXT, false ) change_integer_range(-1, INT_MAX); add_integer( ENC_CFG_PREFIX ENC_L1NUM, -1, NULL, - ENC_L1NUM_TEXT, ENC_L1NUM_LONGTEXT, false ); + ENC_L1NUM_TEXT, ENC_L1NUM_LONGTEXT, false ) change_integer_range(-1, INT_MAX); add_string( ENC_CFG_PREFIX ENC_CODINGMODE, "auto", NULL, - ENC_CODINGMODE_TEXT, ENC_CODINGMODE_LONGTEXT, false ); + ENC_CODINGMODE_TEXT, ENC_CODINGMODE_LONGTEXT, false ) change_string_list( enc_codingmode_list, enc_codingmode_list_text, 0 ); add_string( ENC_CFG_PREFIX ENC_MVPREC, "1/2", NULL, - ENC_MVPREC_TEXT, ENC_MVPREC_LONGTEXT, false ); + ENC_MVPREC_TEXT, ENC_MVPREC_LONGTEXT, false ) change_string_list( enc_mvprec_list, enc_mvprec_list, 0 ); add_integer( ENC_CFG_PREFIX ENC_MCBLK_WIDTH, -1, NULL, - ENC_MCBLK_WIDTH_TEXT, ENC_MCBLK_WIDTH_LONGTEXT, false ); + ENC_MCBLK_WIDTH_TEXT, ENC_MCBLK_WIDTH_LONGTEXT, false ) add_deprecated_alias( ENC_CFG_PREFIX ENC_MCBLK_XBLEN ); change_integer_range(-1, INT_MAX); add_integer( ENC_CFG_PREFIX ENC_MCBLK_HEIGHT, -1, NULL, - ENC_MCBLK_HEIGHT, ENC_MCBLK_HEIGHT_LONGTEXT, false ); + ENC_MCBLK_HEIGHT, ENC_MCBLK_HEIGHT_LONGTEXT, false ) add_deprecated_alias( ENC_CFG_PREFIX ENC_MCBLK_YBLEN ); change_integer_range(-1, INT_MAX); add_integer( ENC_CFG_PREFIX ENC_MCBLK_OVERLAP, -1, NULL, - ENC_MCBLK_OVERLAP_TEXT, ENC_MCBLK_OVERLAP_LONGTEXT, false ); + ENC_MCBLK_OVERLAP_TEXT, ENC_MCBLK_OVERLAP_LONGTEXT, false ) change_integer_range(-1, 100); /* advanced option only */ add_integer( ENC_CFG_PREFIX ENC_MCBLK_XBLEN, -1, NULL, - ENC_MCBLK_XBLEN_TEXT, ENC_MCBLK_XBLEN_LONGTEXT, true ); + ENC_MCBLK_XBLEN_TEXT, ENC_MCBLK_XBLEN_LONGTEXT, true ) change_integer_range(-1, INT_MAX); /* advanced option only */ add_integer( ENC_CFG_PREFIX ENC_MCBLK_YBLEN, -1, NULL, - ENC_MCBLK_YBLEN_TEXT, ENC_MCBLK_YBLEN_LONGTEXT, true ); + ENC_MCBLK_YBLEN_TEXT, ENC_MCBLK_YBLEN_LONGTEXT, true ) change_integer_range(-1, INT_MAX); add_string( ENC_CFG_PREFIX ENC_ME_SIMPLESEARCH, "", NULL, - ENC_ME_SIMPLESEARCH_TEXT, ENC_ME_SIMPLESEARCH_LONGTEXT, false ); + ENC_ME_SIMPLESEARCH_TEXT, ENC_ME_SIMPLESEARCH_LONGTEXT, false ) #if DIRAC_RESEARCH_VERSION_ATLEAST(1,0,1) add_bool( ENC_CFG_PREFIX ENC_ME_COMBINED, true, NULL, - ENC_ME_COMBINED_TEXT, ENC_ME_COMBINED_LONGTEXT, false ); + ENC_ME_COMBINED_TEXT, ENC_ME_COMBINED_LONGTEXT, false ) #endif add_integer( ENC_CFG_PREFIX ENC_DWTINTRA, -1, NULL, - ENC_DWTINTRA_TEXT, ENC_DWTINTRA_LONGTEXT, false ); + ENC_DWTINTRA_TEXT, ENC_DWTINTRA_LONGTEXT, false ) change_integer_range(-1, 6); add_integer( ENC_CFG_PREFIX ENC_DWTINTER, -1, NULL, - ENC_DWTINTER_TEXT, ENC_DWTINTER_LONGTEXT, false ); + ENC_DWTINTER_TEXT, ENC_DWTINTER_LONGTEXT, false ) change_integer_range(-1, 6); add_integer( ENC_CFG_PREFIX ENC_DWTDEPTH, -1, NULL, - ENC_DWTDEPTH_TEXT, ENC_DWTDEPTH_LONGTEXT, false ); + ENC_DWTDEPTH_TEXT, ENC_DWTDEPTH_LONGTEXT, false ) change_integer_range(-1, 4); /* advanced option only */ /* NB, unforunately vlc doesn't have a concept of 'dont care' */ add_integer( ENC_CFG_PREFIX ENC_MULTIQUANT, -1, NULL, - ENC_MULTIQUANT_TEXT, ENC_MULTIQUANT_LONGTEXT, true ); + ENC_MULTIQUANT_TEXT, ENC_MULTIQUANT_LONGTEXT, true ) change_integer_range(-1, 1); /* advanced option only */ /* NB, unforunately vlc doesn't have a concept of 'dont care' */ add_integer( ENC_CFG_PREFIX ENC_SPARTITION, -1, NULL, - ENC_SPARTITION_TEXT, ENC_SPARTITION_LONGTEXT, true ); + ENC_SPARTITION_TEXT, ENC_SPARTITION_LONGTEXT, true ) change_integer_range(-1, 1); add_bool( ENC_CFG_PREFIX ENC_NOAC, false, NULL, - ENC_NOAC_TEXT, ENC_NOAC_LONGTEXT, false ); + ENC_NOAC_TEXT, ENC_NOAC_LONGTEXT, false ) /* advanced option only */ add_float( ENC_CFG_PREFIX ENC_CPD, -1, NULL, - ENC_CPD_TEXT, ENC_CPD_LONGTEXT, true ); + ENC_CPD_TEXT, ENC_CPD_LONGTEXT, true ) change_integer_range(-1, INT_MAX); vlc_module_end() diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c index f9cd996fea..cc1fc4b331 100644 --- a/modules/codec/dvbsub.c +++ b/modules/codec/dvbsub.c @@ -96,7 +96,7 @@ vlc_module_begin () set_callbacks( Open, Close ) add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, true ) - change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); + change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ) add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false ) add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false ) diff --git a/modules/codec/fake.c b/modules/codec/fake.c index 282f3ffdf7..d47a9146c1 100644 --- a/modules/codec/fake.c +++ b/modules/codec/fake.c @@ -93,25 +93,25 @@ vlc_module_begin () add_shortcut( "fake" ) add_file( "fake-file", "", NULL, FILE_TEXT, - FILE_LONGTEXT, false ); + FILE_LONGTEXT, false ) add_integer( "fake-file-reload", 0, NULL, RELOAD_TEXT, - RELOAD_LONGTEXT, false ); + RELOAD_LONGTEXT, false ) add_integer( "fake-width", 0, NULL, WIDTH_TEXT, - WIDTH_LONGTEXT, true ); + WIDTH_LONGTEXT, true ) add_integer( "fake-height", 0, NULL, HEIGHT_TEXT, - HEIGHT_LONGTEXT, true ); + HEIGHT_LONGTEXT, true ) add_bool( "fake-keep-ar", 0, NULL, KEEP_AR_TEXT, KEEP_AR_LONGTEXT, - true ); + true ) add_string( "fake-aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ) add_bool( "fake-deinterlace", 0, NULL, DEINTERLACE_TEXT, - DEINTERLACE_LONGTEXT, false ); + DEINTERLACE_LONGTEXT, false ) add_string( "fake-deinterlace-module", "deinterlace", NULL, DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT, - false ); - change_string_list( ppsz_deinterlace_type, 0, 0 ); + false ) + change_string_list( ppsz_deinterlace_type, 0, 0 ) add_string( "fake-chroma", "I420", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) vlc_module_end () struct decoder_sys_t diff --git a/modules/codec/invmem.c b/modules/codec/invmem.c index 1703243767..060894af7e 100644 --- a/modules/codec/invmem.c +++ b/modules/codec/invmem.c @@ -73,22 +73,22 @@ static picture_t *DecodeBlock ( decoder_t *, block_t ** ); "set all --invmem-* options in vlc_argv an use " \ "libvlc_media_new(libvlc, \"fake://\", &ex);. " \ "Besides is simillar to vmem video output module." ) -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_shortname( N_("Memory video decoder") ); - set_description( N_("Memory video decoder") ); - set_help( INVMEM_HELP ); - set_capability( "decoder", 50 ); - set_callbacks( OpenDecoder, CloseDecoder ); - add_shortcut( "invmem" ); - - add_integer( "invmem-width", "0", NULL, T_WIDTH, LT_WIDTH, false ); - add_integer( "invmem-height", "0", NULL, T_HEIGHT, LT_HEIGHT, false ); - add_string( "invmem-lock", "0", NULL, T_LOCK, LT_LOCK, true ); - add_string( "invmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true ); - add_string( "invmem-data", "0", NULL, T_DATA, LT_DATA, true ); -vlc_module_end(); +vlc_module_begin() + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_VCODEC ) + set_shortname( N_("Memory video decoder") ) + set_description( N_("Memory video decoder") ) + set_help( INVMEM_HELP ) + set_capability( "decoder", 50 ) + set_callbacks( OpenDecoder, CloseDecoder ) + add_shortcut( "invmem" ) + + add_integer( "invmem-width", "0", NULL, T_WIDTH, LT_WIDTH, false ) + add_integer( "invmem-height", "0", NULL, T_HEIGHT, LT_HEIGHT, false ) + add_string( "invmem-lock", "0", NULL, T_LOCK, LT_LOCK, true ) + add_string( "invmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true ) + add_string( "invmem-data", "0", NULL, T_DATA, LT_DATA, true ) +vlc_module_end() struct decoder_sys_t diff --git a/modules/codec/kate.c b/modules/codec/kate.c index 3f07daeca6..dc91302fed 100644 --- a/modules/codec/kate.c +++ b/modules/codec/kate.c @@ -280,15 +280,15 @@ vlc_module_begin () add_shortcut( "kate" ) add_bool( "kate-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT, - true ); + true ) #ifdef HAVE_TIGER add_bool( "kate-use-tiger", true, NULL, TIGER_TEXT, TIGER_LONGTEXT, - true ); + true ) add_float_with_range( "kate-tiger-quality", TIGER_QUALITY_DEFAULT, 0.0f, 1.0f, TigerConfigurationCallback, TIGER_QUALITY_TEXT, TIGER_QUALITY_LONGTEXT, - true ); + true ) set_section( N_("Tiger rendering defaults"), NULL ); add_string( "kate-tiger-default-font-desc", @@ -298,12 +298,12 @@ vlc_module_begin () TIGER_DEFAULT_FONT_EFFECT_DEFAULT, 0, sizeof(pi_font_effects)/sizeof(pi_font_effects[0])-1, TigerConfigurationCallback, TIGER_DEFAULT_FONT_EFFECT_TEXT, TIGER_DEFAULT_FONT_EFFECT_LONGTEXT, - true ); + true ) change_integer_list( pi_font_effects, ppsz_font_effect_names, NULL ); add_float_with_range( "kate-tiger-default-font-effect-strength", TIGER_DEFAULT_FONT_EFFECT_STRENGTH_DEFAULT, 0.0f, 1.0f, TigerConfigurationCallback, TIGER_DEFAULT_FONT_EFFECT_STRENGTH_TEXT, TIGER_DEFAULT_FONT_EFFECT_STRENGTH_LONGTEXT, - true ); + true ) add_integer_with_range( "kate-tiger-default-font-color", TIGER_DEFAULT_FONT_COLOR_DEFAULT, 0, 0x00ffffff, TigerConfigurationCallback, TIGER_DEFAULT_FONT_COLOR_TEXT, TIGER_DEFAULT_FONT_COLOR_LONGTEXT, diff --git a/modules/codec/speex.c b/modules/codec/speex.c index 6f30af7029..b6565269c3 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -108,28 +108,28 @@ vlc_module_begin () set_callbacks( OpenEncoder, CloseEncoder ) add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT, - ENC_MODE_LONGTEXT, false ); + ENC_MODE_LONGTEXT, false ) change_integer_list( pi_enc_mode_values, ppsz_enc_mode_descriptions, NULL ); add_integer( ENC_CFG_PREFIX "complexity", 3, NULL, ENC_COMPLEXITY_TEXT, - ENC_COMPLEXITY_LONGTEXT, false ); + ENC_COMPLEXITY_LONGTEXT, false ) change_integer_range( 1, 10 ) add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT, - ENC_CBR_LONGTEXT, false ); + ENC_CBR_LONGTEXT, false ) add_float( ENC_CFG_PREFIX "quality", 8.0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, false ); + ENC_QUALITY_LONGTEXT, false ) change_float_range( 0.0, 10.0 ) add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBITRATE_TEXT, - ENC_MAXBITRATE_LONGTEXT, false ); + ENC_MAXBITRATE_LONGTEXT, false ) add_bool( ENC_CFG_PREFIX "vad", true, NULL, ENC_VAD_TEXT, - ENC_VAD_LONGTEXT, false ); + ENC_VAD_LONGTEXT, false ) add_bool( ENC_CFG_PREFIX "dtx", false, NULL, ENC_DTX_TEXT, - ENC_DTX_LONGTEXT, false ); + ENC_DTX_LONGTEXT, false ) /* TODO agc, noise suppression, */ diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c index 0b9173224d..59c1f895af 100644 --- a/modules/codec/subtitles/subsdec.c +++ b/modules/codec/subtitles/subsdec.c @@ -122,15 +122,15 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_SCODEC ) add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, - false ); - change_integer_list( pi_justification, ppsz_justification_text, NULL ); + false ) + change_integer_list( pi_justification, ppsz_justification_text, NULL ) add_string( "subsdec-encoding", DEFAULT_NAME, NULL, - ENCODING_TEXT, ENCODING_LONGTEXT, false ); - change_string_list( ppsz_encodings, 0, 0 ); + ENCODING_TEXT, ENCODING_LONGTEXT, false ) + change_string_list( ppsz_encodings, 0, 0 ) add_bool( "subsdec-autodetect-utf8", true, NULL, - AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, false ); + AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, false ) add_bool( "subsdec-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT, - false ); + false ) vlc_module_end () /***************************************************************************** diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c index 184311510b..c6d9ee9229 100644 --- a/modules/codec/svcdsub.c +++ b/modules/codec/svcdsub.c @@ -60,7 +60,7 @@ vlc_module_begin () set_callbacks( DecoderOpen, DecoderClose ) add_integer ( MODULE_STRING "-debug", 0, NULL, - DEBUG_TEXT, DEBUG_LONGTEXT, true ); + DEBUG_TEXT, DEBUG_LONGTEXT, true ) add_submodule () set_description( N_("Philips OGT (SVCD subtitle) packetizer") ) diff --git a/modules/codec/telx.c b/modules/codec/telx.c index 9743b440f3..90fff84c8a 100644 --- a/modules/codec/telx.c +++ b/modules/codec/telx.c @@ -77,11 +77,11 @@ vlc_module_begin () set_callbacks( Open, Close ) add_integer( "telx-override-page", -1, NULL, - OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, true ); + OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, true ) add_bool( "telx-ignore-subtitle-flag", 0, NULL, - IGNORE_SUB_FLAG_TEXT, IGNORE_SUB_FLAG_LONGTEXT, true ); + IGNORE_SUB_FLAG_TEXT, IGNORE_SUB_FLAG_LONGTEXT, true ) add_bool( "telx-french-workaround", 0, NULL, - FRENCH_WORKAROUND_TEXT, FRENCH_WORKAROUND_LONGTEXT, true ); + FRENCH_WORKAROUND_TEXT, FRENCH_WORKAROUND_LONGTEXT, true ) vlc_module_end () diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 5817bf0eeb..c0d70be94b 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -118,7 +118,7 @@ vlc_module_begin () # define ENC_CFG_PREFIX "sout-theora-" add_integer( ENC_CFG_PREFIX "quality", 2, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, false ); + ENC_QUALITY_LONGTEXT, false ) vlc_module_end () static const char *const ppsz_enc_options[] = { diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c index 418f080d27..8ce4fd2538 100644 --- a/modules/codec/twolame.c +++ b/modules/codec/twolame.c @@ -80,14 +80,14 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_ACODEC ) add_float( ENC_CFG_PREFIX "quality", 0.0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, false ); + ENC_QUALITY_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT, - ENC_MODE_LONGTEXT, false ); + ENC_MODE_LONGTEXT, false ) change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, NULL ); add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT, - ENC_VBR_LONGTEXT, false ); + ENC_VBR_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT, - ENC_PSY_LONGTEXT, false ); + ENC_PSY_LONGTEXT, false ) vlc_module_end () static const char *const ppsz_enc_options[] = { diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 4d079dc8ef..9f4125ae7b 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -203,13 +203,13 @@ vlc_module_begin () #endif add_integer( ENC_CFG_PREFIX "quality", 0, NULL, ENC_QUALITY_TEXT, - ENC_QUALITY_LONGTEXT, false ); + ENC_QUALITY_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "max-bitrate", 0, NULL, ENC_MAXBR_TEXT, - ENC_MAXBR_LONGTEXT, false ); + ENC_MAXBR_LONGTEXT, false ) add_integer( ENC_CFG_PREFIX "min-bitrate", 0, NULL, ENC_MINBR_TEXT, - ENC_MINBR_LONGTEXT, false ); + ENC_MINBR_LONGTEXT, false ) add_bool( ENC_CFG_PREFIX "cbr", 0, NULL, ENC_CBR_TEXT, - ENC_CBR_LONGTEXT, false ); + ENC_CBR_LONGTEXT, false ) #endif vlc_module_end () diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 1e5005dfef..378fb79cdd 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -424,242 +424,242 @@ vlc_module_begin () /* Frame-type options */ add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT, - KEYINT_LONGTEXT, false ); + KEYINT_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, - MIN_KEYINT_LONGTEXT, false ); + MIN_KEYINT_LONGTEXT, false ) add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT, - SCENE_LONGTEXT, false ); + SCENE_LONGTEXT, false ) change_integer_range( -1, 100 ) #if X264_BUILD >= 55 /* r607 */ add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT, - PRESCENE_LONGTEXT, false ); + PRESCENE_LONGTEXT, false ) #endif add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, - BFRAMES_LONGTEXT, false ); + BFRAMES_LONGTEXT, false ) change_integer_range( 0, 16 ) #if X264_BUILD >= 63 add_integer( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, - B_ADAPT_LONGTEXT, false ); + B_ADAPT_LONGTEXT, false ) change_integer_range( 0, 2 ) #elif X264_BUILD >= 0x0013 /* r137 */ add_bool( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, - B_ADAPT_LONGTEXT, false ); + B_ADAPT_LONGTEXT, false ) #endif #if X264_BUILD >= 0x0013 /* r137 */ add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT, - B_BIAS_LONGTEXT, false ); + B_BIAS_LONGTEXT, false ) change_integer_range( -100, 100 ) #endif add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT, - BPYRAMID_LONGTEXT, false ); + BPYRAMID_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "cabac", 1, NULL, CABAC_TEXT, CABAC_LONGTEXT, - false ); + false ) add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT, - REF_LONGTEXT, false ); + REF_LONGTEXT, false ) change_integer_range( 1, 16 ) add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ) /* Deprecated since 0.8.5 */ add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT, - NF_LONGTEXT, false ); + NF_LONGTEXT, false ) add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ) /* Deprecated since 0.8.5 */ add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT, - FILTER_LONGTEXT, false ); + FILTER_LONGTEXT, false ) add_deprecated_alias( SOUT_CFG_PREFIX "filter" ) /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT, - LEVEL_LONGTEXT, false ); + LEVEL_LONGTEXT, false ) #if X264_BUILD >= 51 /* r570 */ add_bool( SOUT_CFG_PREFIX "interlaced", 0, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT, - false ); + false ) #endif /* Ratecontrol */ add_integer( SOUT_CFG_PREFIX "qp", 26, NULL, QP_TEXT, QP_LONGTEXT, - false ); + false ) change_integer_range( 0, 51 ) /* QP 0 -> lossless encoding */ #if X264_BUILD >= 37 /* r334 */ add_integer( SOUT_CFG_PREFIX "crf", 0, NULL, CRF_TEXT, - CRF_LONGTEXT, false ); + CRF_LONGTEXT, false ) change_integer_range( 0, 51 ) #endif add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT, - QPMIN_LONGTEXT, false ); + QPMIN_LONGTEXT, false ) change_integer_range( 0, 51 ) add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT, - QPMAX_LONGTEXT, false ); + QPMAX_LONGTEXT, false ) change_integer_range( 0, 51 ) add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT, - QPSTEP_LONGTEXT, false ); + QPSTEP_LONGTEXT, false ) change_integer_range( 0, 51 ) add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT, - RATETOL_LONGTEXT, false ); + RATETOL_LONGTEXT, false ) change_float_range( 0, 100 ) add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ) /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT, - VBV_MAXRATE_LONGTEXT, false ); + VBV_MAXRATE_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT, - VBV_BUFSIZE_LONGTEXT, false ); + VBV_BUFSIZE_LONGTEXT, false ) add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT, - VBV_INIT_LONGTEXT, false ); + VBV_INIT_LONGTEXT, false ) change_float_range( 0, 1 ) add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT, - IPRATIO_LONGTEXT, false ); + IPRATIO_LONGTEXT, false ) change_float_range( 1, 2 ) add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT, - PBRATIO_LONGTEXT, false ); + PBRATIO_LONGTEXT, false ) change_float_range( 1, 2 ) #if X264_BUILD >= 23 /* r190 */ add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, NULL, CHROMA_QP_OFFSET_TEXT, - CHROMA_QP_OFFSET_LONGTEXT, false ); + CHROMA_QP_OFFSET_LONGTEXT, false ) #endif add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT, - PASS_LONGTEXT, false ); + PASS_LONGTEXT, false ) change_integer_range( 0, 3 ) add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT, - QCOMP_LONGTEXT, false ); + QCOMP_LONGTEXT, false ) change_float_range( 0, 1 ) add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT, - CPLXBLUR_LONGTEXT, false ); + CPLXBLUR_LONGTEXT, false ) add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT, - QBLUR_LONGTEXT, false ); + QBLUR_LONGTEXT, false ) #if X264_BUILD >= 59 add_integer( SOUT_CFG_PREFIX "aq-mode", 2, NULL, AQ_MODE_TEXT, - AQ_MODE_LONGTEXT, false ); + AQ_MODE_LONGTEXT, false ) change_integer_range( 0, 2 ) add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, NULL, AQ_STRENGTH_TEXT, - AQ_STRENGTH_LONGTEXT, false ); + AQ_STRENGTH_LONGTEXT, false ) #endif /* Analysis */ /* x264 partitions = none (default). set at least "normal" mode. */ add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, - ANALYSE_LONGTEXT, false ); + ANALYSE_LONGTEXT, false ) change_string_list( enc_analyse_list, enc_analyse_list_text, 0 ); add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ) /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT, - DIRECT_PRED_LONGTEXT, false ); + DIRECT_PRED_LONGTEXT, false ) change_string_list( direct_pred_list, direct_pred_list_text, 0 ); #if X264_BUILD >= 52 /* r573 */ add_integer( SOUT_CFG_PREFIX "direct-8x8", -1, NULL, DIRECT_PRED_SIZE_TEXT, - DIRECT_PRED_SIZE_LONGTEXT, false ); + DIRECT_PRED_SIZE_LONGTEXT, false ) change_integer_range( -1, 1 ) #endif #if X264_BUILD >= 0x0012 /* r134 */ add_bool( SOUT_CFG_PREFIX "weightb", 0, NULL, WEIGHTB_TEXT, - WEIGHTB_LONGTEXT, false ); + WEIGHTB_LONGTEXT, false ) #endif #if X264_BUILD >= 24 /* r221 */ add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT, - ME_LONGTEXT, false ); + ME_LONGTEXT, false ) change_string_list( enc_me_list, enc_me_list_text, 0 ); add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT, - MERANGE_LONGTEXT, false ); + MERANGE_LONGTEXT, false ) change_integer_range( 1, 64 ) #endif add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT, - MVRANGE_LONGTEXT, false ); + MVRANGE_LONGTEXT, false ) #if X264_BUILD >= 55 /* r607 */ add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, - MVRANGE_THREAD_LONGTEXT, false ); + MVRANGE_THREAD_LONGTEXT, false ) #endif add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, - SUBME_LONGTEXT, false ); + SUBME_LONGTEXT, false ) change_integer_range( 1, SUBME_MAX ) add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ) /* Deprecated since 0.8.5 */ #if X264_BUILD >= 41 && X264_BUILD < 65 /* r368 */ add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT, - B_RDO_LONGTEXT, false ); + B_RDO_LONGTEXT, false ) #endif #if X264_BUILD >= 36 /* r318 */ add_bool( SOUT_CFG_PREFIX "mixed-refs", 0, NULL, MIXED_REFS_TEXT, - MIXED_REFS_LONGTEXT, false ); + MIXED_REFS_LONGTEXT, false ) #endif #if X264_BUILD >= 23 /* r171 */ add_bool( SOUT_CFG_PREFIX "chroma-me", 1, NULL, CHROMA_ME_TEXT, - CHROMA_ME_LONGTEXT, false ); + CHROMA_ME_LONGTEXT, false ) #endif #if X264_BUILD >= 43 && X264_BUILD < 65 /* r390 */ add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT, - BIME_LONGTEXT, false ); + BIME_LONGTEXT, false ) #endif #if X264_BUILD >= 30 /* r251 */ add_bool( SOUT_CFG_PREFIX "8x8dct", 0, NULL, TRANSFORM_8X8DCT_TEXT, - TRANSFORM_8X8DCT_LONGTEXT, false ); + TRANSFORM_8X8DCT_LONGTEXT, false ) #endif #if X264_BUILD >= 39 /* r360 */ add_integer( SOUT_CFG_PREFIX "trellis", 0, NULL, TRELLIS_TEXT, - TRELLIS_LONGTEXT, false ); + TRELLIS_LONGTEXT, false ) change_integer_range( 0, 2 ) #endif #if X264_BUILD >= 42 /* r384 */ add_bool( SOUT_CFG_PREFIX "fast-pskip", 1, NULL, FAST_PSKIP_TEXT, - FAST_PSKIP_LONGTEXT, false ); + FAST_PSKIP_LONGTEXT, false ) #endif #if X264_BUILD >= 46 /* r503 */ add_bool( SOUT_CFG_PREFIX "dct-decimate", 1, NULL, DCT_DECIMATE_TEXT, - DCT_DECIMATE_LONGTEXT, false ); + DCT_DECIMATE_LONGTEXT, false ) #endif #if X264_BUILD >= 44 /* r398 */ add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT, - NR_LONGTEXT, false ); + NR_LONGTEXT, false ) change_integer_range( 0, 1000 ) #endif #if X264_BUILD >= 52 /* r573 */ add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, NULL, DEADZONE_INTER_TEXT, - DEADZONE_INTRA_LONGTEXT, false ); + DEADZONE_INTRA_LONGTEXT, false ) change_integer_range( 0, 32 ) add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT, - DEADZONE_INTRA_LONGTEXT, false ); + DEADZONE_INTRA_LONGTEXT, false ) change_integer_range( 0, 32 ) #endif @@ -667,40 +667,40 @@ vlc_module_begin () #if X264_BUILD >= 55 /* r607 */ add_bool( SOUT_CFG_PREFIX "non-deterministic", 0, NULL, NON_DETERMINISTIC_TEXT, - NON_DETERMINISTIC_LONGTEXT, false ); + NON_DETERMINISTIC_LONGTEXT, false ) #endif add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT, - ASM_LONGTEXT, false ); + ASM_LONGTEXT, false ) /* x264 psnr = 1 (default). disable PSNR computation for speed. */ add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT, - PSNR_LONGTEXT, false ); + PSNR_LONGTEXT, false ) #if X264_BUILD >= 50 /* r554 */ /* x264 ssim = 1 (default). disable SSIM computation for speed. */ add_bool( SOUT_CFG_PREFIX "ssim", 0, NULL, SSIM_TEXT, - SSIM_LONGTEXT, false ); + SSIM_LONGTEXT, false ) #endif add_bool( SOUT_CFG_PREFIX "quiet", 0, NULL, QUIET_TEXT, - QUIET_LONGTEXT, false ); + QUIET_LONGTEXT, false ) #if X264_BUILD >= 47 /* r518 */ add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT, - SPS_ID_LONGTEXT, false ); + SPS_ID_LONGTEXT, false ) #endif add_bool( SOUT_CFG_PREFIX "aud", 0, NULL, AUD_TEXT, - AUD_LONGTEXT, false ); + AUD_LONGTEXT, false ) #if X264_BUILD >= 0x000e /* r81 */ add_bool( SOUT_CFG_PREFIX "verbose", 0, NULL, VERBOSE_TEXT, - VERBOSE_LONGTEXT, false ); + VERBOSE_LONGTEXT, false ) #endif add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, - STATS_LONGTEXT, false ); + STATS_LONGTEXT, false ) vlc_module_end () diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c index 868d03747d..c9d7e29049 100644 --- a/modules/codec/zvbi.c +++ b/modules/codec/zvbi.c @@ -88,13 +88,13 @@ vlc_module_begin () set_callbacks( Open, Close ) add_integer( "vbi-page", 100, NULL, - PAGE_TEXT, PAGE_LONGTEXT, false ); + PAGE_TEXT, PAGE_LONGTEXT, false ) add_bool( "vbi-opaque", true, NULL, - OPAQUE_TEXT, OPAQUE_LONGTEXT, false ); + OPAQUE_TEXT, OPAQUE_LONGTEXT, false ) add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_bool( "vbi-text", false, NULL, - TELX_TEXT, TELX_LONGTEXT, false ); + TELX_TEXT, TELX_LONGTEXT, false ) vlc_module_end () /**************************************************************************** diff --git a/modules/control/gestures.c b/modules/control/gestures.c index 8fc9b02087..7ff1a465a6 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -96,9 +96,9 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_CONTROL ) add_integer( "gestures-threshold", 30, NULL, - THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true ); + THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true ) add_string( "gestures-button", "right", NULL, - BUTTON_TEXT, BUTTON_LONGTEXT, false ); + BUTTON_TEXT, BUTTON_LONGTEXT, false ) change_string_list( button_list, button_list_text, 0 ); set_description( N_("Mouse gestures control interface") ) diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c index 0d5d90a640..361bd63818 100644 --- a/modules/control/http/macro.c +++ b/modules/control/http/macro.c @@ -208,12 +208,12 @@ static void MacroDo( httpd_file_sys_t *p_args, } case MVLC_STOP: playlist_Control( p_sys->p_playlist, PLAYLIST_STOP, - true ); + true ) msg_Dbg( p_intf, "requested playlist stop" ); break; case MVLC_PAUSE: playlist_Control( p_sys->p_playlist, PLAYLIST_PAUSE, - true ); + true ) msg_Dbg( p_intf, "requested playlist pause" ); break; case MVLC_NEXT: diff --git a/modules/control/lirc.c b/modules/control/lirc.c index 467f48229a..8b3325768c 100644 --- a/modules/control/lirc.c +++ b/modules/control/lirc.c @@ -62,7 +62,7 @@ vlc_module_begin () set_callbacks( Open, Close ) add_string( "lirc-file", NULL, NULL, - LIRC_TEXT, LIRC_LONGTEXT, true ); + LIRC_TEXT, LIRC_LONGTEXT, true ) vlc_module_end () /***************************************************************************** diff --git a/modules/control/motion.c b/modules/control/motion.c index c788857fb9..a0555a7d5c 100644 --- a/modules/control/motion.c +++ b/modules/control/motion.c @@ -82,7 +82,7 @@ vlc_module_begin () "to rotate the video") ) add_bool( "motion-use-rotate", 0, NULL, - USE_ROTATE_TEXT, USE_ROTATE_TEXT, false ); + USE_ROTATE_TEXT, USE_ROTATE_TEXT, false ) set_capability( "interface", 0 ) set_callbacks( Open, Close ) diff --git a/modules/control/netsync.c b/modules/control/netsync.c index d005e6acf4..e6950464b1 100644 --- a/modules/control/netsync.c +++ b/modules/control/netsync.c @@ -79,9 +79,9 @@ vlc_module_begin () set_subcategory( SUBCAT_ADVANCED_MISC ) add_bool( "netsync-master", 0, NULL, - NETSYNC_TEXT, NETSYNC_LONGTEXT, true ); + NETSYNC_TEXT, NETSYNC_LONGTEXT, true ) add_string( "netsync-master-ip", NULL, NULL, MIP_TEXT, MIP_LONGTEXT, - true ); + true ) set_capability( "interface", 0 ) set_callbacks( Activate, Close ) diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c index 3bb1b6f145..62b097b233 100644 --- a/modules/control/ntservice.c +++ b/modules/control/ntservice.c @@ -67,15 +67,15 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_CONTROL ) add_bool( "ntservice-install", 0, NULL, - INSTALL_TEXT, INSTALL_LONGTEXT, true ); + INSTALL_TEXT, INSTALL_LONGTEXT, true ) add_bool( "ntservice-uninstall", 0, NULL, - UNINSTALL_TEXT, UNINSTALL_LONGTEXT, true ); + UNINSTALL_TEXT, UNINSTALL_LONGTEXT, true ) add_string ( "ntservice-name", VLCSERVICENAME, NULL, - NAME_TEXT, NAME_LONGTEXT, true ); + NAME_TEXT, NAME_LONGTEXT, true ) add_string ( "ntservice-options", NULL, NULL, - OPTIONS_TEXT, OPTIONS_LONGTEXT, true ); + OPTIONS_TEXT, OPTIONS_LONGTEXT, true ) add_string ( "ntservice-extraintf", NULL, NULL, - EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, true ); + EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, true ) set_capability( "interface", 0 ) set_callbacks( Activate, Close ) diff --git a/modules/control/telnet.c b/modules/control/telnet.c index f1273ba0af..a321d79475 100644 --- a/modules/control/telnet.c +++ b/modules/control/telnet.c @@ -94,11 +94,11 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_CONTROL ) add_string( "telnet-host", "", NULL, TELNETHOST_TEXT, - TELNETHOST_LONGTEXT, true ); + TELNETHOST_LONGTEXT, true ) add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT, - TELNETPORT_LONGTEXT, true ); + TELNETPORT_LONGTEXT, true ) add_password( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT, - TELNETPWD_LONGTEXT, true ); + TELNETPWD_LONGTEXT, true ) set_description( N_("VLM remote control interface") ) add_category_hint( "VLM", NULL, false ) set_capability( "interface", 0 ) diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c index 5f62cd8f70..f69aff9663 100644 --- a/modules/demux/avformat/avformat.c +++ b/modules/demux/avformat/avformat.c @@ -60,7 +60,7 @@ vlc_module_begin () set_description( N_("FFmpeg muxer" ) ) set_capability( "sout mux", 2 ) add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT, - MUX_LONGTEXT, true ); + MUX_LONGTEXT, true ) set_callbacks( OpenMux, CloseMux ) #endif vlc_module_end () diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 7d398e8550..764964e3f4 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -68,9 +68,9 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "avi-interleaved", 0, NULL, - INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true ); + INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true ) add_integer( "avi-index", 0, NULL, - INDEX_TEXT, INDEX_LONGTEXT, false ); + INDEX_TEXT, INDEX_LONGTEXT, false ) change_integer_list( pi_index, ppsz_indexes, NULL ); set_callbacks( Open, Close ) diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c index 3ef046a551..8eeb91e619 100644 --- a/modules/demux/demuxdump.c +++ b/modules/demux/demuxdump.c @@ -56,9 +56,9 @@ vlc_module_begin () set_description( N_("File dumper") ) set_capability( "demux", 0 ) add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT, - FILE_LONGTEXT, false ); + FILE_LONGTEXT, false ) add_bool( "demuxdump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, - false ); + false ) set_callbacks( Open, Close ) add_shortcut( "dump" ) vlc_module_end () diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index faeaddbfa6..8af2a35a68 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -120,7 +120,7 @@ vlc_module_begin () add_integer( "rtsp-http-port", 80, NULL, N_("HTTP tunnel port"), N_("Port to use for tunneling the RTSP/RTP over HTTP."), - true ); + true ) add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); add_bool( "rtsp-kasenna", false, NULL, KASENNA_TEXT, diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp index 91cf2cad59..0864c92ed9 100644 --- a/modules/demux/mkv/matroska_segment.cpp +++ b/modules/demux/mkv/matroska_segment.cpp @@ -789,7 +789,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time ) stream_t *p_mp4_stream = stream_MemoryNew( VLC_OBJECT(&sys.demuxer), tracks[i_track]->p_extra_data, tracks[i_track]->i_extra_data, - true ); + true ) MP4_ReadBoxCommon( p_mp4_stream, p_box ); MP4_ReadBox_sample_vide( p_mp4_stream, p_box ); tracks[i_track]->fmt.i_codec = p_box->i_type; diff --git a/modules/demux/mod.c b/modules/demux/mod.c index 19c002b698..b7b2124464 100644 --- a/modules/demux/mod.c +++ b/modules/demux/mod.c @@ -73,28 +73,28 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "mod-noisereduction", true, NULL, N_("Noise reduction"), - NOISE_LONGTEXT, false ); + NOISE_LONGTEXT, false ) add_bool( "mod-reverb", false, NULL, N_("Reverb"), - REVERB_LONGTEXT, false ); + REVERB_LONGTEXT, false ) add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, - N_("Reverberation level"), REVERB_LEVEL_LONGTEXT, true ); + N_("Reverberation level"), REVERB_LEVEL_LONGTEXT, true ) add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, - N_("Reverberation delay"), REVERB_DELAY_LONGTEXT, true ); + N_("Reverberation delay"), REVERB_DELAY_LONGTEXT, true ) add_bool( "mod-megabass", false, NULL, N_("Mega bass"), - MEGABASS_LONGTEXT, false ); + MEGABASS_LONGTEXT, false ) add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, - N_("Mega bass level"), MEGABASS_LEVEL_LONGTEXT, true ); + N_("Mega bass level"), MEGABASS_LEVEL_LONGTEXT, true ) add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, - N_("Mega bass cutoff"), MEGABASS_RANGE_LONGTEXT, true ); + N_("Mega bass cutoff"), MEGABASS_RANGE_LONGTEXT, true ) add_bool( "mod-surround", false, NULL, N_("Surround"), N_("Surround"), - false ); + false ) add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, - N_("Surround level"), SURROUND_LEVEL_LONGTEXT, true ); + N_("Surround level"), SURROUND_LEVEL_LONGTEXT, true ) add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, - N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, true ); + N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, true ) set_callbacks( Open, Close ) add_shortcut( "mod" ) diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index 1e22d6f4fe..e74a6755eb 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -55,13 +55,13 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_bool( "playlist-autostart", 1, NULL, - AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false ); + AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false ) add_integer( "parent-item", 0, NULL, NULL, NULL, true ) change_internal () add_bool( "playlist-skip-ads", 1, NULL, - SKIP_ADS_TEXT, SKIP_ADS_LONGTEXT, false ); + SKIP_ADS_TEXT, SKIP_ADS_LONGTEXT, false ) set_shortname( N_("Playlist") ) set_description( N_("Playlist") ) @@ -102,7 +102,7 @@ vlc_module_begin () set_capability( "demux", 10 ) set_callbacks( Import_Shoutcast, Close_Shoutcast ) add_bool( "shoutcast-show-adult", false, NULL, - SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false ); + SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false ) add_submodule () set_description( N_("ASX playlist import") ) add_shortcut( "asx-open" ) diff --git a/modules/demux/ps.c b/modules/demux/ps.c index 8b3f99b86b..e2b6c3774a 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -62,7 +62,7 @@ vlc_module_begin () add_shortcut( "ps" ) add_bool( "ps-trust-timestamps", true, NULL, TIME_TEXT, - TIME_LONGTEXT, true ); + TIME_LONGTEXT, true ) add_submodule () set_description( N_("MPEG-PS demuxer") ) diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c index 9492b9c3d7..22ded17b8e 100644 --- a/modules/demux/rawvid.c +++ b/modules/demux/rawvid.c @@ -73,9 +73,9 @@ vlc_module_begin () add_integer( "rawvid-width", 0, 0, WIDTH_TEXT, WIDTH_LONGTEXT, 0 ) add_integer( "rawvid-height", 0, 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 ) add_string( "rawvid-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) add_string( "rawvid-aspect-ratio", NULL, NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ) vlc_module_end () /***************************************************************************** diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index b0e8466a44..1c4502552f 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -78,12 +78,12 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_float( "sub-fps", 0.0, NULL, N_("Frames per second"), - SUB_FPS_LONGTEXT, true ); + SUB_FPS_LONGTEXT, true ) add_integer( "sub-delay", 0, NULL, N_("Subtitles delay"), - SUB_DELAY_LONGTEXT, true ); + SUB_DELAY_LONGTEXT, true ) add_string( "sub-type", "auto", NULL, N_("Subtitles format"), - SUB_TYPE_LONGTEXT, true ); + SUB_TYPE_LONGTEXT, true ) change_string_list( ppsz_sub_type, NULL, NULL ); set_callbacks( Open, Close ) @@ -956,7 +956,7 @@ static int ParseSubViewer( demux_t *p_demux, subtitle_t *p_subtitle, return ParseSubRipSubViewer( p_demux, p_subtitle, "%d:%d:%d.%d,%d:%d:%d.%d", - true ); + true ) } /* ParseSSA diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c index 9c499e3f3f..7a654f302a 100644 --- a/modules/demux/subtitle_asa.c +++ b/modules/demux/subtitle_asa.c @@ -68,12 +68,12 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_float( "sub-fps", 0.0, NULL, N_("Frames per second"), - SUB_FPS_LONGTEXT, true ); + SUB_FPS_LONGTEXT, true ) add_integer( "sub-delay", 0, NULL, N_("Subtitles delay"), - SUB_DELAY_LONGTEXT, true ); + SUB_DELAY_LONGTEXT, true ) add_string( "sub-type", "auto", NULL, N_("Subtitles format"), - SUB_TYPE_LONGTEXT, true ); + SUB_TYPE_LONGTEXT, true ) set_callbacks( Open, Close ) add_shortcut( "asademux" ) diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 894a56e4f2..da9d51b04d 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -166,7 +166,7 @@ vlc_module_begin () add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, true ) add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ) add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT, - MTUOUT_LONGTEXT, true ); + MTUOUT_LONGTEXT, true ) add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ) @@ -175,7 +175,7 @@ vlc_module_begin () add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ) add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ) add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, - DUMPSIZE_LONGTEXT, true ); + DUMPSIZE_LONGTEXT, true ) set_capability( "demux", 10 ) set_callbacks( Open, Close ) @@ -1337,10 +1337,10 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - true ); + true ) stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr, - true ); + true ) for( i = 2; i < 8192; i++ ) { @@ -3091,7 +3091,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) /* Set demux filter */ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr, - true ); + true ) } else if ( p_sys->b_dvb_control ) { @@ -3910,7 +3910,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) /* Set demux filter */ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid, - true ); + true ) } } diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c index f64b4b1253..002c4411f3 100644 --- a/modules/gui/fbosd.c +++ b/modules/gui/fbosd.c @@ -180,34 +180,34 @@ vlc_module_begin () set_subcategory( SUBCAT_INTERFACE_MAIN ) add_file( "fbosd-dev", "/dev/fb1", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - false ); + false ) add_string( "fbosd-aspect-ratio", "", NULL, ASPECT_RATIO_TEXT, - ASPECT_RATIO_LONGTEXT, true ); + ASPECT_RATIO_LONGTEXT, true ) add_string( "fbosd-image", NULL, NULL, FBOSD_IMAGE_TEXT, - FBOSD_IMAGE_LONGTEXT, true ); + FBOSD_IMAGE_LONGTEXT, true ) add_string( "fbosd-text", NULL, NULL, FBOSD_TEXT, - FBOSD_LONGTEXT, true ); + FBOSD_LONGTEXT, true ) add_integer_with_range( "fbosd-alpha", 255, 0, 255, NULL, ALPHA_TEXT, - ALPHA_LONGTEXT, true ); + ALPHA_LONGTEXT, true ) set_section( N_("Position"), NULL ) add_integer( "fbosd-x", 0, NULL, POSX_TEXT, - POSX_LONGTEXT, false ); + POSX_LONGTEXT, false ) add_integer( "fbosd-y", 0, NULL, POSY_TEXT, - POSY_LONGTEXT, false ); + POSY_LONGTEXT, false ) add_integer( "fbosd-position", 8, NULL, POS_TEXT, POS_LONGTEXT, true ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); set_section( N_("Font"), NULL ) add_integer_with_range( "fbosd-font-opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, false ); + OPACITY_TEXT, OPACITY_LONGTEXT, false ) add_integer( "fbosd-font-color", 0x00FFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, - false ); + false ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( "fbosd-font-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, - false ); + false ) set_section( N_("Commands"), NULL ) add_bool( "fbosd-clear", false, NULL, CLEAR_TEXT, CLEAR_LONGTEXT, true ) diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index e7810c5446..4c50c22262 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -94,13 +94,13 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, - false ); + false ) add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT, - false ); + false ) add_bool( "macosx-eq-keep", 1, NULL, EQ_KEEP_TEXT, EQ_KEEP_LONGTEXT, - false ); + false ) add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT, - false ); + false ) add_submodule () set_description( "Mac OS X OpenGL" ) @@ -110,14 +110,14 @@ vlc_module_begin () set_callbacks( OpenVideoGL, CloseVideoGL ) add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, - false ); + false ) add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT, - false ); + false ) add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL, OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, true ); add_bool( "macosx-black", 1, NULL, BLACK_TEXT, BLACK_LONGTEXT, - false ); + false ) add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT, - false ); + false ) vlc_module_end () diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 3f301f2102..74559ba6c7 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -169,14 +169,14 @@ vlc_module_begin () add_shortcut("qt") add_integer( "qt-display-mode", QT_NORMAL_MODE, NULL, - QT_MODE_TEXT, QT_MODE_LONGTEXT, false ); + QT_MODE_TEXT, QT_MODE_LONGTEXT, false ) change_integer_list( i_mode_list, psz_mode_list_text, NULL ); add_bool( "qt-notification", true, NULL, NOTIFICATION_TEXT, - NOTIFICATION_LONGTEXT, false ); + NOTIFICATION_LONGTEXT, false ) add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT, - OPACITY_LONGTEXT, false ); + OPACITY_LONGTEXT, false ) add_bool( "qt-system-tray", true, NULL, SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false); @@ -185,9 +185,9 @@ vlc_module_begin () add_bool( "qt-video-autoresize", true, NULL, KEEPSIZE_TEXT, KEEPSIZE_LONGTEXT, false ) add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT, - TITLE_LONGTEXT, false ); + TITLE_LONGTEXT, false ) add_bool( "qt-fs-controller", true, NULL, QT_FULLSCREEN_TEXT, - QT_FULLSCREEN_TEXT, false ); + QT_FULLSCREEN_TEXT, false ) add_bool( "qt-volume-complete", false, NULL, COMPLETEVOL_TEXT, COMPLETEVOL_LONGTEXT, true ); @@ -199,28 +199,28 @@ vlc_module_begin () change_internal () add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT, - RECENTPLAY_TEXT, false ); + RECENTPLAY_TEXT, false ) add_string( "qt-recentplay-filter", "", NULL, - RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false ); + RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false ) add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT, ADVANCED_OPTIONS_LONGTEXT, true ); add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT, - ADVANCED_PREFS_LONGTEXT, false ); + ADVANCED_PREFS_LONGTEXT, false ) add_bool( "qt-error-dialogs", true, NULL, ERROR_TEXT, - ERROR_TEXT, false ); + ERROR_TEXT, false ) #ifdef UPDATE_CHECK add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT, - UPDATER_LONGTEXT, false ); + UPDATER_LONGTEXT, false ) add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT, - UPDATER_DAYS_TEXT, false ); + UPDATER_DAYS_TEXT, false ) #endif add_string( "qt-slider-colours", "255;255;255;20;226;20;255;176;15;235;30;20", - NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false ); + NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false ) add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT, - false ); + false ) change_internal () add_obsolete_bool( "qt-blingbling" ) /* Suppressed since 1.0.0 */ diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 4c7fef8b1a..564f99daf8 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -482,10 +482,10 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) add_file( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG, - true ); + true ) change_autosave () add_string( "skins2-config", "", NULL, SKINS2_CONFIG, SKINS2_CONFIG_LONG, - true ); + true ) change_autosave () change_internal () #ifdef WIN32 diff --git a/modules/gui/wince/wince.cpp b/modules/gui/wince/wince.cpp index 50cbe780ff..3580b57e0b 100644 --- a/modules/gui/wince/wince.cpp +++ b/modules/gui/wince/wince.cpp @@ -72,7 +72,7 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) add_bool( "wince-embed", 1, NULL, - EMBED_TEXT, EMBED_LONGTEXT, false ); + EMBED_TEXT, EMBED_LONGTEXT, false ) add_submodule () set_description( N_("WinCE dialogs provider") ) diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index 29a64de043..72bd1d33f5 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -159,9 +159,9 @@ vlc_module_begin () set_shortname( N_( "Audioscrobbler" ) ) set_description( N_("Submission of played songs to last.fm") ) add_string( "lastfm-username", "", NULL, - USERNAME_TEXT, USERNAME_LONGTEXT, false ); + USERNAME_TEXT, USERNAME_LONGTEXT, false ) add_password( "lastfm-password", "", NULL, - PASSWORD_TEXT, PASSWORD_LONGTEXT, false ); + PASSWORD_TEXT, PASSWORD_LONGTEXT, false ) set_capability( "interface", 0 ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index b74f5eb1f6..2e0322f360 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -135,29 +135,29 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_SUBPIC ) add_file( "freetype-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT, - false ); + false ) add_integer( "freetype-fontsize", 0, NULL, FONTSIZE_TEXT, - FONTSIZE_LONGTEXT, true ); + FONTSIZE_LONGTEXT, true ) /* opacity valid on 0..255, with default 255 = fully opaque */ add_integer_with_range( "freetype-opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, true ); + OPACITY_TEXT, OPACITY_LONGTEXT, true ) /* hook to the color values list, with default 0x00ffffff = white */ add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT, - COLOR_LONGTEXT, false ); + COLOR_LONGTEXT, false ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT, - FONTSIZER_LONGTEXT, false ); + FONTSIZER_LONGTEXT, false ) change_integer_list( pi_sizes, ppsz_sizes_text, NULL ); add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT, - EFFECT_LONGTEXT, false ); + EFFECT_LONGTEXT, false ) change_integer_list( pi_effects, ppsz_effects_text, NULL ); add_bool( "freetype-yuvp", 0, NULL, YUVP_TEXT, - YUVP_LONGTEXT, true ); + YUVP_LONGTEXT, true ) set_capability( "text renderer", 100 ) add_shortcut( "text" ) set_callbacks( Create, Destroy ) @@ -2241,7 +2241,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out, p_sub = stream_MemoryNew( VLC_OBJECT(p_filter), (uint8_t *) p_region_in->psz_html, strlen( p_region_in->psz_html ), - true ); + true ) if( p_sub ) { p_xml = xml_Create( p_filter ); diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 2543935851..9cb27723af 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -105,9 +105,9 @@ vlc_module_begin () add_obsolete_integer( "gnutls-dh-bits" ) add_integer( "gnutls-cache-timeout", CACHE_TIMEOUT, NULL, - CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, true ); + CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, true ) add_integer( "gnutls-cache-size", CACHE_SIZE, NULL, CACHE_SIZE_TEXT, - CACHE_SIZE_LONGTEXT, true ); + CACHE_SIZE_LONGTEXT, true ) vlc_module_end () static vlc_mutex_t gnutls_mutex = VLC_STATIC_MUTEX; diff --git a/modules/misc/logger.c b/modules/misc/logger.c index 9fce6b9452..c7ae3218ee 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -147,7 +147,7 @@ vlc_module_begin () add_file( "logfile", NULL, NULL, N_("Log filename"), N_("Specify the log filename."), false ); add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT, - false ); + false ) change_string_list( mode_list, mode_list_text, 0 ); add_file( "rrd-file", NULL, NULL, N_("RRD output file") , diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c index 5f386fd697..1b06125982 100644 --- a/modules/misc/lua/vlc.c +++ b/modules/misc/lua/vlc.c @@ -85,9 +85,9 @@ vlc_module_begin () set_description( N_("Lua Interface Module") ) set_capability( "interface", 0 ) add_string( "lua-intf", "dummy", NULL, - INTF_TEXT, INTF_LONGTEXT, false ); + INTF_TEXT, INTF_LONGTEXT, false ) add_string( "lua-config", "", NULL, - CONFIG_TEXT, CONFIG_LONGTEXT, false ); + CONFIG_TEXT, CONFIG_LONGTEXT, false ) set_callbacks( Open_LuaIntf, Close_LuaIntf ) vlc_module_end () diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c index ea6e1c5a4f..dfa7d4de1f 100644 --- a/modules/misc/notify/growl_udp.c +++ b/modules/misc/notify/growl_udp.c @@ -73,11 +73,11 @@ vlc_module_begin () set_description( N_("Growl UDP Notification Plugin") ) add_string( "growl-server", SERVER_DEFAULT, NULL, - SERVER_TEXT, SERVER_LONGTEXT, false ); + SERVER_TEXT, SERVER_LONGTEXT, false ) add_password( "growl-password", PASS_DEFAULT, NULL, - PASS_TEXT, PASS_LONGTEXT, false ); + PASS_TEXT, PASS_LONGTEXT, false ) add_integer( "growl-port", 9887, NULL, - PORT_TEXT, PORT_LONGTEXT, true ); + PORT_TEXT, PORT_LONGTEXT, true ) set_capability( "interface", 0 ) set_callbacks( Open, Close ) diff --git a/modules/misc/notify/msn.c b/modules/misc/notify/msn.c index 1629ca8924..227522193b 100644 --- a/modules/misc/notify/msn.c +++ b/modules/misc/notify/msn.c @@ -75,7 +75,7 @@ vlc_module_begin () set_description( N_("MSN Now-Playing") ) add_string( "msn-format", FORMAT_DEFAULT, NULL, - FORMAT_TEXT, FORMAT_LONGTEXT, false ); + FORMAT_TEXT, FORMAT_LONGTEXT, false ) set_capability( "interface", 0 ) set_callbacks( Open, Close ) diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c index f812c4a61a..2c6b0fd243 100644 --- a/modules/misc/notify/notify.c +++ b/modules/misc/notify/notify.c @@ -71,7 +71,7 @@ vlc_module_begin () set_description( N_("LibNotify Notification Plugin") ) add_integer( "notify-timeout", 4000,NULL, - TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true ); + TIMEOUT_TEXT, TIMEOUT_LONGTEXT, true ) set_capability( "interface", 0 ) set_callbacks( Open, Close ) diff --git a/modules/misc/notify/telepathy.c b/modules/misc/notify/telepathy.c index 1610a7f5c7..3c2e3d40ac 100644 --- a/modules/misc/notify/telepathy.c +++ b/modules/misc/notify/telepathy.c @@ -81,7 +81,7 @@ vlc_module_begin () set_description( N_("Telepathy \"Now Playing\" (MissionControl)") ) add_string( "telepathy-format", FORMAT_DEFAULT, NULL, - FORMAT_TEXT, FORMAT_LONGTEXT, false ); + FORMAT_TEXT, FORMAT_LONGTEXT, false ) set_capability( "interface", 0 ) set_callbacks( Open, Close ) diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c index ff72f8c0ba..a7b2b9ba00 100644 --- a/modules/misc/notify/xosd.c +++ b/modules/misc/notify/xosd.c @@ -91,12 +91,12 @@ vlc_module_begin () add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, true ) add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, true ) add_integer( "xosd-shadow-offset", 2, NULL, - SHD_OFS_TEXT, SHD_OFS_LONGTEXT, true ); + SHD_OFS_TEXT, SHD_OFS_LONGTEXT, true ) add_string( "xosd-font", "-adobe-helvetica-bold-r-normal-*-*-160-*-*-p-*-iso8859-1", - NULL, FONT_TEXT, FONT_LONGTEXT, true ); + NULL, FONT_TEXT, FONT_LONGTEXT, true ) add_string( "xosd-colour", "LawnGreen", - NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true ); + NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true ) set_capability( "interface", 10 ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c index b9f1f36ca9..e8e8e80483 100644 --- a/modules/misc/quartztext.c +++ b/modules/misc/quartztext.c @@ -115,12 +115,12 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_SUBPIC ) add_string( "quartztext-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT, - false ); + false ) add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, NULL, FONTSIZER_TEXT, - FONTSIZER_LONGTEXT, false ); + FONTSIZER_LONGTEXT, false ) change_integer_list( pi_sizes, ppsz_sizes_text, NULL ); add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT, - COLOR_LONGTEXT, false ); + COLOR_LONGTEXT, false ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); set_capability( "text renderer", 150 ) add_shortcut( "text" ) @@ -560,7 +560,7 @@ static int RenderHtml( filter_t *p_filter, subpicture_region_t *p_region_out, p_sub = stream_MemoryNew( VLC_OBJECT(p_filter), (uint8_t *) p_region_in->psz_html, strlen( p_region_in->psz_html ), - true ); + true ) if( p_sub ) { p_xml = xml_Create( p_filter ); diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index 164021e0dd..18213d409b 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -89,11 +89,11 @@ vlc_module_begin () add_shortcut( "rtsp" ) add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ) add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT, - RAWMUX_TEXT, true ); + RAWMUX_TEXT, true ) add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT, - THROTLE_LONGTEXT, true ); + THROTLE_LONGTEXT, true ) add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT, - SESSION_TIMEOUT_LONGTEXT, true ); + SESSION_TIMEOUT_LONGTEXT, true ) vlc_module_end () /***************************************************************************** diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c index afffd375cc..4475a7aef6 100644 --- a/modules/misc/win32text.c +++ b/modules/misc/win32text.c @@ -95,19 +95,19 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_SUBPIC ) add_integer( "win32text-fontsize", 0, NULL, FONTSIZE_TEXT, - FONTSIZE_LONGTEXT, true ); + FONTSIZE_LONGTEXT, true ) /* opacity valid on 0..255, with default 255 = fully opaque */ add_integer_with_range( "win32-opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, false ); + OPACITY_TEXT, OPACITY_LONGTEXT, false ) /* hook to the color values list, with default 0x00ffffff = white */ add_integer( "win32text-color", 0x00FFFFFF, NULL, COLOR_TEXT, - COLOR_LONGTEXT, true ); + COLOR_LONGTEXT, true ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( "win32text-rel-fontsize", 16, NULL, FONTSIZER_TEXT, - FONTSIZER_LONGTEXT, false ); + FONTSIZER_LONGTEXT, false ) change_integer_list( pi_sizes, ppsz_sizes_text, NULL ); set_capability( "text renderer", 50 ) diff --git a/modules/mux/asf.c b/modules/mux/asf.c index d9cd5a3eba..7ae86d4c10 100644 --- a/modules/mux/asf.c +++ b/modules/mux/asf.c @@ -77,19 +77,19 @@ vlc_module_begin () set_callbacks( Open, Close ) add_string( SOUT_CFG_PREFIX "title", "", NULL, TITLE_TEXT, TITLE_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "author", "", NULL, AUTHOR_TEXT, - AUTHOR_LONGTEXT, true ); + AUTHOR_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "copyright","", NULL, COPYRIGHT_TEXT, - COPYRIGHT_LONGTEXT, true ); + COPYRIGHT_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "comment", "", NULL, COMMENT_TEXT, - COMMENT_LONGTEXT, true ); + COMMENT_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "rating", "", NULL, RATING_TEXT, - RATING_LONGTEXT, true ); + RATING_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "packet-size", 4096, NULL, PACKETSIZE_TEXT, - PACKETSIZE_LONGTEXT, true ); + PACKETSIZE_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "bitrate-override", 0, NULL, BITRATE_TEXT, - BITRATE_LONGTEXT, true ); + BITRATE_LONGTEXT, true ) vlc_module_end () diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c index 3c93a9c485..d82da6e379 100644 --- a/modules/mux/mp4.c +++ b/modules/mux/mp4.c @@ -64,7 +64,7 @@ vlc_module_begin () add_bool( SOUT_CFG_PREFIX "faststart", 1, NULL, FASTSTART_TEXT, FASTSTART_LONGTEXT, - true ); + true ) set_capability( "sout mux", 5 ) add_shortcut( "mp4" ) add_shortcut( "mov" ) diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c index a5a062f4a0..0f5667d07e 100644 --- a/modules/mux/mpeg/ps.c +++ b/modules/mux/mpeg/ps.c @@ -73,9 +73,9 @@ vlc_module_begin () set_callbacks( Open, Close ) add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT, - DTS_LONGTEXT, true ); + DTS_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "pes-max-size", PES_PAYLOAD_SIZE_MAX, NULL, - PES_SIZE_TEXT, PES_SIZE_LONGTEXT, true ); + PES_SIZE_TEXT, PES_SIZE_LONGTEXT, true ) vlc_module_end () /***************************************************************************** diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 4f350782bf..286508289e 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -199,55 +199,55 @@ vlc_module_begin () add_shortcut( "ts" ) add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT, - true ); + true ) add_integer( SOUT_CFG_PREFIX "pid-audio", 0, NULL, APID_TEXT, - APID_LONGTEXT, true ); + APID_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "pid-spu", 0, NULL, SPUPID_TEXT, - SPUPID_LONGTEXT, true ); + SPUPID_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "pid-pmt", 0, NULL, PMTPID_TEXT, - PMTPID_LONGTEXT, true ); + PMTPID_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "tsid", 0, NULL, TSID_TEXT, - TSID_LONGTEXT, true ); + TSID_LONGTEXT, true ) #ifdef HAVE_DVBPSI_SDT add_integer( SOUT_CFG_PREFIX "netid", 0, NULL, NETID_TEXT, - NETID_LONGTEXT, true ); + NETID_LONGTEXT, true ) #endif add_string( SOUT_CFG_PREFIX "program-pmt", NULL, NULL, PMTPROG_TEXT, - PMTPROG_LONGTEXT, true ); + PMTPROG_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true ) #ifdef HAVE_DVBPSI_SDT add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true ) #endif add_bool( SOUT_CFG_PREFIX "alignment", true, NULL, ALIGNMENT_TEXT, - ALIGNMENT_LONGTEXT, true ); + ALIGNMENT_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "shaping", 200, NULL, SHAPING_TEXT, - SHAPING_LONGTEXT, true ); + SHAPING_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "use-key-frames", false, NULL, KEYF_TEXT, - KEYF_LONGTEXT, true ); + KEYF_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "pcr", 70, NULL, PCR_TEXT, PCR_LONGTEXT, - true ); + true ) add_integer( SOUT_CFG_PREFIX "bmin", 0, NULL, BMIN_TEXT, BMIN_LONGTEXT, - true ); + true ) add_integer( SOUT_CFG_PREFIX "bmax", 0, NULL, BMAX_TEXT, BMAX_LONGTEXT, - true ); + true ) add_integer( SOUT_CFG_PREFIX "dts-delay", 400, NULL, DTS_TEXT, - DTS_LONGTEXT, true ); + DTS_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "crypt-audio", true, NULL, ACRYPT_TEXT, - ACRYPT_LONGTEXT, true ); + ACRYPT_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "crypt-video", true, NULL, VCRYPT_TEXT, - VCRYPT_LONGTEXT, true ); + VCRYPT_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "csa-ck", NULL, NULL, CK_TEXT, CK_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "csa2-ck", NULL, NULL, CK2_TEXT, CK2_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "csa-use", "1", NULL, CU_TEXT, CU_LONGTEXT, - true ); + true ) add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ) set_callbacks( Open, Close ) diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c index ad0f7da1c0..23c2eef48a 100644 --- a/modules/packetizer/mpegvideo.c +++ b/modules/packetizer/mpegvideo.c @@ -73,7 +73,7 @@ vlc_module_begin () set_callbacks( Open, Close ) add_bool( "packetizer-mpegvideo-sync-iframe", 0, NULL, SYNC_INTRAFRAME_TEXT, - SYNC_INTRAFRAME_LONGTEXT, true ); + SYNC_INTRAFRAME_LONGTEXT, true ) vlc_module_end () /***************************************************************************** diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index e3e829518a..e716731b1e 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -69,7 +69,7 @@ vlc_module_begin () set_subcategory( SUBCAT_PLAYLIST_SD ) add_string( "podcast-urls", NULL, NULL, - URLS_TEXT, URLS_LONGTEXT, false ); + URLS_TEXT, URLS_LONGTEXT, false ) change_autosave () set_capability( "services_discovery", 0 ) diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index 6eda5808a6..b7286ff31f 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -127,20 +127,20 @@ vlc_module_begin () set_subcategory( SUBCAT_PLAYLIST_SD ) add_string( "sap-addr", NULL, NULL, - SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true ); + SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true ) add_bool( "sap-ipv4", 1 , NULL, - SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true ); + SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true ) add_bool( "sap-ipv6", 1 , NULL, - SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, true ); + SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, true ) add_integer( "sap-timeout", 1800, NULL, - SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true ); + SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true ) add_bool( "sap-parse", 1 , NULL, - SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, true ); + SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, true ) add_bool( "sap-strict", 0 , NULL, - SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, true ); + SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, true ) #if 0 add_bool( "sap-cache", 0 , NULL, - SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true ); + SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true ) #endif add_obsolete_bool( "sap-timeshift" ) /* Redumdant since 1.0.0 */ diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c index d329f834dc..16d6b4927a 100644 --- a/modules/stream_out/bridge.c +++ b/modules/stream_out/bridge.c @@ -99,9 +99,9 @@ vlc_module_begin () set_category( CAT_SOUT ) set_subcategory( SUBCAT_SOUT_STREAM )*/ add_integer( SOUT_CFG_PREFIX_OUT "id", 0, NULL, ID_TEXT, ID_LONGTEXT, - false ); + false ) add_string( SOUT_CFG_PREFIX_OUT "in-name", "default", NULL, - DEST_TEXT, DEST_LONGTEXT, false ); + DEST_TEXT, DEST_LONGTEXT, false ) set_callbacks( OpenOut, CloseOut ) add_submodule () @@ -111,17 +111,17 @@ vlc_module_begin () /*set_category( CAT_SOUT ) set_subcategory( SUBCAT_SOUT_STREAM )*/ add_integer( SOUT_CFG_PREFIX_IN "delay", 0, NULL, DELAY_TEXT, - DELAY_LONGTEXT, false ); + DELAY_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, NULL, ID_OFFSET_TEXT, - ID_OFFSET_LONGTEXT, false ); + ID_OFFSET_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX_IN "name", "default", NULL, - NAME_TEXT, NAME_LONGTEXT, false ); + NAME_TEXT, NAME_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX_IN "placeholder", false, NULL, - PLACEHOLDER_TEXT, PLACEHOLDER_LONGTEXT, false ); + PLACEHOLDER_TEXT, PLACEHOLDER_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX_IN "placeholder-delay", 200, NULL, - PLACEHOLDER_DELAY_TEXT, PLACEHOLDER_DELAY_LONGTEXT, false ); + PLACEHOLDER_DELAY_TEXT, PLACEHOLDER_DELAY_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX_IN "placeholder-switch-on-iframe", true, NULL, - PLACEHOLDER_IFRAME_TEXT, PLACEHOLDER_IFRAME_LONGTEXT, false ); + PLACEHOLDER_IFRAME_TEXT, PLACEHOLDER_IFRAME_LONGTEXT, false ) set_callbacks( OpenIn, CloseIn ) vlc_module_end () diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c index 88b5595e4a..1536d860f0 100644 --- a/modules/stream_out/display.c +++ b/modules/stream_out/display.c @@ -58,11 +58,11 @@ vlc_module_begin () set_category( CAT_SOUT ) set_subcategory( SUBCAT_SOUT_STREAM ) add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT, - AUDIO_LONGTEXT, true ); + AUDIO_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT, - VIDEO_LONGTEXT, true ); + VIDEO_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT, - DELAY_LONGTEXT, true ); + DELAY_LONGTEXT, true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c index abdd29dbb8..64f5fcbb99 100644 --- a/modules/stream_out/es.c +++ b/modules/stream_out/es.c @@ -84,27 +84,27 @@ vlc_module_begin () set_section( N_("Generic"), NULL ) add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT, - ACCESS_LONGTEXT, true ); + ACCESS_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, true ); + MUX_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, true ); + DEST_LONGTEXT, true ) set_section( N_("Audio"), NULL ) add_string( SOUT_CFG_PREFIX "access-audio", "", NULL, ACCESSA_TEXT, - ACCESSA_LONGTEXT, true ); + ACCESSA_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "mux-audio", "", NULL, MUXA_TEXT, - MUXA_LONGTEXT, true ); + MUXA_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT, - DESTA_LONGTEXT, true ); + DESTA_LONGTEXT, true ) set_section( N_("Video"), NULL ) add_string( SOUT_CFG_PREFIX "access-video", "", NULL, ACCESSV_TEXT, - ACCESSV_LONGTEXT, true ); + ACCESSV_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "mux-video", "", NULL, MUXV_TEXT, - MUXV_LONGTEXT, true ); + MUXV_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT, - DESTV_LONGTEXT, true ); + DESTV_LONGTEXT, true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index aa11d6a0e3..247a7dfc22 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -176,21 +176,21 @@ vlc_module_begin () add_shortcut( "mosaic-bridge" ) add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT, - false ); + false ) add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT, - WIDTH_LONGTEXT, true ); + WIDTH_LONGTEXT, true ) add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT, - HEIGHT_LONGTEXT, true ); + HEIGHT_LONGTEXT, true ) add_string( CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT, - RATIO_LONGTEXT, false ); + RATIO_LONGTEXT, false ) add_string( CFG_PREFIX "chroma", 0, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - false ); + false ) add_module_list( CFG_PREFIX "vfilter", "video filter2", - NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false ); + NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL, - ALPHA_TEXT, ALPHA_LONGTEXT, false ); + ALPHA_TEXT, ALPHA_LONGTEXT, false ) add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false ) add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false ) diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c index 5aeb7bc307..3ab44d7314 100644 --- a/modules/stream_out/raop.c +++ b/modules/stream_out/raop.c @@ -152,9 +152,9 @@ vlc_module_begin(); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_STREAM ); add_string( SOUT_CFG_PREFIX "host", "", NULL, - HOST_TEXT, HOST_LONGTEXT, false ); + HOST_TEXT, HOST_LONGTEXT, false ) add_integer_with_range( SOUT_CFG_PREFIX "volume", 100, 0, 255, NULL, - VOLUME_TEXT, VOLUME_LONGTEXT, false ); + VOLUME_TEXT, VOLUME_LONGTEXT, false ) set_callbacks( Open, Close ); vlc_module_end(); diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c index 8d42371f36..c423ebed77 100644 --- a/modules/stream_out/record.c +++ b/modules/stream_out/record.c @@ -63,7 +63,7 @@ vlc_module_begin () set_subcategory( SUBCAT_SOUT_STREAM ) add_string( SOUT_CFG_PREFIX "dst-prefix", "", NULL, DST_PREFIX_TEXT, - DST_PREFIX_LONGTEXT, true ); + DST_PREFIX_LONGTEXT, true ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 9c572166e7..ede24afa63 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -167,47 +167,47 @@ vlc_module_begin () set_subcategory( SUBCAT_SOUT_STREAM ) add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, true ); + DEST_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT, - SDP_LONGTEXT, true ); + SDP_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, true ); + MUX_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, - NAME_LONGTEXT, true ); + NAME_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, - DESC_LONGTEXT, true ); + DESC_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, - URL_LONGTEXT, true ); + URL_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, - EMAIL_LONGTEXT, true ); + EMAIL_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, - PHONE_LONGTEXT, true ); + PHONE_LONGTEXT, true ) add_string( SOUT_CFG_PREFIX "proto", "udp", NULL, PROTO_TEXT, - PROTO_LONGTEXT, false ); + PROTO_LONGTEXT, false ) change_string_list( ppsz_protos, ppsz_protocols, NULL ); add_integer( SOUT_CFG_PREFIX "port", 5004, NULL, PORT_TEXT, - PORT_LONGTEXT, true ); + PORT_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "port-audio", 0, NULL, PORT_AUDIO_TEXT, - PORT_AUDIO_LONGTEXT, true ); + PORT_AUDIO_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "port-video", 0, NULL, PORT_VIDEO_TEXT, - PORT_VIDEO_LONGTEXT, true ); + PORT_VIDEO_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "ttl", -1, NULL, TTL_TEXT, - TTL_LONGTEXT, true ); + TTL_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "rtcp-mux", false, NULL, - RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, false ); + RTCP_MUX_TEXT, RTCP_MUX_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "key", "", NULL, - SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false ); + SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "salt", "", NULL, - SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false ); + SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT, - RFC3016_LONGTEXT, false ); + RFC3016_LONGTEXT, false ) set_callbacks( Open, Close ) vlc_module_end () diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index dc45025041..6f43cc673b 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -106,30 +106,30 @@ vlc_module_begin () set_subcategory( SUBCAT_SOUT_STREAM ) add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT, - ACCESS_LONGTEXT, false ); + ACCESS_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, false ); + MUX_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, false ); + DEST_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT, - BIND_LONGTEXT, false ); + BIND_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT, - PATH_LONGTEXT, false ); + PATH_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, - true ); + true ) add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ) set_callbacks( Open, Close ) diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c index a0c67fd9a3..dba845fb71 100644 --- a/modules/stream_out/switcher.c +++ b/modules/stream_out/switcher.c @@ -117,21 +117,21 @@ vlc_module_begin () set_callbacks( Open, Close ) add_string( SOUT_CFG_PREFIX "files", "", NULL, FILES_TEXT, - FILES_LONGTEXT, false ); + FILES_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "sizes", "", NULL, SIZES_TEXT, - SIZES_LONGTEXT, false ); + SIZES_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "aspect-ratio", "4:3", NULL, RATIO_TEXT, - RATIO_LONGTEXT, false ); + RATIO_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "port", 5001, NULL, - PORT_TEXT, PORT_LONGTEXT, true ); + PORT_TEXT, PORT_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "command", 0, NULL, - COMMAND_TEXT, COMMAND_LONGTEXT, true ); + COMMAND_TEXT, COMMAND_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "gop", 8, NULL, - GOP_TEXT, GOP_LONGTEXT, true ); + GOP_TEXT, GOP_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "qscale", 5, NULL, - QSCALE_TEXT, QSCALE_LONGTEXT, true ); + QSCALE_TEXT, QSCALE_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "mute-audio", 1, NULL, - AUDIO_TEXT, AUDIO_LONGTEXT, true ); + AUDIO_TEXT, AUDIO_LONGTEXT, true ) vlc_module_end () static const char *const ppsz_sout_options[] = { diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index afcd0fe38f..f9d7a27d4f 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -168,72 +168,72 @@ vlc_module_begin () set_subcategory( SUBCAT_SOUT_STREAM ) set_section( N_("Video"), NULL ) add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT, - VENC_LONGTEXT, false ); + VENC_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT, - VCODEC_LONGTEXT, false ); + VCODEC_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT, - VB_LONGTEXT, false ); + VB_LONGTEXT, false ) add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_TEXT, - SCALE_LONGTEXT, false ); + SCALE_LONGTEXT, false ) add_float( SOUT_CFG_PREFIX "fps", 0, NULL, FPS_TEXT, - FPS_LONGTEXT, false ); + FPS_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "hurry-up", true, NULL, HURRYUP_TEXT, - HURRYUP_LONGTEXT, false ); + HURRYUP_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT, - DEINTERLACE_LONGTEXT, false ); + DEINTERLACE_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL, DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT, - false ); + false ) change_string_list( ppsz_deinterlace_type, 0, 0 ); add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT, - WIDTH_LONGTEXT, true ); + WIDTH_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT, - HEIGHT_LONGTEXT, true ); + HEIGHT_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "maxwidth", 0, NULL, MAXWIDTH_TEXT, - MAXWIDTH_LONGTEXT, true ); + MAXWIDTH_LONGTEXT, true ) add_integer( SOUT_CFG_PREFIX "maxheight", 0, NULL, MAXHEIGHT_TEXT, - MAXHEIGHT_LONGTEXT, true ); + MAXHEIGHT_LONGTEXT, true ) add_module_list( SOUT_CFG_PREFIX "vfilter", "video filter2", NULL, NULL, - VFILTER_TEXT, VFILTER_LONGTEXT, false ); + VFILTER_TEXT, VFILTER_LONGTEXT, false ) set_section( N_("Audio"), NULL ) add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT, - AENC_LONGTEXT, false ); + AENC_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT, - ACODEC_LONGTEXT, false ); + ACODEC_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "ab", 0, NULL, AB_TEXT, - AB_LONGTEXT, false ); + AB_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "channels", 0, NULL, ACHANS_TEXT, - ACHANS_LONGTEXT, false ); + ACHANS_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT, - ARATE_LONGTEXT, true ); + ARATE_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT, - ASYNC_LONGTEXT, false ); + ASYNC_LONGTEXT, false ) add_module_list( SOUT_CFG_PREFIX "afilter", "audio filter2", NULL, NULL, - AFILTER_TEXT, AFILTER_LONGTEXT, false ); + AFILTER_TEXT, AFILTER_LONGTEXT, false ) set_section( N_("Overlays/Subtitles"), NULL ) add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT, - SENC_LONGTEXT, false ); + SENC_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT, - SCODEC_LONGTEXT, false ); + SCODEC_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT, - SCODEC_LONGTEXT, false ); + SCODEC_LONGTEXT, false ) add_module_list( SOUT_CFG_PREFIX "sfilter", "video filter", NULL, NULL, - SFILTER_TEXT, SFILTER_LONGTEXT, false ); + SFILTER_TEXT, SFILTER_LONGTEXT, false ) set_section( N_("On Screen Display"), NULL ) add_bool( SOUT_CFG_PREFIX "osd", 0, NULL, OSD_TEXT, - OSD_LONGTEXT, false ); + OSD_LONGTEXT, false ) set_section( N_("Miscellaneous"), NULL ) add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT, - THREADS_LONGTEXT, true ); + THREADS_LONGTEXT, true ) add_bool( SOUT_CFG_PREFIX "high-priority", 0, NULL, HP_TEXT, HP_LONGTEXT, - true ); + true ) vlc_module_end () diff --git a/modules/stream_out/transrate/transrate.c b/modules/stream_out/transrate/transrate.c index 3f2f08e79a..af73e7c2ef 100644 --- a/modules/stream_out/transrate/transrate.c +++ b/modules/stream_out/transrate/transrate.c @@ -83,11 +83,11 @@ vlc_module_begin () set_callbacks( Open, Close ) add_integer( SOUT_CFG_PREFIX "vb", 3 * 100 * 1000, NULL, - VB_TEXT, VB_LONGTEXT, false ); + VB_TEXT, VB_LONGTEXT, false ) add_integer( SOUT_CFG_PREFIX "shaping", 500, NULL, - SHAPING_TEXT, SHAPING_LONGTEXT, false ); + SHAPING_TEXT, SHAPING_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "mpeg4-matrix", false, NULL, - MPEG4_MATRIX_TEXT, MPEG4_MATRIX_LONGTEXT, false ); + MPEG4_MATRIX_TEXT, MPEG4_MATRIX_LONGTEXT, false ) vlc_module_end () static const char *const ppsz_sout_options[] = { diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index e33a39bf7c..721b1db61f 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -86,18 +86,18 @@ vlc_module_begin () set_capability( "video filter2", 0 ) add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, - CONT_TEXT, CONT_LONGTEXT, false ); + CONT_TEXT, CONT_LONGTEXT, false ) add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, - LUM_TEXT, LUM_LONGTEXT, false ); + LUM_TEXT, LUM_LONGTEXT, false ) add_integer_with_range( "hue", 0, 0, 360, NULL, - HUE_TEXT, HUE_LONGTEXT, false ); + HUE_TEXT, HUE_LONGTEXT, false ) add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, - SAT_TEXT, SAT_LONGTEXT, false ); + SAT_TEXT, SAT_LONGTEXT, false ) add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL, - GAMMA_TEXT, GAMMA_LONGTEXT, false ); + GAMMA_TEXT, GAMMA_LONGTEXT, false ) add_bool( "brightness-threshold", 0, NULL, - THRES_TEXT, THRES_LONGTEXT, false ); + THRES_TEXT, THRES_LONGTEXT, false ) add_shortcut( "adjust" ) set_callbacks( Create, Destroy ) diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c index 462d4e0502..bdc6132fad 100644 --- a/modules/video_filter/alphamask.c +++ b/modules/video_filter/alphamask.c @@ -71,7 +71,7 @@ vlc_module_begin () set_callbacks( Create, Destroy ) add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT, - MASK_LONGTEXT, false ); + MASK_LONGTEXT, false ) vlc_module_end () static const char *const ppsz_filter_options[] = { diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp index 3af9ccb78c..1d4c04e8d0 100644 --- a/modules/video_filter/atmo/atmo.cpp +++ b/modules/video_filter/atmo/atmo.cpp @@ -303,18 +303,18 @@ set_section( N_("Choose between the built-in AtmoLight "\ add_bool(CFG_PREFIX "usebuildin", true, NULL, USEBUILDIN_TEXT, USEBUILDIN_LONGTEXT, false); add_string(CFG_PREFIX "serialdev", "COM1", NULL, - SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false ); + SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false ) /* on win32 the executeable external driver application for automatic start if needed */ add_file(CFG_PREFIX "atmowinexe", NULL, NULL, - ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false ); + ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false ) #else set_section( N_("Enter the connection of your AtmoLight hardware" ), 0 ) add_string(CFG_PREFIX "serialdev", "/dev/ttyS01", NULL, - SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false ); + SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false ) #endif /* @@ -371,7 +371,7 @@ add_integer_with_range(CFG_PREFIX "SatWinSize", 3, 0, 5, NULL, SATWINSIZE_TEXT, SATWINSIZE_LONGTEXT, false); add_integer(CFG_PREFIX "filtermode", (int)afmCombined, NULL, - FILTERMODE_TEXT, FILTERMODE_LONGTEXT, false ); + FILTERMODE_TEXT, FILTERMODE_LONGTEXT, false ) change_integer_list(pi_filtermode_values, ppsz_filtermode_descriptions, NULL ); @@ -392,27 +392,27 @@ add_integer_with_range(CFG_PREFIX "FrameDelay", 18, 0, 35, NULL, */ set_section( N_("Change channel assignment (fixes wrong wiring)" ), 0 ) add_integer( CFG_PREFIX "channel_0", 0, NULL, - CHANNEL_0_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ); + CHANNEL_0_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ) change_integer_list( pi_channel_assignment_values, ppsz_channel_assignment_descriptions, 0 ); add_integer( CFG_PREFIX "channel_1", 1, NULL, - CHANNEL_1_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ); + CHANNEL_1_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ) change_integer_list( pi_channel_assignment_values, ppsz_channel_assignment_descriptions, 0 ); add_integer( CFG_PREFIX "channel_2", 2, NULL, - CHANNEL_2_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ); + CHANNEL_2_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ) change_integer_list( pi_channel_assignment_values, ppsz_channel_assignment_descriptions, 0 ); add_integer( CFG_PREFIX "channel_3", 3, NULL, - CHANNEL_3_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ); + CHANNEL_3_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ) change_integer_list( pi_channel_assignment_values, ppsz_channel_assignment_descriptions, 0 ); add_integer( CFG_PREFIX "channel_4", 4, NULL, - CHANNEL_4_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ); + CHANNEL_4_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false ) change_integer_list( pi_channel_assignment_values, ppsz_channel_assignment_descriptions, 0 ); @@ -458,7 +458,7 @@ add_file(CFG_PREFIX "gradient_zone_4", NULL, NULL, add_bool(CFG_PREFIX "saveframes", false, NULL, SAVEFRAMES_TEXT, SAVEFRAMES_LONGTEXT, false); add_string(CFG_PREFIX "framepath", "", NULL, - FRAMEPATH_TEXT, FRAMEPATH_LONGTEXT, false ); + FRAMEPATH_TEXT, FRAMEPATH_LONGTEXT, false ) #endif /* may be later if computers gets more power ;-) than now we increase diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c index cde706bece..6adf28369b 100644 --- a/modules/video_filter/blendbench.c +++ b/modules/video_filter/blendbench.c @@ -79,21 +79,21 @@ vlc_module_begin () set_section( N_("Benchmarking"), NULL ) add_integer( CFG_PREFIX "loops", 1000, NULL, LOOPS_TEXT, - LOOPS_LONGTEXT, false ); + LOOPS_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, NULL, ALPHA_TEXT, - ALPHA_LONGTEXT, false ); + ALPHA_LONGTEXT, false ) set_section( N_("Base image"), NULL ) add_file( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT, - BASE_IMAGE_LONGTEXT, false ); + BASE_IMAGE_LONGTEXT, false ) add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT, - BASE_CHROMA_LONGTEXT, false ); + BASE_CHROMA_LONGTEXT, false ) set_section( N_("Blend image"), NULL ) add_file( CFG_PREFIX "blend-image", NULL, NULL, BLEND_IMAGE_TEXT, - BLEND_IMAGE_LONGTEXT, false ); + BLEND_IMAGE_LONGTEXT, false ) add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT, - BLEND_CHROMA_LONGTEXT, false ); + BLEND_CHROMA_LONGTEXT, false ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c index 52604fa7ca..61f07a40e1 100644 --- a/modules/video_filter/bluescreen.c +++ b/modules/video_filter/bluescreen.c @@ -86,15 +86,15 @@ vlc_module_begin () set_callbacks( Create, Destroy ) add_integer_with_range( CFG_PREFIX "u", 120, 0, 255, NULL, - BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false ); + BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "v", 90, 0, 255, NULL, - BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, false ); + BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "ut", 17, 0, 255, NULL, BLUESCREENUTOL_TEXT, BLUESCREENUTOL_LONGTEXT, - false ); + false ) add_integer_with_range( CFG_PREFIX "vt", 17, 0, 255, NULL, BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT, - false ); + false ) vlc_module_end () static const char *const ppsz_filter_options[] = { diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c index 00e3944370..ef48f2236b 100644 --- a/modules/video_filter/canvas.c +++ b/modules/video_filter/canvas.c @@ -69,15 +69,15 @@ vlc_module_begin () set_callbacks( Activate, Destroy ) add_integer_with_range( CFG_PREFIX "width", 0, 0, INT_MAX, NULL, - WIDTH_TEXT, WIDTH_LONGTEXT, false ); + WIDTH_TEXT, WIDTH_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "height", 0, 0, INT_MAX, NULL, - HEIGHT_TEXT, HEIGHT_LONGTEXT, false ); + HEIGHT_TEXT, HEIGHT_LONGTEXT, false ) add_string( CFG_PREFIX "aspect", "4:3", NULL, - ASPECT_TEXT, ASPECT_LONGTEXT, false ); + ASPECT_TEXT, ASPECT_LONGTEXT, false ) add_bool( CFG_PREFIX "padd", true, NULL, - PADD_TEXT, PADD_LONGTEXT, false ); + PADD_TEXT, PADD_LONGTEXT, false ) vlc_module_end () static const char *const ppsz_filter_options[] = { diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index 9aefc96c6f..583489242f 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -71,7 +71,7 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) set_capability( "video filter2", 0 ) add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT, - COLOR_LONGTEXT, false ); + COLOR_LONGTEXT, false ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( CFG_PREFIX "saturationthres", 20, NULL, _("Saturaton threshold"), "", false ); diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c index 5176f3a205..385c4ba8a5 100644 --- a/modules/video_filter/crop.c +++ b/modules/video_filter/crop.c @@ -108,29 +108,29 @@ vlc_module_begin () set_capability( "video filter", 0 ) add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, - GEOMETRY_LONGTEXT, false ); + GEOMETRY_LONGTEXT, false ) add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, - AUTOCROP_LONGTEXT, false ); + AUTOCROP_LONGTEXT, false ) #ifdef BEST_AUTOCROP add_integer_with_range( "autocrop-ratio-max", 2405, 0, RATIO_MAX, NULL, - RATIOMAX_TEXT, RATIOMAX_LONGTEXT, true ); + RATIOMAX_TEXT, RATIOMAX_LONGTEXT, true ) add_integer_with_range( "crop-ratio", 0, 0, RATIO_MAX, NULL, RATIO_TEXT, - RATIO_LONGTEXT, false ); + RATIO_LONGTEXT, false ) add_integer( "autocrop-time", 25, NULL, TIME_TEXT, - TIME_LONGTEXT, true ); + TIME_LONGTEXT, true ) add_integer( "autocrop-diff", 16, NULL, DIFF_TEXT, - DIFF_LONGTEXT, true ); + DIFF_LONGTEXT, true ) add_integer( "autocrop-non-black-pixels", 3, NULL, - NBP_TEXT, NBP_LONGTEXT, true ); + NBP_TEXT, NBP_LONGTEXT, true ) add_integer_with_range( "autocrop-skip-percent", 17, 0, 100, NULL, - SKIP_TEXT, SKIP_LONGTEXT, true ); + SKIP_TEXT, SKIP_LONGTEXT, true ) add_integer_with_range( "autocrop-luminance-threshold", 40, 0, 128, NULL, - LUM_TEXT, LUM_LONGTEXT, true ); + LUM_TEXT, LUM_LONGTEXT, true ) #endif //BEST_AUTOCROP add_shortcut( "crop" ) diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c index 97d96cfca3..9c23c6b5e1 100644 --- a/modules/video_filter/croppadd.c +++ b/modules/video_filter/croppadd.c @@ -82,23 +82,23 @@ vlc_module_begin () set_section( N_("Crop"), NULL ) add_integer_with_range( CFG_PREFIX "croptop", 0, 0, INT_MAX, NULL, - CROPTOP_TEXT, CROPTOP_LONGTEXT, false ); + CROPTOP_TEXT, CROPTOP_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "cropbottom", 0, 0, INT_MAX, NULL, - CROPBOTTOM_TEXT, CROPBOTTOM_LONGTEXT, false ); + CROPBOTTOM_TEXT, CROPBOTTOM_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "cropleft", 0, 0, INT_MAX, NULL, - CROPLEFT_TEXT, CROPLEFT_LONGTEXT, false ); + CROPLEFT_TEXT, CROPLEFT_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "cropright", 0, 0, INT_MAX, NULL, - CROPRIGHT_TEXT, CROPRIGHT_LONGTEXT, false ); + CROPRIGHT_TEXT, CROPRIGHT_LONGTEXT, false ) set_section( N_("Padd"), NULL ) add_integer_with_range( CFG_PREFIX "paddtop", 0, 0, INT_MAX, NULL, - PADDTOP_TEXT, PADDTOP_LONGTEXT, false ); + PADDTOP_TEXT, PADDTOP_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "paddbottom", 0, 0, INT_MAX, NULL, - PADDBOTTOM_TEXT, PADDBOTTOM_LONGTEXT, false ); + PADDBOTTOM_TEXT, PADDBOTTOM_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "paddleft", 0, 0, INT_MAX, NULL, - PADDLEFT_TEXT, PADDLEFT_LONGTEXT, false ); + PADDLEFT_TEXT, PADDLEFT_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "paddright", 0, 0, INT_MAX, NULL, - PADDRIGHT_TEXT, PADDRIGHT_LONGTEXT, false ); + PADDRIGHT_TEXT, PADDRIGHT_LONGTEXT, false ) vlc_module_end () static const char *const ppsz_filter_options[] = { diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c index 5280f85ada..f0498bca18 100644 --- a/modules/video_filter/deinterlace.c +++ b/modules/video_filter/deinterlace.c @@ -131,7 +131,7 @@ vlc_module_begin () set_section( N_("Display"),NULL) add_string( "deinterlace-mode", "discard", NULL, MODE_TEXT, - MODE_LONGTEXT, false ); + MODE_LONGTEXT, false ) change_string_list( mode_list, mode_list_text, 0 ); add_shortcut( "deinterlace" ) @@ -141,7 +141,7 @@ vlc_module_begin () set_capability( "video filter2", 0 ) set_section( N_("Streaming"),NULL) add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT, - SOUT_MODE_LONGTEXT, false ); + SOUT_MODE_LONGTEXT, false ) change_string_list( mode_list, mode_list_text, 0 ); set_callbacks( OpenFilter, CloseFilter ) vlc_module_end () diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index be3327dd01..c015c4ccbc 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c @@ -69,9 +69,9 @@ vlc_module_begin () set_capability( "sub filter", 0 ) add_file( "overlay-input", NULL, NULL, INPUT_TEXT, INPUT_LONGTEXT, - false ); + false ) add_file( "overlay-output", NULL, NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT, - false ); + false ) add_shortcut( "overlay" ) set_callbacks( Create, Destroy ) diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index a01423014e..faddc8ea36 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -70,7 +70,7 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_file( CFG_PREFIX "mask", NULL, NULL, - MASK_TEXT, MASK_LONGTEXT, false ); + MASK_TEXT, MASK_LONGTEXT, false ) add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false ) add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false ) diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c index 3a038c5d1d..40df5bc16c 100644 --- a/modules/video_filter/extract.c +++ b/modules/video_filter/extract.c @@ -80,7 +80,7 @@ vlc_module_begin () add_shortcut( "extract" ) add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF, - NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false ); + NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false ) change_integer_list( pi_component_values, ppsz_component_descriptions, NULL ); set_callbacks( Create, Destroy ) diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c index 5819337b41..a8f96efc68 100644 --- a/modules/video_filter/gaussianblur.c +++ b/modules/video_filter/gaussianblur.c @@ -59,7 +59,7 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_float( FILTER_PREFIX "sigma", 2., NULL, SIGMA_TEXT, SIGMA_LONGTEXT, - false ); + false ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index b9eaf4338d..975c509ef7 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -84,13 +84,13 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_string( FILTER_PREFIX "mode", "gradient", NULL, - MODE_TEXT, MODE_LONGTEXT, false ); + MODE_TEXT, MODE_LONGTEXT, false ) change_string_list( mode_list, mode_list_text, 0 ); add_integer_with_range( FILTER_PREFIX "type", 0, 0, 1, NULL, - GRADIENT_TEXT, GRADIENT_LONGTEXT, false ); + GRADIENT_TEXT, GRADIENT_LONGTEXT, false ) add_bool( FILTER_PREFIX "cartoon", 1, NULL, - CARTOON_TEXT, CARTOON_LONGTEXT, false ); + CARTOON_TEXT, CARTOON_LONGTEXT, false ) add_shortcut( "gradient" ) set_callbacks( Create, Destroy ) diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 941ca223e8..0d5ee56b87 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -116,7 +116,7 @@ vlc_module_begin () add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, true ) add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, true ) add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL, - TRANS_TEXT, TRANS_LONGTEXT, false ); + TRANS_TEXT, TRANS_LONGTEXT, false ) add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c index c7528e443d..7c102fb26a 100644 --- a/modules/video_filter/marq.c +++ b/modules/video_filter/marq.c @@ -148,7 +148,7 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_SUBPIC ) add_string( CFG_PREFIX "marquee", "VLC", NULL, MSG_TEXT, MSG_LONGTEXT, - false ); + false ) set_section( N_("Position"), NULL ) add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true ) @@ -159,18 +159,18 @@ vlc_module_begin () set_section( N_("Font"), NULL ) /* 5 sets the default to top [1] left [4] */ add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, false ); + OPACITY_TEXT, OPACITY_LONGTEXT, false ) add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, - false ); + false ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, - false ); + false ) set_section( N_("Misc"), NULL ) add_integer( CFG_PREFIX "timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, - false ); + false ) add_integer( CFG_PREFIX "refresh", 1000, NULL, REFRESH_TEXT, - REFRESH_LONGTEXT, false ); + REFRESH_LONGTEXT, false ) set_description( N_("Marquee display") ) add_shortcut( "time" ) diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 4a16f224ac..4c9f9e1e2b 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -183,50 +183,50 @@ vlc_module_begin () set_callbacks( CreateFilter, DestroyFilter ) add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL, - ALPHA_TEXT, ALPHA_LONGTEXT, false ); + ALPHA_TEXT, ALPHA_LONGTEXT, false ) add_integer( CFG_PREFIX "height", 100, NULL, - HEIGHT_TEXT, HEIGHT_LONGTEXT, false ); + HEIGHT_TEXT, HEIGHT_LONGTEXT, false ) add_integer( CFG_PREFIX "width", 100, NULL, - WIDTH_TEXT, WIDTH_LONGTEXT, false ); + WIDTH_TEXT, WIDTH_LONGTEXT, false ) add_integer( CFG_PREFIX "align", 5, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true); change_integer_list( pi_align_values, ppsz_align_descriptions, NULL ); add_integer( CFG_PREFIX "xoffset", 0, NULL, - XOFFSET_TEXT, XOFFSET_LONGTEXT, true ); + XOFFSET_TEXT, XOFFSET_LONGTEXT, true ) add_integer( CFG_PREFIX "yoffset", 0, NULL, - YOFFSET_TEXT, YOFFSET_LONGTEXT, true ); + YOFFSET_TEXT, YOFFSET_LONGTEXT, true ) add_integer( CFG_PREFIX "borderw", 0, NULL, - BORDERW_TEXT, BORDERW_LONGTEXT, true ); + BORDERW_TEXT, BORDERW_LONGTEXT, true ) add_deprecated_alias( CFG_PREFIX "vborder" ) add_integer( CFG_PREFIX "borderh", 0, NULL, - BORDERH_TEXT, BORDERH_LONGTEXT, true ); + BORDERH_TEXT, BORDERH_LONGTEXT, true ) add_deprecated_alias( CFG_PREFIX "hborder" ) add_integer( CFG_PREFIX "position", 0, NULL, - POS_TEXT, POS_LONGTEXT, false ); + POS_TEXT, POS_LONGTEXT, false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_integer( CFG_PREFIX "rows", 2, NULL, - ROWS_TEXT, ROWS_LONGTEXT, false ); + ROWS_TEXT, ROWS_LONGTEXT, false ) add_integer( CFG_PREFIX "cols", 2, NULL, - COLS_TEXT, COLS_LONGTEXT, false ); + COLS_TEXT, COLS_LONGTEXT, false ) add_bool( CFG_PREFIX "keep-aspect-ratio", 0, NULL, - AR_TEXT, AR_LONGTEXT, false ); + AR_TEXT, AR_LONGTEXT, false ) add_bool( CFG_PREFIX "keep-picture", 0, NULL, - KEEP_TEXT, KEEP_LONGTEXT, false ); + KEEP_TEXT, KEEP_LONGTEXT, false ) add_string( CFG_PREFIX "order", "", NULL, - ORDER_TEXT, ORDER_LONGTEXT, false ); + ORDER_TEXT, ORDER_LONGTEXT, false ) add_string( CFG_PREFIX "offsets", "", NULL, - OFFSETS_TEXT, OFFSETS_LONGTEXT, false ); + OFFSETS_TEXT, OFFSETS_LONGTEXT, false ) add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT, - false ); + false ) vlc_module_end () static const char *const ppsz_filter_options[] = { diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 6bf0401c61..40c7044d3b 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -64,7 +64,7 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL, - FACTOR_TEXT, FACTOR_LONGTEXT, false ); + FACTOR_TEXT, FACTOR_LONGTEXT, false ) add_shortcut( "blur" ) diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index b90a86727f..787240b399 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -89,7 +89,7 @@ vlc_module_begin () add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL, N_("Scale factor (0.1-2.0)"), N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"), - false ); + false ) add_string( "opencv-chroma", "input", NULL, N_("OpenCV filter chroma"), N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), false); diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c index 76df99fc4a..080fcea224 100644 --- a/modules/video_filter/osdmenu.c +++ b/modules/video_filter/osdmenu.c @@ -116,19 +116,19 @@ vlc_module_begin () add_integer( OSD_CFG "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false ) add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false ) add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT, - false ); + false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ); add_string( OSD_CFG "file", OSD_DEFAULT_CFG, NULL, OSD_FILE_TEXT, - OSD_FILE_LONGTEXT, false ); + OSD_FILE_LONGTEXT, false ) add_string( OSD_CFG "file-path", NULL, NULL, OSD_PATH_TEXT, - OSD_PATH_LONGTEXT, false ); + OSD_PATH_LONGTEXT, false ) add_integer( OSD_CFG "timeout", 15, NULL, TIMEOUT_TEXT, - TIMEOUT_LONGTEXT, false ); + TIMEOUT_LONGTEXT, false ) add_integer_with_range( OSD_CFG "update", OSD_UPDATE_DEFAULT, OSD_UPDATE_MIN, OSD_UPDATE_MAX, NULL, OSD_UPDATE_TEXT, - OSD_UPDATE_LONGTEXT, true ); + OSD_UPDATE_LONGTEXT, true ) add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL, - OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true ); + OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true ) set_capability( "sub filter", 100 ) set_description( N_("On Screen Display menu") ) diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c index 2e87870ca3..3b7c9ab52b 100644 --- a/modules/video_filter/panoramix.c +++ b/modules/video_filter/panoramix.c @@ -100,9 +100,9 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_integer( CFG_PREFIX "cols", -1, NULL, - COLS_TEXT, COLS_LONGTEXT, true ); + COLS_TEXT, COLS_LONGTEXT, true ) add_integer( CFG_PREFIX "rows", -1, NULL, - ROWS_TEXT, ROWS_LONGTEXT, true ); + ROWS_TEXT, ROWS_LONGTEXT, true ) #ifdef OVERLAP #define OFFSET_X_TEXT N_("Offset X offset (automatic compensation)") diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c index dd9ac4545f..5dcdc2e3eb 100644 --- a/modules/video_filter/postproc.c +++ b/modules/video_filter/postproc.c @@ -84,10 +84,10 @@ vlc_module_begin () set_callbacks( OpenPostproc, ClosePostproc ) add_integer_with_range( FILTER_PREFIX "q", PP_QUALITY_MAX, 0, - PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false ); + PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false ) add_deprecated_alias( "ffmpeg-pp-q" ) add_string( FILTER_PREFIX "name", "default", NULL, NAME_TEXT, - NAME_LONGTEXT, true ); + NAME_LONGTEXT, true ) add_deprecated_alias( "ffmpeg-pp-name" ) vlc_module_end () diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c index 397c72c03a..5e402c55d3 100644 --- a/modules/video_filter/puzzle.c +++ b/modules/video_filter/puzzle.c @@ -79,11 +79,11 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_integer_with_range( CFG_PREFIX "rows", 4, 1, 128, NULL, - ROWS_TEXT, ROWS_LONGTEXT, false ); + ROWS_TEXT, ROWS_LONGTEXT, false ) add_integer_with_range( CFG_PREFIX "cols", 4, 1, 128, NULL, - COLS_TEXT, COLS_LONGTEXT, false ); + COLS_TEXT, COLS_LONGTEXT, false ) add_bool( CFG_PREFIX "black-slot", 0, NULL, - BLACKSLOT_TEXT, BLACKSLOT_LONGTEXT, false ); + BLACKSLOT_TEXT, BLACKSLOT_LONGTEXT, false ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c index 1b564cbd27..8b0e02ece3 100644 --- a/modules/video_filter/remoteosd.c +++ b/modules/video_filter/remoteosd.c @@ -125,22 +125,22 @@ vlc_module_begin () set_callbacks( CreateFilter, DestroyFilter ) add_string( RMTOSD_CFG "host", "myvdr", NULL, RMTOSD_HOST_TEXT, - RMTOSD_HOST_LONGTEXT, false ); + RMTOSD_HOST_LONGTEXT, false ) add_integer_with_range( RMTOSD_CFG "port", 20001, 1, 0xFFFF, NULL, - RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false ); + RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false ) add_password( RMTOSD_CFG "password", "", NULL, RMTOSD_PASSWORD_TEXT, - RMTOSD_PASSWORD_LONGTEXT, false ); + RMTOSD_PASSWORD_LONGTEXT, false ) add_integer_with_range( RMTOSD_CFG "update", RMTOSD_UPDATE_DEFAULT, RMTOSD_UPDATE_MIN, RMTOSD_UPDATE_MAX, NULL, RMTOSD_UPDATE_TEXT, - RMTOSD_UPDATE_LONGTEXT, true ); + RMTOSD_UPDATE_LONGTEXT, true ) add_bool( RMTOSD_CFG "vnc-polling", 0, NULL, - RMTOSD_POLL_TEXT , RMTOSD_POLL_LONGTEXT, false ); + RMTOSD_POLL_TEXT , RMTOSD_POLL_LONGTEXT, false ) add_bool( RMTOSD_CFG "mouse-events", 0, NULL, - RMTOSD_MOUSE_TEXT , RMTOSD_MOUSE_LONGTEXT, false ); + RMTOSD_MOUSE_TEXT , RMTOSD_MOUSE_LONGTEXT, false ) add_bool( RMTOSD_CFG "key-events", 0, NULL, - RMTOSD_KEYS_TEXT , RMTOSD_KEYS_LONGTEXT, false ); + RMTOSD_KEYS_TEXT , RMTOSD_KEYS_LONGTEXT, false ) add_integer_with_range( RMTOSD_CFG "alpha", 255, 0, 255, NULL, - RMTOSD_ALPHA_TEXT, RMTOSD_ALPHA_LONGTEXT, true ); + RMTOSD_ALPHA_TEXT, RMTOSD_ALPHA_LONGTEXT, true ) vlc_module_end () diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index a320df3b0a..95dcbb3f43 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -71,7 +71,7 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_integer_with_range( FILTER_PREFIX "angle", 30, 0, 359, NULL, - ANGLE_TEXT, ANGLE_LONGTEXT, false ); + ANGLE_TEXT, ANGLE_LONGTEXT, false ) add_shortcut( "rotate" ) set_callbacks( Create, Destroy ) diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c index 516a28ed28..9b5ec35495 100644 --- a/modules/video_filter/rss.c +++ b/modules/video_filter/rss.c @@ -203,17 +203,17 @@ vlc_module_begin () set_section( N_("Font"), NULL ) /* 5 sets the default to top [1] left [4] */ add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, false ); + OPACITY_TEXT, OPACITY_LONGTEXT, false ) add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT, - false ); + false ) change_integer_list( pi_color_values, ppsz_color_descriptions, NULL ); add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false ) set_section( N_("Misc"), NULL ) add_integer( CFG_PREFIX "speed", 100000, NULL, SPEED_TEXT, SPEED_LONGTEXT, - false ); + false ) add_integer( CFG_PREFIX "length", 60, NULL, LENGTH_TEXT, LENGTH_LONGTEXT, - false ); + false ) add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false ) add_bool( CFG_PREFIX "images", 1, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, false ) add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, false ) diff --git a/modules/video_filter/scene.c b/modules/video_filter/scene.c index 03656b5719..afccf7d323 100644 --- a/modules/video_filter/scene.c +++ b/modules/video_filter/scene.c @@ -100,22 +100,22 @@ vlc_module_begin () /* General options */ add_string( CFG_PREFIX "format", "png", NULL, - FORMAT_TEXT, FORMAT_LONGTEXT, false ); + FORMAT_TEXT, FORMAT_LONGTEXT, false ) change_string_list( psz_format_list, psz_format_list_text, 0 ); add_integer( CFG_PREFIX "width", 288, NULL, - WIDTH_TEXT, WIDTH_LONGTEXT, true ); + WIDTH_TEXT, WIDTH_LONGTEXT, true ) add_integer( CFG_PREFIX "height", 160, NULL, - HEIGHT_TEXT, HEIGHT_LONGTEXT, true ); + HEIGHT_TEXT, HEIGHT_LONGTEXT, true ) add_string( CFG_PREFIX "prefix", "scene", NULL, - PREFIX_TEXT, PREFIX_LONGTEXT, false ); + PREFIX_TEXT, PREFIX_LONGTEXT, false ) add_string( CFG_PREFIX "path", NULL, NULL, - PATH_TEXT, PATH_LONGTEXT, false ); + PATH_TEXT, PATH_LONGTEXT, false ) add_bool( CFG_PREFIX "replace", false, NULL, - REPLACE_TEXT, REPLACE_LONGTEXT, false ); + REPLACE_TEXT, REPLACE_LONGTEXT, false ) /* Snapshot method */ add_integer( CFG_PREFIX "ratio", 50, NULL, - RATIO_TEXT, RATIO_LONGTEXT, false ); + RATIO_TEXT, RATIO_LONGTEXT, false ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c index c73adddfd2..636d687d9e 100644 --- a/modules/video_filter/sharpen.c +++ b/modules/video_filter/sharpen.c @@ -69,7 +69,7 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) set_capability( "video filter2", 0 ) add_float_with_range( "sharpen-sigma", 0.05, 0.0, 2.0, NULL, - SIG_TEXT, SIG_LONGTEXT, false ); + SIG_TEXT, SIG_LONGTEXT, false ) add_shortcut( "sharpen" ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c index c41f9d1891..bb58190335 100644 --- a/modules/video_filter/wall.c +++ b/modules/video_filter/wall.c @@ -81,7 +81,7 @@ vlc_module_begin () add_integer( CFG_PREFIX "cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, false ) add_integer( CFG_PREFIX "rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, false ) add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, - true ); + true ) add_string( CFG_PREFIX "element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, false ) add_shortcut( "wall" ) diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index 4cb70312ee..4accdb23b8 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -109,16 +109,16 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VOUT ) add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - false ); + false ) add_bool( "fb-tty", 1, NULL, TTY_TEXT, TTY_LONGTEXT, true ) add_string( "fb-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) add_string( "fb-aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT, - ASPECT_RATIO_LONGTEXT, true ); + ASPECT_RATIO_LONGTEXT, true ) add_integer( "fb-mode", 4, NULL, FB_MODE_TEXT, FB_MODE_LONGTEXT, - true ); + true ) add_bool( "fb-hw-accel", true, NULL, HW_ACCEL_TEXT, HW_ACCEL_LONGTEXT, - true ); + true ) set_description( N_("GNU/Linux framebuffer video output") ) set_capability( "video output", 30 ) set_callbacks( Create, Destroy ) diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c index e3242794e7..4a206f5162 100644 --- a/modules/video_output/msw/directx.c +++ b/modules/video_output/msw/directx.c @@ -165,19 +165,19 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VOUT ) add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT, - true ); + true ) add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT, - true ); + true ) add_bool( "directx-3buffering", 1, NULL, TRIPLEBUF_TEXT, - TRIPLEBUF_LONGTEXT, true ); + TRIPLEBUF_LONGTEXT, true ) add_string( "directx-device", "", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - true ); + true ) change_string_list( ppsz_dev, ppsz_dev_text, FindDevicesCallback ); change_action_add( FindDevicesCallback, N_("Refresh list") ) add_bool( "directx-wallpaper", 0, NULL, WALLPAPER_TEXT, WALLPAPER_LONGTEXT, - true ); + true ) set_description( N_("DirectX video output") ) set_capability( "video output", 100 ) diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c index dc62567bef..d3e772149c 100644 --- a/modules/video_output/omapfb.c +++ b/modules/video_output/omapfb.c @@ -102,11 +102,11 @@ vlc_module_begin(); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, - false ); + false ) add_string( "omap-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ); + true ) add_bool( "omap-embedded", true, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, - true ); + true ) set_description( N_("OMAP framebuffer video output") ); set_capability( "video output", 200 ); set_callbacks( Create, Destroy ); diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index 568217ed10..1e8121b44a 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -124,7 +124,7 @@ vlc_module_begin () add_shortcut( "opengl" ) /* Allow opengl provider plugin selection */ add_string( "opengl-provider", "default", NULL, PROVIDER_TEXT, - PROVIDER_LONGTEXT, true ); + PROVIDER_LONGTEXT, true ) set_callbacks( CreateVout, DestroyVout ) vlc_module_end () diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c index 33e9f9727f..cd73fb8645 100644 --- a/modules/video_output/yuv.c +++ b/modules/video_output/yuv.c @@ -70,11 +70,11 @@ vlc_module_begin () set_capability( "video output", 0 ) add_string( CFG_PREFIX "file", "stream.yuv", NULL, - YUV_FILE_TEXT, YUV_FILE_LONGTEXT, false ); + YUV_FILE_TEXT, YUV_FILE_LONGTEXT, false ) add_string( CFG_PREFIX "chroma", NULL, NULL, - CHROMA_TEXT, CHROMA_LONGTEXT, true ); + CHROMA_TEXT, CHROMA_LONGTEXT, true ) add_bool ( CFG_PREFIX "yuv4mpeg2", false, NULL, - YUV4MPEG2_TEXT, YUV4MPEG2_LONGTEXT, true ); + YUV4MPEG2_TEXT, YUV4MPEG2_LONGTEXT, true ) set_callbacks( Create, Destroy ) vlc_module_end () diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index 5962934318..d732e34616 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -76,11 +76,11 @@ vlc_module_begin () set_subcategory( SUBCAT_AUDIO_VISUAL ) set_capability( "visualization", 0 ) add_integer( "goom-width", 320, NULL, - WIDTH_TEXT, RES_LONGTEXT, false ); + WIDTH_TEXT, RES_LONGTEXT, false ) add_integer( "goom-height", 240, NULL, - HEIGHT_TEXT, RES_LONGTEXT, false ); + HEIGHT_TEXT, RES_LONGTEXT, false ) add_integer( "goom-speed", 6, NULL, - SPEED_TEXT, SPEED_LONGTEXT, false ); + SPEED_TEXT, SPEED_LONGTEXT, false ) set_callbacks( Open, Close ) add_shortcut( "goom" ) vlc_module_end () diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c index a327b5502f..818c9196db 100644 --- a/modules/visualization/visual/visual.c +++ b/modules/visualization/visual/visual.c @@ -115,45 +115,45 @@ vlc_module_begin () set_description( N_("Visualizer filter") ) set_section( N_( "General") , NULL ) add_string("effect-list", "spectrum", NULL, - ELIST_TEXT, ELIST_LONGTEXT, true ); + ELIST_TEXT, ELIST_LONGTEXT, true ) add_integer("effect-width",VOUT_WIDTH,NULL, - WIDTH_TEXT, WIDTH_LONGTEXT, false ); + WIDTH_TEXT, WIDTH_LONGTEXT, false ) add_integer("effect-height" , VOUT_HEIGHT , NULL, - HEIGHT_TEXT, HEIGHT_LONGTEXT, false ); + HEIGHT_TEXT, HEIGHT_LONGTEXT, false ) set_section( N_("Spectrum analyser") , NULL ) add_integer("visual-nbbands", 80, NULL, - NBBANDS_TEXT, NBBANDS_LONGTEXT, true ); + NBBANDS_TEXT, NBBANDS_LONGTEXT, true ) add_integer("visual-separ", 1, NULL, - SEPAR_TEXT, SEPAR_LONGTEXT, true ); + SEPAR_TEXT, SEPAR_LONGTEXT, true ) add_integer("visual-amp", 3, NULL, - AMP_TEXT, AMP_LONGTEXT, true ); + AMP_TEXT, AMP_LONGTEXT, true ) add_bool("visual-peaks", true, NULL, - PEAKS_TEXT, PEAKS_LONGTEXT, true ); + PEAKS_TEXT, PEAKS_LONGTEXT, true ) set_section( N_("Spectrometer") , NULL ) add_bool("spect-show-original", false, NULL, - ORIG_TEXT, ORIG_LONGTEXT, true ); + ORIG_TEXT, ORIG_LONGTEXT, true ) add_bool("spect-show-base", true, NULL, - BASE_TEXT, BASE_LONGTEXT, true ); + BASE_TEXT, BASE_LONGTEXT, true ) add_integer("spect-radius", 42, NULL, - RADIUS_TEXT, RADIUS_LONGTEXT, true ); + RADIUS_TEXT, RADIUS_LONGTEXT, true ) add_integer("spect-sections", 3, NULL, - SSECT_TEXT, SSECT_LONGTEXT, true ); + SSECT_TEXT, SSECT_LONGTEXT, true ) add_integer("spect-color", 80, NULL, - COLOR1_TEXT, COLOR1_LONGTEXT, true ); + COLOR1_TEXT, COLOR1_LONGTEXT, true ) add_bool("spect-show-bands", true, NULL, - BANDS_TEXT, BANDS_LONGTEXT, true ); + BANDS_TEXT, BANDS_LONGTEXT, true ) add_integer("spect-nbbands", 32, NULL, - NBBANDS_TEXT, SPNBBANDS_LONGTEXT, true ); + NBBANDS_TEXT, SPNBBANDS_LONGTEXT, true ) add_integer("spect-separ", 1, NULL, - SEPAR_TEXT, SEPAR_LONGTEXT, true ); + SEPAR_TEXT, SEPAR_LONGTEXT, true ) add_integer("spect-amp", 8, NULL, - AMP_TEXT, AMP_LONGTEXT, true ); + AMP_TEXT, AMP_LONGTEXT, true ) add_bool("spect-show-peaks", true, NULL, - PEAKS_TEXT, PEAKS_LONGTEXT, true ); + PEAKS_TEXT, PEAKS_LONGTEXT, true ) add_integer("spect-peak-width", 61, NULL, - PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, true ); + PEAK_WIDTH_TEXT, PEAK_WIDTH_LONGTEXT, true ) add_integer("spect-peak-height", 1, NULL, - PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT, true ); + PEAK_HEIGHT_TEXT, PEAK_HEIGHT_LONGTEXT, true ) set_capability( "visualization", 0 ) set_callbacks( Open, Close ) add_shortcut( "visualizer")