Changeset 38276a4632c98f6e98186adbb1a1538168e1a697

Timestamp:

05/04/08 18:16:06 (2 months ago)

Author:

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

git-committer:

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

git-parent:

[bf52311992e0411a26fec5ae19d254308e122058]

git-author:

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

Message:

Remove VLC_OBJECT_GLOBAL

Files:

• include/vlc_objects.h (modified) (1 diff)
• modules/misc/lua/objects.c (modified) (1 diff)
• src/misc/objects.c (modified) (3 diffs)
• src/misc/threads.c (modified) (1 diff)

include/vlc_objects.h

@@ -37 +37 @@
-
-/* Object types */
-
+
-#define VLC_OBJECT_LIBVLC      (-2)
-#define VLC_OBJECT_MODULE      (-3)

modules/misc/lua/objects.c

@@ -108 +108 @@
-        const char *psz_name;
-    } pp_objects[] =
-
-
+
-          { VLC_OBJECT_MODULE, "module" },
-          { VLC_OBJECT_INTF, "intf" },

src/misc/objects.c

@@ -144 +144 @@
-
-    libvlc_global_data_t *p_libvlc_global;
-i_type == VLC_OBJECT_GLOBA
-
-If i_type is global, then p_new is actually p_libvlc_global
+p_this == NUL
+
+Only the global root object is created out of the blue
-        p_libvlc_global = (libvlc_global_data_t *)p_new;
-        p_new->p_libvlc = NULL;
@@ -380 +380 @@
-    free( p_this->psz_header );
-
-i_object_type == VLC_OBJECT_GLOBA
+p_libvlc == NUL
-    {
-        libvlc_global_data_t *p_global = (libvlc_global_data_t *)p_this;
-
+#ifndef NDEBUG
+        assert( p_global == vlc_global() );
-        /* Test for leaks */
-        if( p_global->i_objects > 0 )
@@ -409 +411 @@
-            abort();
-        }
+#endif
-
-        /* We are the global object ... no need to lock. */

src/misc/threads.c

@@ -144 +144 @@
-    {
-        p_root = vlc_custom_create( NULL, sizeof( *p_root ),
-LOBAL, "global
+ENERIC, "root
-        if( p_root == NULL )
-        {