videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove write-only change_need_restart()

pull/2/head
Rémi Denis-Courmont 15 years ago
parent
cd00c9c593
commit
cfad8dc27d
6 changed files with 0 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      include/vlc_configuration.h
  2. 7
      include/vlc_plugin.h
  3. 2
      modules/audio_output/directx.c
  4. 1
      modules/audio_output/waveout.c
  5. 29
      src/libvlc-module.c
  6. 4
      src/modules/entry.c

2
include/vlc_configuration.h
View File

@ -176,8 +176,6 @@ struct module_config_t
bool b_dirty; /* Dirty flag to indicate a config change */
bool b_advanced; /* Flag to indicate an advanced option */
bool b_internal; /* Flag to indicate option is not to be shown */
bool b_restart; /* Flag to indicate the option needs a restart */
/* to take effect */
/* Option values loaded from config file */
bool b_unsaveable; /* Config should not be saved */

7
include/vlc_plugin.h
View File

@ -75,9 +75,6 @@ enum vlc_module_properties
VLC_CONFIG_PERSISTENT_OBSOLETE,
/* unused (ignored) */
VLC_CONFIG_RESTART,
/* restart required to apply value change (args=none) */
VLC_CONFIG_PRIVATE,
/* hide from user (args=none) */
@ -351,7 +348,6 @@ enum vlc_module_properties
#define add_key( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
KEY_UNSET ) \
change_need_restart() \
add_string_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, value )
#define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \
@ -423,9 +419,6 @@ enum vlc_module_properties
vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \
(vlc_callback_t)(pf_action), (const char *)(text));
#define change_need_restart() \
vlc_config_set (p_config, VLC_CONFIG_RESTART);
/* For options that are saved but hidden from the preferences panel */
#define change_private() \
vlc_config_set (p_config, VLC_CONFIG_PRIVATE);

2
modules/audio_output/directx.c
View File

@ -137,13 +137,11 @@ vlc_module_begin ()
add_deprecated_alias( "directx-audio-device" ) /* Since 1.1.0 */
change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
change_action_add( ReloadDirectXDevices, N_("Refresh list") )
change_need_restart ()
add_bool( "directx-audio-float32", false, FLOAT_TEXT,
FLOAT_LONGTEXT, true )
add_string( "directx-audio-speaker", "Windows default",
SPEAKER_TEXT, SPEAKER_LONGTEXT, true )
change_string_list( speaker_list, 0, 0 )
change_need_restart ()
set_callbacks( OpenAudio, CloseAudio )
vlc_module_end ()

1
modules/audio_output/waveout.c
View File

@ -103,7 +103,6 @@ vlc_module_begin ()
DEVICE_TEXT, DEVICE_LONG, false )
add_deprecated_alias( "waveout-dev" ) /* deprecated since 0.9.3 */
change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices )
change_need_restart ()
change_action_add( ReloadWaveoutDevices, N_("Refresh list") )
set_callbacks( Open, Close )

29
src/libvlc-module.c
View File

@ -2035,27 +2035,17 @@ vlc_module_begin ()
add_obsolete_bool( "fpu" )
#if defined( __i386__ ) || defined( __x86_64__ )
add_bool( "mmx", 1, MMX_TEXT, MMX_LONGTEXT, true )
change_need_restart ()
add_bool( "3dn", 1, THREE_DN_TEXT, THREE_DN_LONGTEXT, true )
change_need_restart ()
add_bool( "mmxext", 1, MMXEXT_TEXT, MMXEXT_LONGTEXT, true )
change_need_restart ()
add_bool( "sse", 1, SSE_TEXT, SSE_LONGTEXT, true )
change_need_restart ()
add_bool( "sse2", 1, SSE2_TEXT, SSE2_LONGTEXT, true )
change_need_restart ()
add_bool( "sse3", 1, SSE3_TEXT, SSE3_LONGTEXT, true )
change_need_restart ()
add_bool( "ssse3", 1, SSSE3_TEXT, SSSE3_LONGTEXT, true )
change_need_restart ()
add_bool( "sse41", 1, SSE4_1_TEXT, SSE4_1_LONGTEXT, true )
change_need_restart ()
add_bool( "sse42", 1, SSE4_2_TEXT, SSE4_2_LONGTEXT, true )
change_need_restart ()
#endif
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
add_bool( "altivec", 1, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, true )
change_need_restart ()
#endif
/* Misc options */
@ -2064,19 +2054,15 @@ vlc_module_begin ()
add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, true )
add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT,
MEMCPY_LONGTEXT, true )
change_need_restart ()
add_module( "vod-server", "vod server", NULL, NULL, VOD_SERVER_TEXT,
VOD_SERVER_LONGTEXT, true )
change_need_restart ()
set_section( N_("Plugins" ), NULL )
add_bool( "plugins-cache", true, PLUGINS_CACHE_TEXT,
PLUGINS_CACHE_LONGTEXT, true )
change_need_restart ()
add_obsolete_string( "plugin-path" )
add_directory( "data-path", NULL, DATA_PATH_TEXT,
DATA_PATH_LONGTEXT, true )
change_need_restart ()
set_section( N_("Performance options"), NULL )
@ -2084,11 +2070,9 @@ vlc_module_begin ()
# ifndef __APPLE__
add_bool( "rt-priority", false, RT_PRIORITY_TEXT,
RT_PRIORITY_LONGTEXT, true )
change_need_restart ()
# endif
add_integer( "rt-offset", 0, RT_OFFSET_TEXT,
RT_OFFSET_LONGTEXT, true )
change_need_restart ()
#endif
#if defined(HAVE_DBUS)
@ -2112,7 +2096,6 @@ vlc_module_begin ()
#if defined(WIN32)
add_bool( "high-priority", 0, HPRIORITY_TEXT,
HPRIORITY_LONGTEXT, false )
change_need_restart ()
#endif
/* Playlist options */
@ -2141,7 +2124,6 @@ vlc_module_begin ()
add_bool( "playlist-tree", 0, PLTREE_TEXT, PLTREE_LONGTEXT, false )
add_string( "open", "", OPEN_TEXT, OPEN_LONGTEXT, false )
change_need_restart ()
add_bool( "auto-preparse", true, PREPARSE_TEXT,
PREPARSE_LONGTEXT, false )
@ -2155,7 +2137,6 @@ vlc_module_begin ()
add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL,
NULL, SD_TEXT, SD_LONGTEXT, false )
change_short('S')
change_need_restart ()
/* Interface options */
set_category( CAT_INTERFACE )
@ -2171,54 +2152,44 @@ vlc_module_begin ()
#if !defined(WIN32)
add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
change_short('d')
change_need_restart ()
add_string( "pidfile", NULL, PIDFILE_TEXT, PIDFILE_LONGTEXT,
false )
change_need_restart ()
#endif
add_bool( "file-logging", false, FILE_LOG_TEXT, FILE_LOG_LONGTEXT,
true )
change_need_restart ()
#ifdef HAVE_SYSLOG_H
add_bool ( "syslog", false, SYSLOG_TEXT, SYSLOG_LONGTEXT,
true )
change_need_restart ()
#endif
#if defined (WIN32) || defined (__APPLE__)
add_string( "language", "auto", LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
false )
change_string_list( ppsz_language, ppsz_language_text, 0 )
change_need_restart ()
#endif
add_bool( "color", true, COLOR_TEXT, COLOR_LONGTEXT, true )
add_bool( "advanced", false, ADVANCED_TEXT, ADVANCED_LONGTEXT,
false )
change_need_restart ()
add_bool( "interact", true, INTERACTION_TEXT,
INTERACTION_LONGTEXT, false )
add_bool ( "stats", true, STATS_TEXT, STATS_LONGTEXT, true )
change_need_restart ()
set_subcategory( SUBCAT_INTERFACE_MAIN )
add_module_cat( "intf", SUBCAT_INTERFACE_MAIN, NULL, NULL, INTF_TEXT,
INTF_LONGTEXT, false )
change_short('I')
change_need_restart ()
add_module_list_cat( "extraintf", SUBCAT_INTERFACE_MAIN,
NULL, NULL, EXTRAINTF_TEXT,
EXTRAINTF_LONGTEXT, false )
change_need_restart ()
set_subcategory( SUBCAT_INTERFACE_CONTROL )
add_module_list_cat( "control", SUBCAT_INTERFACE_CONTROL, NULL, NULL,
CONTROL_TEXT, CONTROL_LONGTEXT, false )
change_need_restart ()
/* Hotkey options*/
set_subcategory( SUBCAT_INTERFACE_HOTKEYS )

4
src/modules/entry.c
View File

@ -308,10 +308,6 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...)
item->b_unsaveable = true;
break;
case VLC_CONFIG_RESTART:
item->b_restart = true;
break;
case VLC_CONFIG_PRIVATE:
item->b_internal = true;
break;

Write Preview
Loading…
Cancel
Save