Changeset 8e17cc40106fd1b44b6f48fec0bdc1298b27c2bf

Timestamp:

06/05/08 19:00:26 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212685226 +0300

git-parent:

[64ae2cbffa7639c04869e6588f80f5c1a7d05221]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212681896 +0300

Message:

Support for using a custom text domain for configuration strings

Files:

• include/vlc_plugin.h (modified) (9 diffs)
• src/modules/entry.c (modified) (7 diffs)

include/vlc_plugin.h

@@ -94 +94 @@
-    {                                                                         \
-        module_config_t *p_config = NULL;                                     \
+        const char *domain = NULL;                                            \
-        if (vlc_module_set (p_module, VLC_MODULE_NAME,                        \
-                            (const char *)(MODULE_STRING)))                   \
@@ -151 +152 @@
-    if (vlc_module_set (p_submodule, VLC_MODULE_NO_UNLOAD)) \
-        goto error;
+
+#define set_text_domain( dom ) domain = (dom);
-
-VLC_EXPORT( module_t *, vlc_module_create, ( vlc_object_t * ) );
@@ -187 +190 @@
-    /* command line name (args=const char *, vlc_callback_t) */
-
-
+_NODOMAIN
-    /* description (args=const char *, const char *) */
-
@@ -220 +223 @@
-    /* one-character (short) command line option name (args=char) */
-
+    VLC_CONFIG_LIST_NODOMAIN,
+    /* possible values list
+     * (args=size_t, const <type> *, const char *const *) */
+
+    VLC_CONFIG_ADD_ACTION_NODOMAIN,
+    /* add value change callback (args=vlc_callback_t, const char *) */
+
+    VLC_CONFIG_OLDNAME,
+    /* former option name (args=const char *) */
+
+    VLC_CONFIG_SAFE,
+    /* tag as modifiable by untrusted input item "sources" (args=none) */
+
+    VLC_CONFIG_DESC,
+    /* description (args=const char *, const char *, const char *) */
+
-    VLC_CONFIG_LIST,
-    /* possible values list
-
+const char *, 
-
-    VLC_CONFIG_ADD_ACTION,
-
-
-
-
-
-
-
+
+
-};
-
@@ -252 +266 @@
-#define add_typedesc_inner( type, text, longtext ) \
-    add_type_inner( type ) \
-
+domain, 
-                    (const char *)(text), (const char *)(longtext));
-
@@ -387 +401 @@
-
-#define change_string_list( list, list_text, list_update_func ) \
-
+domain, 
-                    (size_t)(sizeof (list) / sizeof (char *)), \
-                    (const char *const *)(list), \
@@ -394 +408 @@
-
-#define change_integer_list( list, list_text, list_update_func ) \
-
+domain, 
-                    (size_t)(sizeof (list) / sizeof (int)), \
-                    (const int *)(list), \
@@ -401 +415 @@
-
-#define change_float_list( list, list_text, list_update_func ) \
-
+domain, 
-                    (size_t)(sizeof (list) / sizeof (float)), \
-                    (const float *)(list), \
@@ -415 +429 @@
-
-#define change_action_add( pf_action, text ) \
-
+domain, 
-                    (vlc_callback_t)(pf_action), (const char *)(text));
-

src/modules/entry.c

@@ -253 +253 @@
-        }
-
-
+_NODOMAIN
-        {
-            const char *text = va_arg (ap, const char *);
-            const char *longtext = va_arg (ap, const char *);
-
-
-
-
-
+
-            break;
-        }
@@ -353 +349 @@
-            break;
-
+        case VLC_CONFIG_LIST_NODOMAIN:
+        {
+            size_t len = va_arg (ap, size_t);
+            if (IsConfigIntegerType (item->i_type))
+            {
+                const int *src = va_arg (ap, const int *);
+                const char *const *text = va_arg (ap, const char *const *);
+                ret = vlc_config_set (item, VLC_CONFIG_LIST, NULL, len, src,
+                                      text);
+            }
+            else
+            if (IsConfigStringType (item->i_type))
+            {
+                const char *const *src = va_arg (ap, const char *const *);
+                const char *const *text = va_arg (ap, const char *const *);
+                ret = vlc_config_set (item, VLC_CONFIG_LIST, NULL, len, src,
+                                      text);
+            }
+            break;
+        }
+
+        case VLC_CONFIG_ADD_ACTION_NODOMAIN:
+        {
+            vlc_callback_t cb = va_arg (ap, vlc_callback_t);
+            const char *name = va_arg (ap, const char *);
+            ret = vlc_config_set (item, VLC_CONFIG_ADD_ACTION, NULL, cb, name);
+            break;
+        }
+
+        case VLC_CONFIG_OLDNAME:
+        {
+            const char *oldname = va_arg (ap, const char *);
+            item->psz_oldname = oldname ? strdup (oldname) : NULL;
+            ret = 0;
+            break;
+        }
+
+        case VLC_CONFIG_SAFE:
+            item->b_safe = true;
+            ret = 0;
+            break;
+
+        case VLC_CONFIG_DESC:
+        {
+            const char *domain = va_arg (ap, const char *);
+            const char *text = va_arg (ap, const char *);
+            const char *longtext = va_arg (ap, const char *);
+
+            if (domain == NULL)
+                domain = PACKAGE;
+            item->psz_text = text ? strdup (dgettext (domain, text)) : NULL;
+            item->psz_longtext =
+                longtext ? strdup (dgettext (domain, longtext)) : NULL;
+            ret = 0;
+            break;
+        }
+
-        case VLC_CONFIG_LIST:
-        {
+            const char *domain = va_arg (ap, const char *);
-            size_t len = va_arg (ap, size_t);
-            char **dtext = malloc (sizeof (char *) * (len + 1));
@@ -407 +461 @@
-
-            /* Copy textual descriptions */
+            if (domain == NULL)
+                domain = PACKAGE;
+
-            const char *const *text = va_arg (ap, const char *const *);
-            if (text != NULL)
@@ -412 +469 @@
-                for (size_t i = 0; i < len; i++)
-                    dtext[i] =
-PACKAGE
+domain
-
-                dtext[len] = NULL;
@@ -431 +488 @@
-        case VLC_CONFIG_ADD_ACTION:
-        {
+            const char *domain = va_arg (ap, const char *);
-            vlc_callback_t cb = va_arg (ap, vlc_callback_t), *tabcb;
-            const char *name = va_arg (ap, const char *);
@@ -449 +507 @@
-            item->ppsz_action_text = tabtext;
-
+            if (domain == NULL)
+                domain = PACKAGE;
-            if (name)
-PACKAGE
+domain
-            else
-                tabtext[item->i_action] = NULL;
@@ -459 +519 @@
-            break;
-        }
-
-        case VLC_CONFIG_OLDNAME:
-        {
-            const char *oldname = va_arg (ap, const char *);
-            item->psz_oldname = oldname ? strdup (oldname) : NULL;
-            ret = 0;
-            break;
-        }
-
-        case VLC_CONFIG_SAFE:
-            item->b_safe = true;
-            ret = 0;
-            break;
-    }
-