* src/input/es_out.c: when removing an active track, re-run the track selection algo.

[vlc] / include / configuration.h

diff --git a/include/configuration.h b/include/configuration.h
index 31d9dd6fd686048fa7e267ae404c428c67c8b31b..b33e97f13cf54521364a1b96cff090647cd56f21 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -3,7 +3,7 @@
  * This file describes the programming interface for the configuration module.
  * It includes functions allowing to declare, get or set configuration options.
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
+ * Copyright (C) 1999, 2000 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -342,7 +342,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
     if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
         (i_config+11) * sizeof(module_config_t)); \
     { static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, '\0', text, longtext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; }
-
+/* For option renamed */
 #define add_deprecated( name, strict ) \
         i_config++; \
     if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
@@ -353,7 +353,44 @@ int config_AutoSaveConfigFile( vlc_object_t * );
         p_config[ i_config ].psz_name = name; \
         p_config[i_config].b_strict = strict; \
         p_config[ i_config ].psz_current = p_config[ i_config-1].psz_current?p_config[ i_config-1 ].psz_current:p_config[ i_config-1 ].psz_name; }
+/* For option suppressed*/
+#define add_suppressed_bool( name ) \
+        i_config++; \
+    if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
+        (i_config+11) * sizeof(module_config_t)); \
+    {   static module_config_t tmp; \
+        p_config[ i_config ] = tmp; \
+        p_config[ i_config ].i_type = CONFIG_ITEM_BOOL; \
+        p_config[ i_config ].psz_name = name; \
+        p_config[ i_config ].psz_current = "SUPPRESSED"; }
 
+#define add_suppressed_integer( name ) \
+        i_config++; \
+    if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
+        (i_config+11) * sizeof(module_config_t)); \
+    {   static module_config_t tmp; \
+        p_config[ i_config ] = tmp; \
+        p_config[ i_config ].i_type = CONFIG_ITEM_INTEGER; \
+        p_config[ i_config ].psz_name = name; \
+        p_config[ i_config ].psz_current = "SUPPRESSED"; }
+#define add_suppressed_float( name ) \
+        i_config++; \
+    if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
+        (i_config+11) * sizeof(module_config_t)); \
+    {   static module_config_t tmp; \
+        p_config[ i_config ] = tmp; \
+        p_config[ i_config ].i_type = CONFIG_ITEM_FLOAT; \
+        p_config[ i_config ].psz_name = name; \
+        p_config[ i_config ].psz_current = "SUPPRESSED"; }
+#define add_suppressed_string( name ) \
+        i_config++; \
+    if(!(i_config%10)) p_config = (module_config_t* )realloc(p_config, \
+        (i_config+11) * sizeof(module_config_t)); \
+    {   static module_config_t tmp; \
+        p_config[ i_config ] = tmp; \
+        p_config[ i_config ].i_type = CONFIG_ITEM_STRING; \
+        p_config[ i_config ].psz_name = name; \
+        p_config[ i_config ].psz_current = "SUPPRESSED"; }
 /* Modifier macros for the config options (used for fine tuning) */
 #define change_short( ch ) \
     p_config[i_config].i_short = ch;