Use vlc_object_lock and vlc_object_unlock

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index c4d75f18e18810da900b32af60b923e8110dfa70..b7cb768c7ccaebab4fbaddf597f410ddf44a6d61 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <vlc_aout.h>
 #include <vlc_vout.h>
@@ -80,19 +80,14 @@ static void intf_Destroy( vlc_object_t *obj )
  *****************************************************************************/
 /**
  * Create the interface, and prepare it for main loop.
- * You can give some additional options to be used for interface initialization
  *
  * \param p_this the calling vlc_object_t
  * \param psz_module a preferred interface module
- * \param i_options number additional options
- * \param ppsz_options additional option strings
  * \return a pointer to the created interface thread, NULL on error
  */
-intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
-                              int i_options, const char *const *ppsz_options  )
+intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
 {
     intf_thread_t * p_intf;
-    int i;
 
     /* Allocate structure */
     p_intf = vlc_object_create( p_this, VLC_OBJECT_INTF );
@@ -104,13 +99,9 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
     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;
 
-    for( i = 0 ; i< i_options; i++ )
-        var_OptionParse( p_this, ppsz_options[i], true );
-
     /* Choose the best module */
     p_intf->psz_intf = strdup( psz_module );
     p_intf->p_module = module_Need( p_intf, "interface", psz_module, false );
@@ -225,10 +216,12 @@ static void RunInterface( intf_thread_t *p_intf )
         if( p_intf->pf_run )
             p_intf->pf_run( p_intf );
         else
-            while( vlc_object_lock_and_wait( p_intf ) == 0 );
-
-        /* Reset play on start status */
-        p_intf->b_play = false;
+        {
+            vlc_object_lock( p_intf );
+            while( vlc_object_alive( p_intf ) )
+                vlc_object_wait( p_intf );
+            vlc_object_unlock( p_intf );
+        }
 
         if( !p_intf->psz_switch_intf )
         {
@@ -242,11 +235,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 );
@@ -264,7 +257,7 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
 
     /* Try to create the interface */
     sprintf( psz_intf, "%s,none", newval.psz_string );
-    p_intf = intf_Create( p_this->p_libvlc, psz_intf, 0, NULL );
+    p_intf = intf_Create( p_this->p_libvlc, psz_intf );
     free( psz_intf );
     if( p_intf == NULL )
     {