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

configure.ac

@@ -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 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_SYMBOL, $module_symbol, [Symbol suffix for module functions])
 VLC_ENTRY="vlc_entry__${module_symbol}"

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 shown */
 
     /* Original option values */
     char        *psz_value_orig;
@@ -165,6 +166,7 @@ struct module_config_t
     int          i_value_saved;
     float        f_value_saved;
     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 * );
       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;
+
+#define change_unsaveable() \
+    p_config[i_config].b_unsaveable = VLC_TRUE;
+

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, VLC_FALSE                                 \
         };                                                                    \
         STORE_SYMBOLS;                                                        \
         p_module->b_submodule = VLC_FALSE;                                    \

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 );

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 )

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 );

src/libvlc.h

@@ -1537,6 +1537,7 @@ vlc_module_begin();
               ONEINSTANCE_LONGTEXT, VLC_TRUE );
     add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
               STARTEDFROMFILE_LONGTEXT, VLC_TRUE );
+        change_unsaveable();
     add_bool( "one-instance-when-started-from-file", 1, NULL,
               ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
               ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );

src/misc/configuration.c

@@ -1202,6 +1202,10 @@ static int SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name,
             /* Ignore deprecated options */
             if( p_item->psz_current )
                 continue;
+            if( p_item->b_unsaveable )
+                /*obvious*/
+                continue;
+            
             if( b_autosave && !p_item->b_autosave )
             {
                 i_value = p_item->i_value_saved;