Changeset d21779b98ec08fd9ef91468ad76d3737f4209e2c

Timestamp:

29/03/08 15:13:49 (6 months ago)

Author:

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

git-committer:

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

git-parent:

[e8d99a6b947164f275e2e58bda13f1fcf5795231]

git-author:

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

Message:

Remove some global object-specific hacks

Files:

• src/misc/objects.c (modified) (7 diffs)
• src/misc/threads.c (modified) (1 diff)

src/misc/objects.c

@@ -96 +96 @@
- *****************************************************************************/
-static vlc_mutex_t    structure_lock;
-static vlc_object_internals_t global_internals;
-
-void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
@@ -104 +103 @@
-    vlc_object_internals_t *p_priv;
-
+    p_priv = calloc( 1, sizeof( *p_priv ) + i_size );
+    if( p_priv == NULL )
+        return NULL;
+
-    if( i_type == VLC_OBJECT_GLOBAL )
-    {
-        p_new = p_this;
-        p_priv = &global_internals;
-        memset( p_priv, 0, sizeof( *p_priv ) );
-    }
-    else
-    {
-        assert (i_size >= sizeof (vlc_object_t));
-        p_priv = calloc( 1, sizeof( *p_priv ) + i_size );
-        if( p_priv == NULL )
-            return NULL;
-
-        p_new = (vlc_object_t *)(p_priv + 1);
-    }
@@ -134 +129 @@
-    p_new->psz_header = NULL;
-
-
-
-
-
-
-
+
+
-
-    p_priv->p_vars = calloc( sizeof( variable_t ), 16 );
@@ -145 +136 @@
-    if( !p_priv->p_vars )
-    {
-
-
+
-        return NULL;
-    }
@@ -163 +153 @@
-        p_libvlc_global->pp_objects[0] = p_new;
-        p_priv->b_attached = VLC_TRUE;
+        vlc_mutex_init( p_new, &structure_lock );
-    }
-    else
@@ -205 +196 @@
-    vlc_spin_init( &p_priv->spin );
-    p_priv->pipes[0] = p_priv->pipes[1] = -1;
-
-    if( i_type == VLC_OBJECT_GLOBAL )
-    {
-        vlc_mutex_init( p_new, &structure_lock );
-    }
-
-    if( i_type == VLC_OBJECT_LIBVLC )
@@ -435 +421 @@
-        close( p_priv->pipes[0] );
-
-
-
-
+
-}
-

src/misc/threads.c

@@ -188 +188 @@
-#endif
-
-p_libvlc_global, 0, VLC_OBJECT_GLOBAL
-
+VLC_OBJECT(p_libvlc_global), 0
+VLC_OBJECT_GLOBAL, 
-        if( p_root == NULL )
-            i_ret = VLC_ENOMEM;