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
8d7b5884
Commit
8d7b5884
authored
Nov 20, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a flag for config option to mark it as unsaveable. Refs #856 (Still need to test on a win box).
parent
c059148c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
configure.ac
configure.ac
+2
-2
include/configuration.h
include/configuration.h
+3
-0
src/libvlc.h
src/libvlc.h
+1
-0
src/misc/configuration.c
src/misc/configuration.c
+4
-0
No files found.
configure.ac
View file @
8d7b5884
...
@@ -5530,8 +5530,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
...
@@ -5530,8 +5530,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
dnl New definitions with value matching 0.
8.6
release
dnl New definitions with value matching 0.
9.0
release
module_symbol="0_
8_6c
"
module_symbol="0_
9_0
"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
VLC_ENTRY="vlc_entry__${module_symbol}"
VLC_ENTRY="vlc_entry__${module_symbol}"
...
...
include/configuration.h
View file @
8d7b5884
...
@@ -169,6 +169,7 @@ struct module_config_t
...
@@ -169,6 +169,7 @@ struct module_config_t
int
i_value_saved
;
int
i_value_saved
;
float
f_value_saved
;
float
f_value_saved
;
vlc_bool_t
b_autosave
;
/* Config will be auto-saved at exit time */
vlc_bool_t
b_autosave
;
/* Config will be auto-saved at exit time */
vlc_bool_t
b_unsaveable
;
/* confg should be saved*/
};
};
/*****************************************************************************
/*****************************************************************************
...
@@ -408,6 +409,8 @@ int config_AutoSaveConfigFile( vlc_object_t * );
...
@@ -408,6 +409,8 @@ int config_AutoSaveConfigFile( vlc_object_t * );
#define change_autosave() \
#define change_autosave() \
p_config[i_config].b_autosave = VLC_TRUE;
p_config[i_config].b_autosave = VLC_TRUE;
#define change_unsaveable() \
p_config[i_config].b_unsaveable = VLC_TRUE;
/****************************************************************************
/****************************************************************************
* config_chain_t:
* config_chain_t:
...
...
src/libvlc.h
View file @
8d7b5884
...
@@ -1634,6 +1634,7 @@ vlc_module_begin();
...
@@ -1634,6 +1634,7 @@ vlc_module_begin();
ONEINSTANCE_WIN_LONGTEXT
,
VLC_TRUE
);
ONEINSTANCE_WIN_LONGTEXT
,
VLC_TRUE
);
add_bool
(
"started-from-file"
,
0
,
NULL
,
STARTEDFROMFILE_TEXT
,
add_bool
(
"started-from-file"
,
0
,
NULL
,
STARTEDFROMFILE_TEXT
,
STARTEDFROMFILE_LONGTEXT
,
VLC_TRUE
);
STARTEDFROMFILE_LONGTEXT
,
VLC_TRUE
);
change_unsaveable
();
add_bool
(
"one-instance-when-started-from-file"
,
1
,
NULL
,
add_bool
(
"one-instance-when-started-from-file"
,
1
,
NULL
,
ONEINSTANCEWHENSTARTEDFROMFILE_TEXT
,
ONEINSTANCEWHENSTARTEDFROMFILE_TEXT
,
ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT
,
VLC_TRUE
);
ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT
,
VLC_TRUE
);
...
...
src/misc/configuration.c
View file @
8d7b5884
...
@@ -1184,6 +1184,10 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
...
@@ -1184,6 +1184,10 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
/* Ignore deprecated options */
/* Ignore deprecated options */
if
(
p_item
->
psz_current
)
if
(
p_item
->
psz_current
)
continue
;
continue
;
if
(
p_item
->
b_unsaveable
)
/*obvious*/
continue
;
if
(
b_autosave
&&
!
p_item
->
b_autosave
)
if
(
b_autosave
&&
!
p_item
->
b_autosave
)
{
{
i_value
=
p_item
->
i_value_saved
;
i_value
=
p_item
->
i_value_saved
;
...
...
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