Changeset 2bca4f1c7e98f40ff31e9b0474ec2a2b60d59379

Timestamp:

12/17/07 20:01:13 (9 months ago)

Author:

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

git-committer:

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

git-parent:

[194072ae20ccef4d08ee5c88c987d0097b0fd2e6]

git-author:

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

Message:

Add action through vlc_config_set

Files:

• include/vlc_configuration.h (modified) (2 diffs)
• include/vlc_modules_macros.h (modified) (2 diffs)
• src/config/core.c (modified) (1 diff)
• src/modules/entry.c (modified) (1 diff)

include/vlc_configuration.h

@@ -276 +276 @@
-    /* possible values list
-     * (args=size_t, const <type> *, const char *const *) */
+
+    VLC_CONFIG_ADD_ACTION,
+    /* add value change callback (args=vlc_callback_t, const char *) */
-};
-
@@ -466 +469 @@
-                    (double)(minv), (double)(maxv))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-#define change_internal() \

include/vlc_modules_macros.h

@@ -111 +111 @@
-    __VLC_SYMBOL(vlc_entry) ( module_t *p_module )                            \
-    {                                                                         \
-i_shortcut = 1, res;
+res;                
-        size_t i_config = (size_t)(-1);                                       \
-        module_config_t *p_config = NULL;                                     \
@@ -123 +123 @@
-        }                                                                     \
-        res = config_Duplicate( p_module, p_config, ++i_config );             \
-        for( size_t i = 0; i < i_config; i++ )                                \
-        {                                                                     \
-            if( p_config[ i ].i_action )                                      \
-            {                                                                 \
-                free( p_config[ i ].ppf_action );                             \
-                free( p_config[ i ].ppsz_action_text );                       \
-            }                                                                 \
-        }                                                                     \
-        free( p_config );                                                     \
-        if (res)                                                              \
-            return res;                                                       \
-        (void)i_shortcut;                                                     \
-        return VLC_SUCCESS;                                                   \
-                                                                              \

src/config/core.c

@@ -521 +521 @@
-        p_module->p_config[i] = p_orig[i];
-        p_module->p_config[i].p_lock = &p_module->object_lock;
-
-        /* duplicate the actions list */
-        if( p_orig[i].i_action )
-        {
-            int j;
-
-            p_module->p_config[i].ppf_action =
-                malloc( p_orig[i].i_action * sizeof(void *) );
-            p_module->p_config[i].ppsz_action_text =
-                malloc( p_orig[i].i_action * sizeof(char *) );
-
-            for( j = 0; j < p_orig[i].i_action; j++ )
-            {
-                p_module->p_config[i].ppf_action[j] =
-                    p_orig[i].ppf_action[j];
-                p_module->p_config[i].ppsz_action_text[j] =
-                    strdupnull (p_orig[i].ppsz_action_text[j]);
-            }
-        }
-
-        p_module->p_config[i].pf_callback = p_orig[i].pf_callback;
-    }
-    return VLC_SUCCESS;

src/modules/entry.c

@@ -356 +356 @@
-            break;
-        }
+
+        case VLC_CONFIG_ADD_ACTION:
+        {
+            vlc_callback_t cb = va_arg (ap, vlc_callback_t), *tabcb;
+            const char *name = va_arg (ap, const char *);
+            char **tabtext;
+
+            tabcb = realloc (item->ppf_action,
+                             (item->i_action + 2) * sizeof (cb));
+            if (tabcb == NULL)
+                break;
+            item->ppf_action = tabcb;
+            tabcb[item->i_action] = cb;
+            tabcb[item->i_action + 1] = NULL;
+
+            tabtext = realloc (item->ppsz_action_text,
+                               (item->i_action + 2) * sizeof (name));
+            if (tabtext == NULL)
+                break;
+            item->ppsz_action_text = tabtext;
+
+            if (name)
+                tabtext[item->i_action] = strdup (gettext (name));
+            else
+                tabtext[item->i_action] = NULL;
+            tabtext[item->i_action + 1] = NULL;
+
+            item->i_action++;
+            ret = 0;
+        }
-    }
-