From 38f9675cdd28ab19b806307f9d1629f85a34a576 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Thu, 25 May 2006 14:24:17 +0000 Subject: [PATCH] Add a change_internal modifier to options. Please check OS X implementation --- include/configuration.h | 4 ++++ include/modules_inner.h | 4 ++-- modules/access/cdda.c | 2 ++ modules/gui/macosx/prefs.m | 4 ++++ modules/gui/wxwidgets/dialogs/preferences.cpp | 2 ++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configuration.h b/include/configuration.h index 6b708809c8..2d775d0d28 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -154,6 +154,7 @@ struct module_config_t 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_advanced; /* Flag to indicate an advanced option */ + vlc_bool_t b_internal; /* Flag to indicate option is not to be shows */ /* Original option values */ char *psz_value_orig; @@ -395,5 +396,8 @@ int config_AutoSaveConfigFile( vlc_object_t * ); action_text; \ p_config[i_config].i_action++; +#define change_internal() \ + p_config[i_config].b_internal = VLC_TRUE; + #define change_autosave() \ p_config[i_config].b_autosave = VLC_TRUE; diff --git a/include/modules_inner.h b/include/modules_inner.h index 6cbdd05c2b..796808aaaa 100644 --- a/include/modules_inner.h +++ b/include/modules_inner.h @@ -102,8 +102,8 @@ static module_config_t config_end = { \ 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, \ - VLC_FALSE, NULL, VLC_FALSE, VLC_FALSE, NULL, 0, 0., NULL, 0, 0., \ - VLC_FALSE \ + VLC_FALSE, NULL, VLC_FALSE, VLC_FALSE, VLC_FALSE, NULL, 0, 0., \ + NULL, 0, 0., VLC_FALSE \ }; \ STORE_SYMBOLS; \ p_module->b_submodule = VLC_FALSE; \ diff --git a/modules/access/cdda.c b/modules/access/cdda.c index db9860737b..30a5d959e8 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -66,7 +66,9 @@ vlc_module_begin(); add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, 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 ); + change_internal(); add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), VLC_TRUE ); diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index 02dff1a1aa..f30fa17412 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -639,6 +639,10 @@ static VLCTreeItem *o_root_item = nil; default: { VLCConfigControl *o_control = nil; + if( p_item->b_internal == VLC_TRUE ) + { + break; + } o_control = [VLCConfigControl newControl:p_item withView:o_view]; if( o_control != nil ) diff --git a/modules/gui/wxwidgets/dialogs/preferences.cpp b/modules/gui/wxwidgets/dialogs/preferences.cpp index 34348ccebd..225b180d8a 100644 --- a/modules/gui/wxwidgets/dialogs/preferences.cpp +++ b/modules/gui/wxwidgets/dialogs/preferences.cpp @@ -999,6 +999,8 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf, p_item->i_type == CONFIG_SUBCATEGORY ) ) break; + if( p_item->b_internal == VLC_TRUE ) continue; + ConfigControl *control = CreateConfigControl( VLC_OBJECT(p_intf), p_item, config_window ); -- 2.39.5