Changeset 3ca1fe82ca224cd14ec194ad83f6a424dd1a8500

Timestamp:

17/12/07 21:53:25 (10 months ago)

Author:

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

git-committer:

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

git-parent:

[927f27d8c6feedb36da0b1e442bb897e2be6f90e]

git-author:

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

Message:

Use vlc_config_create()

Files:

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

include/vlc_configuration.h

@@ -212 +212 @@
-VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) );
-
-VLC_EXPORT( int, config_Duplicate,( module_t *, const module_config_t *, size_t ));
-
-VLC_EXPORT(const char *, config_GetDataDir, ( void ));
-
@@ -301 +299 @@
- *****************************************************************************/
-
-#define add_config_inner( ) \
-    i_config++; \
-    if( (i_config % 10) == 0 ) \
-        p_config = (module_config_t *) \
-             realloc(p_config, (i_config+11) * sizeof(module_config_t)); \
-    memset( p_config + i_config, 0, sizeof( *p_config ) )
-
-#define add_type_inner( type ) \
-
-
+
-
-#define add_typedesc_inner( type, text, longtext ) \
-    add_type_inner( type ); \
- + i_config
+
-                    (const char *)(text), (const char *)(longtext))
-
-#define add_typeadv_inner( type, text, longtext, advc ) \
-    add_typedesc_inner( type, text, longtext ); \
- + i_config
+
-
-#define add_typename_inner( type, name, text, longtext, advc, cb ) \
-    add_typeadv_inner( type, text, longtext, advc ); \
- + i_config
+
-                    (const char *)(name), (vlc_callback_t)(cb))
-
-#define add_string_inner( type, name, text, longtext, advc, cb, v ) \
-    add_typename_inner( type, name, text, longtext, advc, cb ); \
- + i_config
+
-
-#define add_int_inner( type, name, text, longtext, advc, cb, v ) \
-    add_typename_inner( type, name, text, longtext, advc, cb ); \
- + i_config
+
-
-
-#define set_category( i_id ) \
-    add_type_inner( CONFIG_CATEGORY ); \
-[i_config].
+->
-
-#define set_subcategory( i_id ) \
-    add_type_inner( CONFIG_SUBCATEGORY ); \
-[i_config].
+->
-
-#define set_section( text, longtext ) \
@@ -372 +362 @@
-#define add_module( name, psz_caps, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE, name, text, longtext, advc, p_callback, value ); \
-
-
+
-
-#define add_module_list( name, psz_caps, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE_LIST, name, text, longtext, advc, p_callback, value ); \
-
-
+
-
-#ifndef __PLUGIN__
-#define add_module_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE_CAT, name, text, longtext, advc, p_callback, value ); \
-[i_config].
+->
-
-#define add_module_list_cat( name, i_subcategory, value, p_callback, text, longtext, advc ) \
-    add_string_inner( CONFIG_ITEM_MODULE_LIST_CAT, name, text, longtext, advc, p_callback, value ); \
-[i_config].
+->
-#endif
-
@@ -402 +390 @@
-#define add_float( name, v, p_callback, text, longtext, advc ) \
-    add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc, p_callback ); \
- + i_config
+
-
-#define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
@@ -410 +398 @@
-#define add_bool( name, v, p_callback, text, longtext, advc ) \
-    add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc, p_callback ); \
- + i_config
+
-
-/* For removed option */
-#define add_obsolete_inner( name, type ) \
-    add_type_inner( type ); \
- + i_config
+
-                    (const char *)(name), (vlc_callback_t)NULL); \
- + i_config
+
-
-#define add_obsolete_bool( name ) \
@@ -434 +422 @@
-
-#define add_deprecated_alias( name ) \
-
-
+
-
-#define change_short( ch ) \
- + i_config
+
-
-#define change_string_list( list, list_text, list_update_func ) \
- + i_config
+
-                    (size_t)(sizeof (list) / sizeof (char *)), \
-                    (const char *const *)(list), \
@@ -447 +434 @@
-
-#define change_integer_list( list, list_text, list_update_func ) \
- + i_config
+
-                    (size_t)(sizeof (list) / sizeof (int)), \
-                    (const int *)(list), \
@@ -453 +440 @@
-
-#define change_float_list( list, list_text, list_update_func ) \
- + i_config
+
-                    (size_t)(sizeof (list) / sizeof (float)), \
-                    (const float *)(list), \
@@ -459 +446 @@
-
-#define change_integer_range( minv, maxv ) \
-
-
+
-
-#define change_float_range( minv, maxv ) \
- + i_config
+
-                    (double)(minv), (double)(maxv))
-
-#define change_action_add( pf_action, text ) \
- + i_config
+
-                    (vlc_callback_t)(pf_action), (const char *)(text))
-
-#define change_internal() \
- + i_config
+
-
-#define change_need_restart() \
- + i_config
+
-
-#define change_autosave() \
- + i_config
+
-
-#define change_unsaveable() \
- + i_config
+
-
-/****************************************************************************

include/vlc_modules_macros.h

@@ -112 +112 @@
-    {                                                                         \
-        int res;                                                              \
-        size_t i_config = (size_t)(-1);                                       \
-        module_config_t *p_config = NULL;                                     \
-        if (vlc_module_set (p_module, VLC_MODULE_NAME,                        \
@@ -122 +121 @@
-#define vlc_module_end( )                                                     \
-        }                                                                     \
-config_Duplicate( p_module, p_config, ++i_config );
+VLC_SUCCESS;                                       
-                                                                              \
-    error:                                                                    \
-config
+module
-        /* FIXME: cleanup submodules objects ??? */                           \
-        return VLC_EGENERIC;                                                  \

src/config/config.h

@@ -34 +34 @@
-int  config_CreateDir( vlc_object_t *, const char * );
-int  config_AutoSaveConfigFile( vlc_object_t * );
+
+/* TODO: remove this, only used for helper module */
+int config_Duplicate( module_t *, module_config_t *, size_t );
-
-void config_Free( module_t * );

src/config/core.c

@@ -487 +487 @@
- * This is why we need to create an exact copy of the config data.
- *****************************************************************************/
-const 
+
-                      size_t n )
-{

src/libvlc.sym

@@ -47 +47 @@
-config_ChainDestroy
-__config_ChainParse
-config_Duplicate
-config_FindConfig
-config_GetDataDir

src/modules/entry.c

@@ -158 +158 @@
-        module->p_config = tab;
-    }
-    module->confsize++;
-
-    memset (tab + confsize, 0, sizeof (tab[confsize]));
@@ -171 +170 @@
-    }
-
+    module->confsize++;
-    return tab + confsize;
-}