Win32: link libvlccore with the resource file

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 8c1f90717897ee8922d003fb1a4c18ddb5646539..96cab09ca9e549e27557ba79813b564a82963304 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -195,8 +195,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
     }
 
     /* Allocate a libvlc instance object */
-    p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global),
-                                  sizeof (*p_libvlc) + sizeof (libvlc_priv_t),
+    p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), sizeof (*priv),
                                   VLC_OBJECT_LIBVLC, "libvlc" );
     if( p_libvlc != NULL )
         i_instances++;
@@ -234,10 +233,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
     vlc_mutex_init( &priv->timer_lock );
     vlc_mutex_init( &priv->config_lock );
 
-    priv->threads_count = 0;
-    vlc_mutex_init (&priv->threads_lock);
-    vlc_cond_init (NULL, &priv->threads_wait);
-
     /* Store data for the non-reentrant API */
     p_static_vlc = p_libvlc;
 
@@ -1033,17 +1028,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 #endif
 
-    /* Make sure all threads are completed before we start looking for
-     * reference leaks and deinitializing core LibVLC subsytems. */
-    vlc_mutex_lock (&priv->threads_lock);
-    while (priv->threads_count)
-    {
-        msg_Dbg (p_libvlc, "waiting for %u remaining threads",
-                 priv->threads_count);
-        vlc_cond_wait (&priv->threads_wait, &priv->threads_lock);
-    }
-    vlc_mutex_unlock (&priv->threads_lock);
-
     bool b_clean = true;
     FOREACH_ARRAY( input_item_t *p_del, priv->input_items )
         msg_Err( p_libvlc, "input item %p has not been deleted properly: refcount %d, name %s",
@@ -1123,8 +1107,6 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
     /* Destroy mutexes */
     vlc_mutex_destroy( &priv->config_lock );
     vlc_mutex_destroy( &priv->timer_lock );
-    vlc_cond_destroy (&priv->threads_wait);
-    vlc_mutex_destroy (&priv->threads_lock);
 
     vlc_object_release( p_libvlc );
     p_libvlc = NULL;