[vlc-devel] commit: root object: use vlc_custom_create ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Mar 29 15:15:42 CET 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat Mar 29 15:59:35 2008 +0200| [e8d99a6b947164f275e2e58bda13f1fcf5795231]

root object: use vlc_custom_create

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8d99a6b947164f275e2e58bda13f1fcf5795231
---

 src/misc/objects.c |    4 ----
 src/misc/threads.c |    3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 011b12f..392c1d3 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -239,10 +239,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
 
     switch( i_type )
     {
-        case VLC_OBJECT_GLOBAL:
-            i_size = sizeof(libvlc_global_data_t);
-            psz_type = "global";
-            break;
         case VLC_OBJECT_LIBVLC:
             i_size = sizeof(libvlc_int_t);
             psz_type = "libvlc";
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 633e063..2172e2f 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -187,7 +187,8 @@ int __vlc_threads_init( vlc_object_t *p_this )
 #elif defined( LIBVLC_USE_PTHREAD )
 #endif
 
-        p_root = vlc_object_create( p_libvlc_global, VLC_OBJECT_GLOBAL );
+        p_root = vlc_custom_create( p_libvlc_global, 0, VLC_OBJECT_GLOBAL,
+                                    "global" );
         if( p_root == NULL )
             i_ret = VLC_ENOMEM;
 




More information about the vlc-devel mailing list