Commit 4f028428 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert the so-called whitelisting commits that are actually blacklisting

parent 4ec18c3f
...@@ -283,7 +283,7 @@ enum vlc_config_properties ...@@ -283,7 +283,7 @@ enum vlc_config_properties
/* former option name (args=const char *) */ /* former option name (args=const char *) */
VLC_CONFIG_SAFE, VLC_CONFIG_SAFE,
/* usable by external plugins (args=none) */ /* tag as modifiable by untrusted input item "sources" (args=none) */
}; };
......
...@@ -174,106 +174,79 @@ vlc_module_begin(); ...@@ -174,106 +174,79 @@ vlc_module_begin();
add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, VLC_TRUE ); CACHING_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT, add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_safe();
# if defined(WIN32) || defined(WINCE) # if defined(WIN32) || defined(WINCE)
# else # else
add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_safe();
add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE ); add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE );
change_safe();
add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
# endif # endif
/* DVB-S (satellite) */ /* DVB-S (satellite) */
add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT,
INVERSION_LONGTEXT, VLC_TRUE ); INVERSION_LONGTEXT, VLC_TRUE );
change_safe();
change_integer_list( i_inversion_list, ppsz_inversion_text, 0 ); change_integer_list( i_inversion_list, ppsz_inversion_text, 0 );
# if defined(WIN32) || defined(WINCE) # if defined(WIN32) || defined(WINCE)
add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT, add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
POLARISATION_LONGTEXT, VLC_TRUE ); POLARISATION_LONGTEXT, VLC_TRUE );
change_safe();
change_string_list( ppsz_polar_list, ppsz_polar_text, 0 ); change_string_list( ppsz_polar_list, ppsz_polar_text, 0 );
add_integer( "dvb-network-id", 0, NULL, NETID_TEXT, NETID_LONGTEXT, add_integer( "dvb-network-id", 0, NULL, NETID_TEXT, NETID_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-azimuth", 0, NULL, AZIMUTH_TEXT, AZIMUTH_LONGTEXT, add_integer( "dvb-azimuth", 0, NULL, AZIMUTH_TEXT, AZIMUTH_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-elevation", 0, NULL, ELEVATION_TEXT, add_integer( "dvb-elevation", 0, NULL, ELEVATION_TEXT,
ELEVATION_LONGTEXT, VLC_TRUE ); ELEVATION_LONGTEXT, VLC_TRUE );
add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT, add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT,
LONGITUDE_LONGTEXT, VLC_TRUE ); LONGITUDE_LONGTEXT, VLC_TRUE );
change_safe();
/* Note: Polaristion H = voltage 18; V = voltage 13; */ /* Note: Polaristion H = voltage 18; V = voltage 13; */
# else # else
add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT, add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT, add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT, add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, VLC_TRUE ); HIGH_VOLTAGE_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT, add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
# endif # endif
add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT, add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
LNB_LOF1_LONGTEXT, VLC_TRUE ); LNB_LOF1_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT, add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
LNB_LOF2_LONGTEXT, VLC_TRUE ); LNB_LOF2_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT, add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
LNB_SLOF_LONGTEXT, VLC_TRUE ); LNB_SLOF_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE ); add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_safe();
/* DVB-C (cable) */ /* DVB-C (cable) */
add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT, add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT,
MODULATION_LONGTEXT, VLC_TRUE ); MODULATION_LONGTEXT, VLC_TRUE );
change_safe();
change_integer_list( i_qam_list, ppsz_qam_text, 0 ); change_integer_list( i_qam_list, ppsz_qam_text, 0 );
/* DVB-T (terrestrial) */ /* DVB-T (terrestrial) */
add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT, add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT,
CODE_RATE_HP_LONGTEXT, VLC_TRUE ); CODE_RATE_HP_LONGTEXT, VLC_TRUE );
change_safe();
change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, 0 ); change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, 0 );
add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT, add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT,
CODE_RATE_LP_LONGTEXT, VLC_TRUE ); CODE_RATE_LP_LONGTEXT, VLC_TRUE );
change_safe();
change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, 0 ); change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, 0 );
add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
change_integer_list( i_band_list, ppsz_band_text, 0 ); change_integer_list( i_band_list, ppsz_band_text, 0 );
add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE ); add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE );
change_safe();
change_integer_list( i_guard_list, ppsz_guard_text, 0 ); change_integer_list( i_guard_list, ppsz_guard_text, 0 );
add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT, add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT,
TRANSMISSION_LONGTEXT, VLC_TRUE ); TRANSMISSION_LONGTEXT, VLC_TRUE );
change_safe();
change_integer_list( i_transmission_list, ppsz_transmission_text, 0 ); change_integer_list( i_transmission_list, ppsz_transmission_text, 0 );
add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, 0 ); change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, 0 );
set_capability( "access2", 0 ); set_capability( "access2", 0 );
......
...@@ -72,26 +72,20 @@ vlc_module_begin(); ...@@ -72,26 +72,20 @@ vlc_module_begin();
add_usage_hint( N_("[cdda:][device][@[track]]") ); add_usage_hint( N_("[cdda:][device][@[track]]") );
add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, VLC_TRUE ); CACHING_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "cdda-track", -1 , NULL, NULL, NULL, VLC_TRUE ); add_integer( "cdda-track", -1 , NULL, NULL, NULL, VLC_TRUE );
change_internal(); change_internal();
change_safe();
add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, VLC_TRUE ); add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, VLC_TRUE );
change_internal(); change_internal();
change_safe();
add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, VLC_TRUE ); add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, VLC_TRUE );
change_internal(); change_internal();
change_safe();
add_string( "cddb-server", "freedb.freedb.org", NULL, add_string( "cddb-server", "freedb.freedb.org", NULL,
N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ),
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "cddb-port", 8880, NULL, add_integer( "cddb-port", 8880, NULL,
N_( "CDDB port" ), N_( "CDDB Server port to use." ), N_( "CDDB port" ), N_( "CDDB Server port to use." ),
VLC_TRUE ); VLC_TRUE );
change_safe();
add_shortcut( "cdda" ); add_shortcut( "cdda" );
add_shortcut( "cddasimple" ); add_shortcut( "cddasimple" );
vlc_module_end(); vlc_module_end();
......
...@@ -123,39 +123,33 @@ vlc_module_begin(); ...@@ -123,39 +123,33 @@ vlc_module_begin();
add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB, add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB,
N_("Additional debug"), N_("Additional debug"),
DEBUG_LONGTEXT, VLC_TRUE ); DEBUG_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( MODULE_STRING "-caching", add_integer( MODULE_STRING "-caching",
DEFAULT_PTS_DELAY / MILLISECONDS_PER_SEC, NULL, DEFAULT_PTS_DELAY / MILLISECONDS_PER_SEC, NULL,
N_("Caching value in microseconds"), N_("Caching value in microseconds"),
CACHING_LONGTEXT, VLC_TRUE ); CACHING_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( MODULE_STRING "-blocks-per-read", add_integer( MODULE_STRING "-blocks-per-read",
DEFAULT_BLOCKS_PER_READ, CDDABlocksPerReadCB, DEFAULT_BLOCKS_PER_READ, CDDABlocksPerReadCB,
N_("Number of blocks per CD read"), N_("Number of blocks per CD read"),
BLOCKS_PER_READ_LONGTEXT, VLC_TRUE ); BLOCKS_PER_READ_LONGTEXT, VLC_TRUE );
change_safe();
add_string( MODULE_STRING "-title-format", add_string( MODULE_STRING "-title-format",
"Track %T. %t", NULL, "Track %T. %t", NULL,
N_("Format to use in playlist \"title\" field when no CDDB"), N_("Format to use in playlist \"title\" field when no CDDB"),
TITLE_FMT_LONGTEXT, VLC_TRUE ); TITLE_FMT_LONGTEXT, VLC_TRUE );
change_safe();
#if LIBCDIO_VERSION_NUM >= 73 #if LIBCDIO_VERSION_NUM >= 73
add_bool( MODULE_STRING "-analog-output", VLC_FALSE, NULL, add_bool( MODULE_STRING "-analog-output", VLC_FALSE, NULL,
N_("Use CD audio controls and output?"), N_("Use CD audio controls and output?"),
N_("If set, audio controls and audio jack output are used"), N_("If set, audio controls and audio jack output are used"),
VLC_FALSE ); VLC_FALSE );
change_safe();
#endif #endif
add_bool( MODULE_STRING "-cdtext-enabled", VLC_TRUE, CDTextEnabledCB, add_bool( MODULE_STRING "-cdtext-enabled", VLC_TRUE, CDTextEnabledCB,
N_("Do CD-Text lookups?"), N_("Do CD-Text lookups?"),
N_("If set, get CD-Text information"), N_("If set, get CD-Text information"),
VLC_FALSE ); VLC_FALSE );
change_safe();
add_bool( MODULE_STRING "-navigation-mode", VLC_TRUE, add_bool( MODULE_STRING "-navigation-mode", VLC_TRUE,
#if FIXED #if FIXED
...@@ -167,7 +161,6 @@ vlc_module_begin(); ...@@ -167,7 +161,6 @@ vlc_module_begin();
N_("Tracks are navigated via Navagation rather than " N_("Tracks are navigated via Navagation rather than "
"a playlist entries"), "a playlist entries"),
VLC_FALSE ); VLC_FALSE );
change_safe();
#if LIBCDIO_VERSION_NUM >= 72 #if LIBCDIO_VERSION_NUM >= 72
add_string( MODULE_STRING "-paranoia", NULL, NULL, add_string( MODULE_STRING "-paranoia", NULL, NULL,
...@@ -175,7 +168,6 @@ vlc_module_begin(); ...@@ -175,7 +168,6 @@ vlc_module_begin();
PARANOIA_LONGTEXT, PARANOIA_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_string_list( psz_paranoia_list, psz_paranoia_list_text, 0 ); change_string_list( psz_paranoia_list, psz_paranoia_list_text, 0 );
change_safe();
#endif /* LIBCDIO_VERSION_NUM >= 72 */ #endif /* LIBCDIO_VERSION_NUM >= 72 */
#ifdef HAVE_LIBCDDB #ifdef HAVE_LIBCDDB
...@@ -184,65 +176,55 @@ vlc_module_begin(); ...@@ -184,65 +176,55 @@ vlc_module_begin();
"Track %T. %t - %p %A", NULL, "Track %T. %t - %p %A", NULL,
N_("Format to use in playlist \"title\" field when using CDDB"), N_("Format to use in playlist \"title\" field when using CDDB"),
CDDB_TITLE_FMT_LONGTEXT, VLC_TRUE ); CDDB_TITLE_FMT_LONGTEXT, VLC_TRUE );
change_safe();
add_bool( MODULE_STRING "-cddb-enabled", VLC_TRUE, CDDBEnabledCB, add_bool( MODULE_STRING "-cddb-enabled", VLC_TRUE, CDDBEnabledCB,
N_("CDDB lookups"), N_("CDDB lookups"),
N_("If set, lookup CD-DA track information using the CDDB " N_("If set, lookup CD-DA track information using the CDDB "
"protocol"), "protocol"),
VLC_FALSE ); VLC_FALSE );
change_safe();
add_string( MODULE_STRING "-cddb-server", "freedb.freedb.org", NULL, add_string( MODULE_STRING "-cddb-server", "freedb.freedb.org", NULL,
N_("CDDB server"), N_("CDDB server"),
N_( "Contact this CDDB server look up CD-DA information"), N_( "Contact this CDDB server look up CD-DA information"),
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( MODULE_STRING "-cddb-port", 8880, NULL, add_integer( MODULE_STRING "-cddb-port", 8880, NULL,
N_("CDDB server port"), N_("CDDB server port"),
N_("CDDB server uses this port number to communicate on"), N_("CDDB server uses this port number to communicate on"),
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( MODULE_STRING "-cddb-email", "me@home", NULL, add_string( MODULE_STRING "-cddb-email", "me@home", NULL,
N_("email address reported to CDDB server"), N_("email address reported to CDDB server"),
N_("email address reported to CDDB server"), N_("email address reported to CDDB server"),
VLC_TRUE ); VLC_TRUE );
change_safe();
add_bool( MODULE_STRING "-cddb-enable-cache", VLC_TRUE, NULL, add_bool( MODULE_STRING "-cddb-enable-cache", VLC_TRUE, NULL,
N_("Cache CDDB lookups?"), N_("Cache CDDB lookups?"),
N_("If set cache CDDB information about this CD"), N_("If set cache CDDB information about this CD"),
VLC_FALSE ); VLC_FALSE );
change_safe();
add_bool( MODULE_STRING "-cddb-httpd", VLC_FALSE, NULL, add_bool( MODULE_STRING "-cddb-httpd", VLC_FALSE, NULL,
N_("Contact CDDB via the HTTP protocol?"), N_("Contact CDDB via the HTTP protocol?"),
N_("If set, the CDDB server gets information via the CDDB HTTP " N_("If set, the CDDB server gets information via the CDDB HTTP "
"protocol"), "protocol"),
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( MODULE_STRING "-cddb-timeout", 10, NULL, add_integer( MODULE_STRING "-cddb-timeout", 10, NULL,
N_("CDDB server timeout"), N_("CDDB server timeout"),
N_("Time (in seconds) to wait for a response from the " N_("Time (in seconds) to wait for a response from the "
"CDDB server"), "CDDB server"),
VLC_FALSE ); VLC_FALSE );
change_safe();
add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL, add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL,
N_("Directory to cache CDDB requests"), N_("Directory to cache CDDB requests"),
N_("Directory to cache CDDB requests"), N_("Directory to cache CDDB requests"),
VLC_TRUE ); VLC_TRUE );
/* XXX: change_safe(); ?*/
add_bool( MODULE_STRING "-cdtext-prefer", VLC_TRUE, CDTextPreferCB, add_bool( MODULE_STRING "-cdtext-prefer", VLC_TRUE, CDTextPreferCB,
N_("Prefer CD-Text info to CDDB info?"), N_("Prefer CD-Text info to CDDB info?"),
N_("If set, CD-Text information will be preferred " N_("If set, CD-Text information will be preferred "
"to CDDB information when both are available"), "to CDDB information when both are available"),
VLC_FALSE ); VLC_FALSE );
change_safe();
#endif /*HAVE_LIBCDDB*/ #endif /*HAVE_LIBCDDB*/
vlc_module_end(); vlc_module_end();
...@@ -94,16 +94,11 @@ vlc_module_begin(); ...@@ -94,16 +94,11 @@ vlc_module_begin();
add_shortcut( "directory" ); add_shortcut( "directory" );
add_shortcut( "dir" ); add_shortcut( "dir" );
add_shortcut( "file" ); add_shortcut( "file" );
add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT, add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
RECURSIVE_LONGTEXT, VLC_FALSE ); RECURSIVE_LONGTEXT, VLC_FALSE );
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 ); change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
change_safe();
add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue", add_string( "ignore-filetypes", "m3u,db,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue",
NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE ); NULL, IGNORE_TEXT, IGNORE_LONGTEXT, VLC_FALSE );
change_safe();
set_callbacks( Open, Close ); set_callbacks( Open, Close );
add_submodule(); add_submodule();
......
...@@ -74,7 +74,6 @@ vlc_module_begin(); ...@@ -74,7 +74,6 @@ vlc_module_begin();
set_category( CAT_INPUT ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS ); set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
change_safe();
set_capability( "access2", 0 ); set_capability( "access2", 0 );
add_shortcut( "dv" ); add_shortcut( "dv" );
add_shortcut( "dv1394" ); add_shortcut( "dv1394" );
......
...@@ -187,100 +187,69 @@ vlc_module_begin(); ...@@ -187,100 +187,69 @@ vlc_module_begin();
add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, VLC_TRUE ); CACHING_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_safe();
add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT, add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_safe();
add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT, add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE ); add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE );
change_safe();
add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT, add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
/* DVB-S (satellite) */ /* DVB-S (satellite) */
add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT, add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT, add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT, add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, VLC_TRUE ); HIGH_VOLTAGE_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT, add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE ); add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
change_safe();
add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT, add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
LNB_LOF1_LONGTEXT, VLC_TRUE ); LNB_LOF1_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT, add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
LNB_LOF2_LONGTEXT, VLC_TRUE ); LNB_LOF2_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT, add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
LNB_SLOF_LONGTEXT, VLC_TRUE ); LNB_SLOF_LONGTEXT, VLC_TRUE );
change_safe();
/* DVB-C (cable) */ /* DVB-C (cable) */
add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT, add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT,
MODULATION_LONGTEXT, VLC_TRUE ); MODULATION_LONGTEXT, VLC_TRUE );
change_safe();
/* DVB-T (terrestrial) */ /* DVB-T (terrestrial) */
add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT,
CODE_RATE_HP_LONGTEXT, VLC_TRUE ); CODE_RATE_HP_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT,
CODE_RATE_LP_LONGTEXT, VLC_TRUE ); CODE_RATE_LP_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE ); add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT, add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT,
TRANSMISSION_LONGTEXT, VLC_TRUE ); TRANSMISSION_LONGTEXT, VLC_TRUE );
change_safe();
add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
#ifdef ENABLE_HTTPD #ifdef ENABLE_HTTPD
/* MMI HTTP interface */ /* MMI HTTP interface */
set_section( N_("HTTP server" ), 0 ); set_section( N_("HTTP server" ), 0 );
add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT, add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
PASSWORD_LONGTEXT, VLC_TRUE ); PASSWORD_LONGTEXT, VLC_TRUE );
change_safe();
add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT, add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT,
VLC_TRUE ); VLC_TRUE );
change_safe();
#endif #endif
set_capability( "access2", 0 ); set_capability( "access2", 0 );
......
...@@ -84,13 +84,10 @@ vlc_module_begin(); ...@@ -84,13 +84,10 @@ vlc_module_begin();
set_subcategory( SUBCAT_INPUT_ACCESS ); set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT, add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT,
ANGLE_LONGTEXT, VLC_FALSE ); ANGLE_LONGTEXT, VLC_FALSE );
change_safe();
add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
change_safe();
add_bool( "dvdnav-menu", VLC_TRUE, NULL, add_bool( "dvdnav-menu", VLC_TRUE, NULL,
MENU_TEXT, MENU_LONGTEXT, VLC_FALSE ); MENU_TEXT, MENU_LONGTEXT, VLC_FALSE );
change_safe();
set_capability( "access_demux", 5 ); set_capability( "access_demux", 5 );
add_shortcut( "dvd" ); add_shortcut( "dvd" );
add_shortcut( "dvdnav" ); add_shortcut( "dvdnav" );
......
...@@ -92,13 +92,10 @@ vlc_module_begin(); ...@@ -92,13 +92,10 @@ vlc_module_begin();
set_subcategory( SUBCAT_INPUT_ACCESS ); set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT, add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
ANGLE_LONGTEXT, VLC_FALSE ); ANGLE_LONGTEXT, VLC_FALSE );
change_safe();
add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL, add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
change_safe();
add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT, add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT,
CSSMETHOD_LONGTEXT, VLC_TRUE ); CSSMETHOD_LONGTEXT, VLC_TRUE );
change_safe();
change_string_list( psz_css_list, psz_css_list_text, 0 ); change_string_list( psz_css_list, psz_css_list_text, 0 );
set_capability( "access_demux", 0 ); set_capability( "access_demux", 0 );
add_shortcut( "dvd" );