Add a flag for config option to mark it as unsaveable. Refs #856 (Still need to test...

diff --git a/configure.ac b/configure.ac
index 55e6f95519b794305c7565d2aac8d673c2711815..9252a4f1ed8e53417a95a2af29cca84e4a22eb10 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
 
-dnl New definitions with value matching 0.8.6 release
-module_symbol="0_8_6c"
+dnl New definitions with value matching 0.9.0 release
+module_symbol="0_9_0"
 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}"

diff --git a/include/configuration.h b/include/configuration.h
index 6bea943c808540c78269127365e1b756166131eb..678954c01cae4c130ee4d3bc7ec051eaa0590631 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -169,6 +169,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*/
 };
 
 /*****************************************************************************
@@ -408,6 +409,8 @@ int config_AutoSaveConfigFile( vlc_object_t * );
 #define change_autosave() \
     p_config[i_config].b_autosave = VLC_TRUE;
 
+#define change_unsaveable() \
+    p_config[i_config].b_unsaveable = VLC_TRUE;
 
 /****************************************************************************
  * config_chain_t:

diff --git a/src/libvlc.h b/src/libvlc.h
index 07ea2d7ea0edf9e79018ad8d555943e75e3e0df8..c93e4bb7c3b11e66ce683c60319fd5355bcea6a1 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -1634,6 +1634,7 @@ vlc_module_begin();
               ONEINSTANCE_WIN_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 );

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index efe5049d2be2121fd981ef54d27978a95c78d2f3..2026240e4e0c64c30dd6c794ba84e912fa46a725 100644 (file)
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -1184,6 +1184,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;