]> git.sesse.net Git - vlc/blobdiff - src/interface/interface.c
Remove msg_Err about memory allocation.
[vlc] / src / interface / interface.c
index 1e15b8c1b98be9519ed448697a62e34ce2cad7ff..cfbea2fb6995cfb455c2aaf60f246ecbe14ef273 100644 (file)
@@ -92,10 +92,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
     /* Allocate structure */
     p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
     if( !p_intf )
-    {
-        msg_Err( p_this, "out of memory" );
         return NULL;
-    }
     p_intf->pf_request_window = NULL;
     p_intf->pf_release_window = NULL;
     p_intf->pf_control_window = NULL;
@@ -173,7 +170,7 @@ void intf_StopThread( intf_thread_t *p_intf )
 {
     /* Tell the interface to die */
     vlc_object_kill( p_intf );
-    vlc_cond_signal( &p_intf->object_wait );
+    vlc_object_signal( p_intf );
     vlc_thread_join( p_intf );
 }
 
@@ -235,11 +232,11 @@ static void RunInterface( intf_thread_t *p_intf )
         psz_intf = p_intf->psz_switch_intf;
         p_intf->psz_switch_intf = NULL;
 
-        vlc_mutex_lock( &p_intf->object_lock );
+        vlc_object_lock( p_intf );
         p_intf->b_die = false; /* FIXME */
         p_intf->b_dead = false;
 
-        vlc_mutex_unlock( &p_intf->object_lock );
+        vlc_object_unlock( p_intf );
 
         p_intf->psz_intf = psz_intf;
         p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );