Commit 9d1a534d authored by Christophe Mutricy's avatar Christophe Mutricy

Backports [15729], [15732], [17898] and part of [15732]. b_internal and b_unsaveable config flags.

parent 3d8a0790
...@@ -5401,7 +5401,7 @@ dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for modu ...@@ -5401,7 +5401,7 @@ dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for modu
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.8.6 release
module_symbol="0_8_6" module_symbol="0_8_6a"
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}"
......
...@@ -154,6 +154,7 @@ struct module_config_t ...@@ -154,6 +154,7 @@ struct module_config_t
vlc_mutex_t *p_lock; /* Lock to use when modifying the config */ vlc_mutex_t *p_lock; /* Lock to use when modifying the config */
vlc_bool_t b_dirty; /* Dirty flag to indicate a config change */ vlc_bool_t b_dirty; /* Dirty flag to indicate a config change */
vlc_bool_t b_advanced; /* Flag to indicate an advanced option */ vlc_bool_t b_advanced; /* Flag to indicate an advanced option */
vlc_bool_t b_internal; /* Flag to indicate option is not to be shown */
/* Original option values */ /* Original option values */
char *psz_value_orig; char *psz_value_orig;
...@@ -165,6 +166,7 @@ struct module_config_t ...@@ -165,6 +166,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*/
}; };
/***************************************************************************** /*****************************************************************************
...@@ -395,5 +397,12 @@ int config_AutoSaveConfigFile( vlc_object_t * ); ...@@ -395,5 +397,12 @@ int config_AutoSaveConfigFile( vlc_object_t * );
action_text; \ action_text; \
p_config[i_config].i_action++; p_config[i_config].i_action++;
#define change_internal() \
p_config[i_config].b_internal = VLC_TRUE;
#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;
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
static module_config_t config_end = { \ static module_config_t config_end = { \
CONFIG_HINT_END, NULL, NULL, 0, NULL, NULL, NULL, 0, 0., 0, 0, \ CONFIG_HINT_END, NULL, NULL, 0, NULL, NULL, NULL, 0, 0., 0, 0, \
0., 0., NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL, \ 0., 0., NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0, NULL, \
VLC_FALSE, NULL, VLC_FALSE, VLC_FALSE, NULL, 0, 0., NULL, 0, 0., \ VLC_FALSE, NULL, VLC_FALSE, VLC_FALSE, VLC_FALSE, NULL, 0, 0., \
VLC_FALSE \ NULL, 0, 0., VLC_FALSE, VLC_FALSE \
}; \ }; \
STORE_SYMBOLS; \ STORE_SYMBOLS; \
p_module->b_submodule = VLC_FALSE; \ p_module->b_submodule = VLC_FALSE; \
......
...@@ -66,7 +66,9 @@ vlc_module_begin(); ...@@ -66,7 +66,9 @@ vlc_module_begin();
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 );
add_bool( "cdda-separate-tracks", VLC_TRUE, NULL, NULL, NULL, VLC_TRUE ); add_bool( "cdda-separate-tracks", VLC_TRUE, NULL, NULL, NULL, VLC_TRUE );
change_internal();
add_integer( "cdda-track", -1 , NULL, NULL, NULL, VLC_TRUE ); add_integer( "cdda-track", -1 , NULL, NULL, NULL, VLC_TRUE );
change_internal();
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 );
......
...@@ -639,6 +639,10 @@ static VLCTreeItem *o_root_item = nil; ...@@ -639,6 +639,10 @@ static VLCTreeItem *o_root_item = nil;
default: default:
{ {
VLCConfigControl *o_control = nil; VLCConfigControl *o_control = nil;
if( p_item->b_internal == VLC_TRUE )
{
break;
}
o_control = [VLCConfigControl newControl:p_item o_control = [VLCConfigControl newControl:p_item
withView:o_view]; withView:o_view];
if( o_control != nil ) if( o_control != nil )
......
...@@ -999,6 +999,8 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf, ...@@ -999,6 +999,8 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
p_item->i_type == CONFIG_SUBCATEGORY ) ) p_item->i_type == CONFIG_SUBCATEGORY ) )
break; break;
if( p_item->b_internal == VLC_TRUE ) continue;
ConfigControl *control = ConfigControl *control =
CreateConfigControl( VLC_OBJECT(p_intf), CreateConfigControl( VLC_OBJECT(p_intf),
p_item, config_window ); p_item, config_window );
......
...@@ -1537,6 +1537,7 @@ vlc_module_begin(); ...@@ -1537,6 +1537,7 @@ vlc_module_begin();
ONEINSTANCE_LONGTEXT, VLC_TRUE ); ONEINSTANCE_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 );
......
...@@ -1202,6 +1202,10 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name, ...@@ -1202,6 +1202,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment