Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
cfad8dc2
Commit
cfad8dc2
authored
May 11, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove write-only change_need_restart()
parent
cd00c9c5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
45 deletions
+0
-45
include/vlc_configuration.h
include/vlc_configuration.h
+0
-2
include/vlc_plugin.h
include/vlc_plugin.h
+0
-7
modules/audio_output/directx.c
modules/audio_output/directx.c
+0
-2
modules/audio_output/waveout.c
modules/audio_output/waveout.c
+0
-1
src/libvlc-module.c
src/libvlc-module.c
+0
-29
src/modules/entry.c
src/modules/entry.c
+0
-4
No files found.
include/vlc_configuration.h
View file @
cfad8dc2
...
@@ -176,8 +176,6 @@ struct module_config_t
...
@@ -176,8 +176,6 @@ struct module_config_t
bool
b_dirty
;
/* Dirty flag to indicate a config change */
bool
b_dirty
;
/* Dirty flag to indicate a config change */
bool
b_advanced
;
/* Flag to indicate an advanced option */
bool
b_advanced
;
/* Flag to indicate an advanced option */
bool
b_internal
;
/* Flag to indicate option is not to be shown */
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 */
/* Option values loaded from config file */
bool
b_unsaveable
;
/* Config should not be saved */
bool
b_unsaveable
;
/* Config should not be saved */
...
...
include/vlc_plugin.h
View file @
cfad8dc2
...
@@ -75,9 +75,6 @@ enum vlc_module_properties
...
@@ -75,9 +75,6 @@ enum vlc_module_properties
VLC_CONFIG_PERSISTENT_OBSOLETE
,
VLC_CONFIG_PERSISTENT_OBSOLETE
,
/* unused (ignored) */
/* unused (ignored) */
VLC_CONFIG_RESTART
,
/* restart required to apply value change (args=none) */
VLC_CONFIG_PRIVATE
,
VLC_CONFIG_PRIVATE
,
/* hide from user (args=none) */
/* hide from user (args=none) */
...
@@ -351,7 +348,6 @@ enum vlc_module_properties
...
@@ -351,7 +348,6 @@ enum vlc_module_properties
#define add_key( name, value, text, longtext, advc ) \
#define add_key( name, value, text, longtext, advc ) \
add_string_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
add_string_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
KEY_UNSET ) \
KEY_UNSET ) \
change_need_restart() \
add_string_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, value )
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 ) \
#define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \
...
@@ -423,9 +419,6 @@ enum vlc_module_properties
...
@@ -423,9 +419,6 @@ enum vlc_module_properties
vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \
vlc_config_set (p_config, VLC_CONFIG_ADD_ACTION, \
(vlc_callback_t)(pf_action), (const char *)(text));
(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 */
/* For options that are saved but hidden from the preferences panel */
#define change_private() \
#define change_private() \
vlc_config_set (p_config, VLC_CONFIG_PRIVATE);
vlc_config_set (p_config, VLC_CONFIG_PRIVATE);
...
...
modules/audio_output/directx.c
View file @
cfad8dc2
...
@@ -137,13 +137,11 @@ vlc_module_begin ()
...
@@ -137,13 +137,11 @@ vlc_module_begin ()
add_deprecated_alias
(
"directx-audio-device"
)
/* Since 1.1.0 */
add_deprecated_alias
(
"directx-audio-device"
)
/* Since 1.1.0 */
change_string_list
(
ppsz_adev
,
ppsz_adev_text
,
ReloadDirectXDevices
)
change_string_list
(
ppsz_adev
,
ppsz_adev_text
,
ReloadDirectXDevices
)
change_action_add
(
ReloadDirectXDevices
,
N_
(
"Refresh list"
)
)
change_action_add
(
ReloadDirectXDevices
,
N_
(
"Refresh list"
)
)
change_need_restart
()
add_bool
(
"directx-audio-float32"
,
false
,
FLOAT_TEXT
,
add_bool
(
"directx-audio-float32"
,
false
,
FLOAT_TEXT
,
FLOAT_LONGTEXT
,
true
)
FLOAT_LONGTEXT
,
true
)
add_string
(
"directx-audio-speaker"
,
"Windows default"
,
add_string
(
"directx-audio-speaker"
,
"Windows default"
,
SPEAKER_TEXT
,
SPEAKER_LONGTEXT
,
true
)
SPEAKER_TEXT
,
SPEAKER_LONGTEXT
,
true
)
change_string_list
(
speaker_list
,
0
,
0
)
change_string_list
(
speaker_list
,
0
,
0
)
change_need_restart
()
set_callbacks
(
OpenAudio
,
CloseAudio
)
set_callbacks
(
OpenAudio
,
CloseAudio
)
vlc_module_end
()
vlc_module_end
()
...
...
modules/audio_output/waveout.c
View file @
cfad8dc2
...
@@ -103,7 +103,6 @@ vlc_module_begin ()
...
@@ -103,7 +103,6 @@ vlc_module_begin ()
DEVICE_TEXT
,
DEVICE_LONG
,
false
)
DEVICE_TEXT
,
DEVICE_LONG
,
false
)
add_deprecated_alias
(
"waveout-dev"
)
/* deprecated since 0.9.3 */
add_deprecated_alias
(
"waveout-dev"
)
/* deprecated since 0.9.3 */
change_string_list
(
ppsz_adev
,
ppsz_adev_text
,
ReloadWaveoutDevices
)
change_string_list
(
ppsz_adev
,
ppsz_adev_text
,
ReloadWaveoutDevices
)
change_need_restart
()
change_action_add
(
ReloadWaveoutDevices
,
N_
(
"Refresh list"
)
)
change_action_add
(
ReloadWaveoutDevices
,
N_
(
"Refresh list"
)
)
set_callbacks
(
Open
,
Close
)
set_callbacks
(
Open
,
Close
)
...
...
src/libvlc-module.c
View file @
cfad8dc2
...
@@ -2035,27 +2035,17 @@ vlc_module_begin ()
...
@@ -2035,27 +2035,17 @@ vlc_module_begin ()
add_obsolete_bool
(
"fpu"
)
add_obsolete_bool
(
"fpu"
)
#if defined( __i386__ ) || defined( __x86_64__ )
#if defined( __i386__ ) || defined( __x86_64__ )
add_bool
(
"mmx"
,
1
,
MMX_TEXT
,
MMX_LONGTEXT
,
true
)
add_bool
(
"mmx"
,
1
,
MMX_TEXT
,
MMX_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"3dn"
,
1
,
THREE_DN_TEXT
,
THREE_DN_LONGTEXT
,
true
)
add_bool
(
"3dn"
,
1
,
THREE_DN_TEXT
,
THREE_DN_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"mmxext"
,
1
,
MMXEXT_TEXT
,
MMXEXT_LONGTEXT
,
true
)
add_bool
(
"mmxext"
,
1
,
MMXEXT_TEXT
,
MMXEXT_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"sse"
,
1
,
SSE_TEXT
,
SSE_LONGTEXT
,
true
)
add_bool
(
"sse"
,
1
,
SSE_TEXT
,
SSE_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"sse2"
,
1
,
SSE2_TEXT
,
SSE2_LONGTEXT
,
true
)
add_bool
(
"sse2"
,
1
,
SSE2_TEXT
,
SSE2_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"sse3"
,
1
,
SSE3_TEXT
,
SSE3_LONGTEXT
,
true
)
add_bool
(
"sse3"
,
1
,
SSE3_TEXT
,
SSE3_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"ssse3"
,
1
,
SSSE3_TEXT
,
SSSE3_LONGTEXT
,
true
)
add_bool
(
"ssse3"
,
1
,
SSSE3_TEXT
,
SSSE3_LONGTEXT
,
true
)
change_need_restart
()
add_bool
(
"sse41"
,
1
,
SSE4_1_TEXT
,
SSE4_1_LONGTEXT
,
true
)
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
)
add_bool
(
"sse42"
,
1
,
SSE4_2_TEXT
,
SSE4_2_LONGTEXT
,
true
)
change_need_restart
()
#endif
#endif
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
add_bool
(
"altivec"
,
1
,
ALTIVEC_TEXT
,
ALTIVEC_LONGTEXT
,
true
)
add_bool
(
"altivec"
,
1
,
ALTIVEC_TEXT
,
ALTIVEC_LONGTEXT
,
true
)
change_need_restart
()
#endif
#endif
/* Misc options */
/* Misc options */
...
@@ -2064,19 +2054,15 @@ vlc_module_begin ()
...
@@ -2064,19 +2054,15 @@ vlc_module_begin ()
add_category_hint
(
N_
(
"Miscellaneous"
),
MISC_CAT_LONGTEXT
,
true
)
add_category_hint
(
N_
(
"Miscellaneous"
),
MISC_CAT_LONGTEXT
,
true
)
add_module
(
"memcpy"
,
"memcpy"
,
NULL
,
NULL
,
MEMCPY_TEXT
,
add_module
(
"memcpy"
,
"memcpy"
,
NULL
,
NULL
,
MEMCPY_TEXT
,
MEMCPY_LONGTEXT
,
true
)
MEMCPY_LONGTEXT
,
true
)
change_need_restart
()
add_module
(
"vod-server"
,
"vod server"
,
NULL
,
NULL
,
VOD_SERVER_TEXT
,
add_module
(
"vod-server"
,
"vod server"
,
NULL
,
NULL
,
VOD_SERVER_TEXT
,
VOD_SERVER_LONGTEXT
,
true
)
VOD_SERVER_LONGTEXT
,
true
)
change_need_restart
()
set_section
(
N_
(
"Plugins"
),
NULL
)
set_section
(
N_
(
"Plugins"
),
NULL
)
add_bool
(
"plugins-cache"
,
true
,
PLUGINS_CACHE_TEXT
,
add_bool
(
"plugins-cache"
,
true
,
PLUGINS_CACHE_TEXT
,
PLUGINS_CACHE_LONGTEXT
,
true
)
PLUGINS_CACHE_LONGTEXT
,
true
)
change_need_restart
()
add_obsolete_string
(
"plugin-path"
)
add_obsolete_string
(
"plugin-path"
)
add_directory
(
"data-path"
,
NULL
,
DATA_PATH_TEXT
,
add_directory
(
"data-path"
,
NULL
,
DATA_PATH_TEXT
,
DATA_PATH_LONGTEXT
,
true
)
DATA_PATH_LONGTEXT
,
true
)
change_need_restart
()
set_section
(
N_
(
"Performance options"
),
NULL
)
set_section
(
N_
(
"Performance options"
),
NULL
)
...
@@ -2084,11 +2070,9 @@ vlc_module_begin ()
...
@@ -2084,11 +2070,9 @@ vlc_module_begin ()
# ifndef __APPLE__
# ifndef __APPLE__
add_bool
(
"rt-priority"
,
false
,
RT_PRIORITY_TEXT
,
add_bool
(
"rt-priority"
,
false
,
RT_PRIORITY_TEXT
,
RT_PRIORITY_LONGTEXT
,
true
)
RT_PRIORITY_LONGTEXT
,
true
)
change_need_restart
()
# endif
# endif
add_integer
(
"rt-offset"
,
0
,
RT_OFFSET_TEXT
,
add_integer
(
"rt-offset"
,
0
,
RT_OFFSET_TEXT
,
RT_OFFSET_LONGTEXT
,
true
)
RT_OFFSET_LONGTEXT
,
true
)
change_need_restart
()
#endif
#endif
#if defined(HAVE_DBUS)
#if defined(HAVE_DBUS)
...
@@ -2112,7 +2096,6 @@ vlc_module_begin ()
...
@@ -2112,7 +2096,6 @@ vlc_module_begin ()
#if defined(WIN32)
#if defined(WIN32)
add_bool
(
"high-priority"
,
0
,
HPRIORITY_TEXT
,
add_bool
(
"high-priority"
,
0
,
HPRIORITY_TEXT
,
HPRIORITY_LONGTEXT
,
false
)
HPRIORITY_LONGTEXT
,
false
)
change_need_restart
()
#endif
#endif
/* Playlist options */
/* Playlist options */
...
@@ -2141,7 +2124,6 @@ vlc_module_begin ()
...
@@ -2141,7 +2124,6 @@ vlc_module_begin ()
add_bool
(
"playlist-tree"
,
0
,
PLTREE_TEXT
,
PLTREE_LONGTEXT
,
false
)
add_bool
(
"playlist-tree"
,
0
,
PLTREE_TEXT
,
PLTREE_LONGTEXT
,
false
)
add_string
(
"open"
,
""
,
OPEN_TEXT
,
OPEN_LONGTEXT
,
false
)
add_string
(
"open"
,
""
,
OPEN_TEXT
,
OPEN_LONGTEXT
,
false
)
change_need_restart
()
add_bool
(
"auto-preparse"
,
true
,
PREPARSE_TEXT
,
add_bool
(
"auto-preparse"
,
true
,
PREPARSE_TEXT
,
PREPARSE_LONGTEXT
,
false
)
PREPARSE_LONGTEXT
,
false
)
...
@@ -2155,7 +2137,6 @@ vlc_module_begin ()
...
@@ -2155,7 +2137,6 @@ vlc_module_begin ()
add_module_list_cat
(
"services-discovery"
,
SUBCAT_PLAYLIST_SD
,
NULL
,
add_module_list_cat
(
"services-discovery"
,
SUBCAT_PLAYLIST_SD
,
NULL
,
NULL
,
SD_TEXT
,
SD_LONGTEXT
,
false
)
NULL
,
SD_TEXT
,
SD_LONGTEXT
,
false
)
change_short
(
'S'
)
change_short
(
'S'
)
change_need_restart
()
/* Interface options */
/* Interface options */
set_category
(
CAT_INTERFACE
)
set_category
(
CAT_INTERFACE
)
...
@@ -2171,54 +2152,44 @@ vlc_module_begin ()
...
@@ -2171,54 +2152,44 @@ vlc_module_begin ()
#if !defined(WIN32)
#if !defined(WIN32)
add_bool
(
"daemon"
,
0
,
DAEMON_TEXT
,
DAEMON_LONGTEXT
,
true
)
add_bool
(
"daemon"
,
0
,
DAEMON_TEXT
,
DAEMON_LONGTEXT
,
true
)
change_short
(
'd'
)
change_short
(
'd'
)
change_need_restart
()
add_string
(
"pidfile"
,
NULL
,
PIDFILE_TEXT
,
PIDFILE_LONGTEXT
,
add_string
(
"pidfile"
,
NULL
,
PIDFILE_TEXT
,
PIDFILE_LONGTEXT
,
false
)
false
)
change_need_restart
()
#endif
#endif
add_bool
(
"file-logging"
,
false
,
FILE_LOG_TEXT
,
FILE_LOG_LONGTEXT
,
add_bool
(
"file-logging"
,
false
,
FILE_LOG_TEXT
,
FILE_LOG_LONGTEXT
,
true
)
true
)
change_need_restart
()
#ifdef HAVE_SYSLOG_H
#ifdef HAVE_SYSLOG_H
add_bool
(
"syslog"
,
false
,
SYSLOG_TEXT
,
SYSLOG_LONGTEXT
,
add_bool
(
"syslog"
,
false
,
SYSLOG_TEXT
,
SYSLOG_LONGTEXT
,
true
)
true
)
change_need_restart
()
#endif
#endif
#if defined (WIN32) || defined (__APPLE__)
#if defined (WIN32) || defined (__APPLE__)
add_string
(
"language"
,
"auto"
,
LANGUAGE_TEXT
,
LANGUAGE_LONGTEXT
,
add_string
(
"language"
,
"auto"
,
LANGUAGE_TEXT
,
LANGUAGE_LONGTEXT
,
false
)
false
)
change_string_list
(
ppsz_language
,
ppsz_language_text
,
0
)
change_string_list
(
ppsz_language
,
ppsz_language_text
,
0
)
change_need_restart
()
#endif
#endif
add_bool
(
"color"
,
true
,
COLOR_TEXT
,
COLOR_LONGTEXT
,
true
)
add_bool
(
"color"
,
true
,
COLOR_TEXT
,
COLOR_LONGTEXT
,
true
)
add_bool
(
"advanced"
,
false
,
ADVANCED_TEXT
,
ADVANCED_LONGTEXT
,
add_bool
(
"advanced"
,
false
,
ADVANCED_TEXT
,
ADVANCED_LONGTEXT
,
false
)
false
)
change_need_restart
()
add_bool
(
"interact"
,
true
,
INTERACTION_TEXT
,
add_bool
(
"interact"
,
true
,
INTERACTION_TEXT
,
INTERACTION_LONGTEXT
,
false
)
INTERACTION_LONGTEXT
,
false
)
add_bool
(
"stats"
,
true
,
STATS_TEXT
,
STATS_LONGTEXT
,
true
)
add_bool
(
"stats"
,
true
,
STATS_TEXT
,
STATS_LONGTEXT
,
true
)
change_need_restart
()
set_subcategory
(
SUBCAT_INTERFACE_MAIN
)
set_subcategory
(
SUBCAT_INTERFACE_MAIN
)
add_module_cat
(
"intf"
,
SUBCAT_INTERFACE_MAIN
,
NULL
,
NULL
,
INTF_TEXT
,
add_module_cat
(
"intf"
,
SUBCAT_INTERFACE_MAIN
,
NULL
,
NULL
,
INTF_TEXT
,
INTF_LONGTEXT
,
false
)
INTF_LONGTEXT
,
false
)
change_short
(
'I'
)
change_short
(
'I'
)
change_need_restart
()
add_module_list_cat
(
"extraintf"
,
SUBCAT_INTERFACE_MAIN
,
add_module_list_cat
(
"extraintf"
,
SUBCAT_INTERFACE_MAIN
,
NULL
,
NULL
,
EXTRAINTF_TEXT
,
NULL
,
NULL
,
EXTRAINTF_TEXT
,
EXTRAINTF_LONGTEXT
,
false
)
EXTRAINTF_LONGTEXT
,
false
)
change_need_restart
()
set_subcategory
(
SUBCAT_INTERFACE_CONTROL
)
set_subcategory
(
SUBCAT_INTERFACE_CONTROL
)
add_module_list_cat
(
"control"
,
SUBCAT_INTERFACE_CONTROL
,
NULL
,
NULL
,
add_module_list_cat
(
"control"
,
SUBCAT_INTERFACE_CONTROL
,
NULL
,
NULL
,
CONTROL_TEXT
,
CONTROL_LONGTEXT
,
false
)
CONTROL_TEXT
,
CONTROL_LONGTEXT
,
false
)
change_need_restart
()
/* Hotkey options*/
/* Hotkey options*/
set_subcategory
(
SUBCAT_INTERFACE_HOTKEYS
)
set_subcategory
(
SUBCAT_INTERFACE_HOTKEYS
)
...
...
src/modules/entry.c
View file @
cfad8dc2
...
@@ -308,10 +308,6 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...)
...
@@ -308,10 +308,6 @@ int vlc_plugin_set (module_t *module, module_config_t *item, int propid, ...)
item
->
b_unsaveable
=
true
;
item
->
b_unsaveable
=
true
;
break
;
break
;
case
VLC_CONFIG_RESTART
:
item
->
b_restart
=
true
;
break
;
case
VLC_CONFIG_PRIVATE
:
case
VLC_CONFIG_PRIVATE
:
item
->
b_internal
=
true
;
item
->
b_internal
=
true
;
break
;
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment