Changeset 9b7380f571471c6f4d39f5946acddfc62e9bcb41

Timestamp:

01/06/05 19:08:59 (3 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1117645739 +0000

git-parent:

[3743f8f902e9b35fb926c6abd342d7a10d297c68]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1117645739 +0000

Message:

* configuration.[ch]: treat the deleted options with add_suppressed_[bool,string,...]
* standard.c: sap-ipv6 is no more used

Files:

• include/configuration.h (modified) (2 diffs)
• modules/stream_out/standard.c (modified) (1 diff)
• src/misc/configuration.c (modified) (1 diff)

include/configuration.h

@@ -343 +343 @@
-        (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; }
-
+
-#define add_deprecated( name, strict ) \
-        i_config++; \
@@ -354 +354 @@
-        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; }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/* Modifier macros for the config options (used for fine tuning) */
-#define change_short( ch ) \

modules/stream_out/standard.c

@@ -93 +93 @@
-    add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT,
-                                        VLC_TRUE );
-deprecated( SOUT_CFG_PREFIX "sap-ipv6", VLC_FALSE
+suppressed_bool( SOUT_CFG_PREFIX "sap-ipv6"
-
-    add_bool( SOUT_CFG_PREFIX "slp", 0, NULL, SLP_TEXT, SLP_LONGTEXT, VLC_TRUE );

src/misc/configuration.c

@@ -1552 +1552 @@
-                if( p_conf->psz_current )
-                {
+                    if( !strcmp(p_conf->psz_current,"SUPPRESSED") )
+                    {
+                       if( !b_ignore_errors ) 
+                        {
+                            fprintf(stderr,
+                                    "Warning: option --%s is no longer used.\n",
+                                    p_conf->psz_name);
+                        }
+                       continue;
+                    }
-                    if( !b_ignore_errors )
-                    {