interaction: no need for vlc_object_find()

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 7a39c07af68384da9878dc7fa028e56b4bb7ac8f..eeda2263b4724238eab80b38bc09a80a5be2ed84 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -92,14 +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;
-    p_intf->b_play = false;
     p_intf->b_interaction = false;
     p_intf->b_should_run_on_first_thread = false;
 
@@ -174,7 +167,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 );
 }
 
@@ -224,9 +217,6 @@ static void RunInterface( intf_thread_t *p_intf )
             vlc_object_unlock( p_intf );
         }
 
-        /* Reset play on start status */
-        p_intf->b_play = false;
-
         if( !p_intf->psz_switch_intf )
         {
             break;
@@ -239,11 +229,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 );