Changeset 135e63dac88431dd13b2d0360b85bb8b190e3843

Timestamp:

30/08/08 14:02:14 (3 months ago)

Author:

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

git-committer:

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

git-parent:

[ca44ef6f6fe0af3878347243618b41b5d8b897e6]

git-author:

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

Message:

p_module_bank: move out of vlc_global

Files:

• src/libvlc.c (modified) (7 diffs)
• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (1 diff)
• src/modules/cache.c (modified) (9 diffs)
• src/modules/modules.c (modified) (13 diffs)

src/libvlc.c

@@ -183 +183 @@
-        return NULL;
-
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-    /* Now that the thread system is initialized, we don't have much, but
-     * at least we have variables */
@@ -191 +190 @@
-        /* Guess what CPU we have */
-        cpu_flags = CPUCapabilities();
-
-libvlc_global->p_
+ 
+
-    }
-
@@ -251 +250 @@
-                         const char *ppsz_argv[] )
-{
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-    libvlc_priv_t *priv = libvlc_priv (p_libvlc);
-    char         p_capabilities[200];
@@ -325 +323 @@
-    if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 )
-    {
-libvlc_global->p_
+
-    }
-
@@ -417 +415 @@
-    if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
-    {
-libvlc_global->p_
+
-
-        /* Reset the default domain */
@@ -430 +428 @@
-            config_LoadConfigFile( p_libvlc, "main" );
-        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
-libvlc_global->p_
+
-    }
-    free( psz_language );
@@ -450 +448 @@
-
-    msg_Dbg( p_libvlc, "module bank initialized, found %i modules",
-libvlc_global->p_
+
-
-    /* Check for help on modules */

src/libvlc.h

@@ -141 +141 @@
-    VLC_COMMON_MEMBERS
-
-    module_bank_t *        p_module_bank; ///< The module bank
-
-    char *                 psz_vlcpath;
-} libvlc_global_data_t;
-
+/**
+ * The module bank
+ */
+extern module_bank_t *p_module_bank;
-
-libvlc_global_data_t *vlc_global (void);

src/misc/objects.c

@@ -875 +875 @@
-         * hack is brought to you by Courmisch. */
-        if (i_type == VLC_OBJECT_MODULE)
-vlc_global ()->
+
-                                  i_type, FIND_CHILD);
-        return vlc_list_find (p_this->p_libvlc, i_type, FIND_CHILD);

src/modules/cache.c

@@ -106 +106 @@
-    module_cache_t **pp_cache = 0;
-    int32_t i_file_size, i_marker;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    if( !psz_cachedir ) /* XXX: this should never happen */
@@ -122 +121 @@
-    free( psz_cachedir );
-
-libvlc_global->p_
+
-    {
-#if !defined( UNDER_CE )
@@ -225 +224 @@
-    }
-
-libvlc_global->p_
+
-    if (fread( &i_cache, 1, sizeof(i_cache), file ) != sizeof(i_cache) )
-    {
@@ -235 +234 @@
-
-    if( i_cache )
-libvlc_global->p_
+
-                   malloc( i_cache * sizeof(void *) );
-
@@ -266 +265 @@
-
-        pp_cache[i] = malloc( sizeof(module_cache_t) );
-libvlc_global->p_
+
-
-        /* Load common info */
@@ -332 +331 @@
-
-    /* TODO: cleanup */
-libvlc_global->p_
+
-
-    fclose( file );
@@ -474 +473 @@
-    module_cache_t **pp_cache;
-    uint32_t i_file_size = 0;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    if( !psz_cachedir ) /* XXX: this should never happen */
@@ -531 +529 @@
-        goto error;
-
-libvlc_global->p_
-libvlc_global->p_
+
+
-
-    if (fwrite( &i_cache, sizeof (i_cache), 1, file) != 1)
@@ -726 +724 @@
-    module_cache_t **pp_cache;
-    int i_cache, i;
-
-
-
-
+
+
+
-
-    for( i = 0; i < i_cache; i++ )

src/modules/modules.c

@@ -91 +91 @@
-#include "modules/builtin.h"
-
+module_bank_t *p_module_bank;
+
-/*****************************************************************************
- * Local prototypes
@@ -118 +120 @@
-{
-    module_bank_t *p_bank = NULL;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
-
-libvlc_global->p_
+
-    {
-        p_bank = vlc_custom_create( p_this, sizeof(module_bank_t),
@@ -133 +134 @@
-
-        /* Everything worked, attach the object */
-
-
+
-
-        /* Fills the module bank structure with the main module infos.
@@ -144 +144 @@
-    }
-    else
-libvlc_global->p_
+
-
-    vlc_mutex_unlock( lock );
@@ -161 +161 @@
-{
-    module_t * p_next = NULL;
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
-libvlc_global->p_
+
-    {
-        vlc_mutex_unlock( lock );
-        return;
-    }
-libvlc_global->p_
+
-    {
-        vlc_mutex_unlock( lock );
@@ -180 +179 @@
-
-#ifdef HAVE_DYNAMIC_PLUGINS
-libvlc_global->p_
+
-    if( p_bank->b_cache ) CacheSave( p_this );
-    while( p_bank->i_loaded_cache-- )
@@ -213 +212 @@
-#endif
-
-
-
-
-
-
+
+
+
-        DeleteModule( p_next, true );
-    }
-
-libvlc_global->p_
-libvlc_global->p_
+
+
-}
-
@@ -234 +231 @@
-void __module_LoadBuiltins( vlc_object_t * p_this )
-{
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
-libvlc_global->p_
+
-    {
-        vlc_mutex_unlock( lock );
-        return;
-    }
-libvlc_global->p_
+
-    vlc_mutex_unlock( lock );
-
@@ -260 +255 @@
-{
-#ifdef HAVE_DYNAMIC_PLUGINS
-    libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-    vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
-libvlc_global->p_
+
-    {
-        vlc_mutex_unlock( lock );
-        return;
-    }
-libvlc_global->p_
+
-    vlc_mutex_unlock( lock );
-
@@ -274 +267 @@
-
-    if( config_GetInt( p_this, "plugins-cache" ) )
-libvlc_global->p_
-
-libvlc_global->p_
-libvlc_global->p_
+
+
+
+
-
-    AllocateAllPlugins( p_this );
@@ -1189 +1182 @@
-    if( p_module )
-    {
-        libvlc_global_data_t *p_libvlc_global = vlc_global();
-
-        /* Everything worked fine !
-         * The module is ready to be added to the list. */
@@ -1198 +1189 @@
-                    p_module->psz_object_name, p_module->psz_longname ); */
-
-libvlc_global->p_
-
-libvlc_global->p_
+
+
+
-            return 0;
-
-libvlc_global->p_
+
-        /* Add entry to cache */
-        p_bank->pp_cache =
@@ -1364 +1355 @@
-                p_module->psz_object_name, p_module->psz_longname ); */
-
-vlc_global()->
+
-
-    return 0;