Changeset 3655c1c6edfa65212b263fa330e0bf4809eeb5d1

Timestamp:

17/12/07 20:36:58 (10 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1197920218 +0000

git-parent:

[2bca4f1c7e98f40ff31e9b0474ec2a2b60d59379]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1197920218 +0000

Message:

Add support for aliases through vlc_config_set

Files:

• include/vlc_configuration.h (modified) (4 diffs)
• src/config/chain.c (modified) (2 diffs)
• src/config/cmdline.c (modified) (2 diffs)
• src/config/core.c (modified) (1 diff)
• src/config/file.c (modified) (1 diff)
• src/libvlc-common.c (modified) (1 diff)
• src/modules/cache.c (modified) (2 diffs)
• src/modules/entry.c (modified) (2 diffs)
• src/modules/modules.c (modified) (1 diff)

include/vlc_configuration.h

@@ -185 +185 @@
-
-    /* Deprecated */
-onst char    *psz_current;                         /* Goo
-strict;                     /* Transitionnal or strict */
+har          *psz_oldname;                          /* Ol
+removed;
-
-    /* Option values loaded from config file */
@@ -279 +279 @@
-    VLC_CONFIG_ADD_ACTION,
-    /* add value change callback (args=vlc_callback_t, const char *) */
+
+    VLC_CONFIG_OLDNAME,
+    /* former option name (args=const char *) */
-};
-
@@ -409 +412 @@
-    if (v) vlc_config_set (p_config + i_config, VLC_CONFIG_VALUE, (int)VLC_TRUE)
-
-/* For renamed option */
-#define add_deprecated_alias( name ) \
-    add_config_inner( ); \
-    p_config[ i_config ].i_type = p_config[ i_config -1 ].i_type; \
-    vlc_config_set (p_config + i_config, VLC_CONFIG_NAME, \
-                    (const char *)(name), (vlc_callback_t)NULL); \
-    p_config[i_config].b_strict = VLC_FALSE; \
-    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 removed option */
-#define add_obsolete_inner( name, type ) \
@@ -440 +432 @@
-
-/* Modifier macros for the config options (used for fine tuning) */
+
+#define add_deprecated_alias( name ) \
+    vlc_config_set (p_config + i_config, VLC_CONFIG_OLDNAME, \
+                    (const char *)(name))
+
-#define change_short( ch ) \
-    vlc_config_set (p_config + i_config, VLC_CONFIG_SHORTCUT, (int)(ch))

src/config/chain.c

@@ -297 +297 @@
-        /* This is basically cut and paste from src/misc/configuration.c
-         * with slight changes */
-&& p_conf->psz_current 
-
-strict
+
+
+removed
-            {
-                msg_Err( p_this, "Option %s is not supported anymore.",
-p_conf->psz_
+
-                /* TODO: this should return an error and end option parsing
-                 * ... but doing this would change the VLC API and all the
@@ -308 +308 @@
-                continue;
-            }
-
-
-
+
+
+
+
+
+
+
-        }
-        /* </Check if the option is deprecated> */

src/config/cmdline.c

@@ -279 +279 @@
-            {
-                /* Check if the option is deprecated */
-psz_current
+b_removed
-                {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    fprintf( stderr,
-                             "%s: option --%s is deprecated. Use --%s instead.\n",
-                             b_ignore_errors ? "Warning" : "Error",
-_conf->psz_name, p_conf->psz_current
+sz_name, p_conf->psz_name 
-                    if( !b_ignore_errors )
-                    {
@@ -304 +305 @@
-                    }
-
-
-
+
-                }
-

src/config/core.c

@@ -465 +465 @@
-                /* ignore hints */
-                continue;
-
+
+
+
-            {
-                vlc_list_release( p_list );

src/config/file.c

@@ -544 +544 @@
-
-            if ((p_item->i_type & CONFIG_HINT) /* ignore hint */
-psz_current
+b_removed  
-             || p_item->b_unsaveable)          /* ignore volatile option */
-                continue;

src/libvlc-common.c

@@ -1456 +1456 @@
-            size_t i_cur_width;
-
-deprecat
-psz_current
+remov
+b_removed
-            {
-                continue;

src/modules/cache.c

@@ -353 +353 @@
-        LOAD_STRING( p_module->p_config[i].psz_text );
-        LOAD_STRING( p_module->p_config[i].psz_longtext );
-
+
+
-
-        if (IsConfigStringType (p_module->p_config[i].i_type))
@@ -618 +619 @@
-        SAVE_STRING( p_module->p_config[i].psz_text );
-        SAVE_STRING( p_module->p_config[i].psz_longtext );
-
+
+
+
-        if (IsConfigStringType (p_module->p_config[i].i_type))
-            SAVE_STRING( p_module->p_config[i].orig.psz );

src/modules/entry.c

@@ -269 +269 @@
-
-        case VLC_CONFIG_REMOVED:
-psz_current = "SUPPRESSED"
+b_removed = VLC_TRUE
-            ret = 0;
-            break;
@@ -385 +385 @@
-            item->i_action++;
-            ret = 0;
+            break;
+        }
+
+        case VLC_CONFIG_OLDNAME:
+        {
+            const char *oldname = va_arg (ap, const char *);
+            item->psz_oldname = oldname ? strdup (oldname) : NULL;
+            ret = 0;
+            break;
-        }
-    }

src/modules/modules.c

@@ -805 +805 @@
-        if (item->b_internal /* internal option */
-         || item->b_unsaveable /* non-modifiable option */
-psz_current /* deprecated option name
+b_removed /* removed option
-            continue;
-