Fix threaded function declaration.

[vlc] / src / interface / interaction.c

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index 568d8a3b4c36886a5ba37d673add245d6042df88..f58d757eb798b9e8762b7d46847ef298fe7887ab 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -48,7 +48,7 @@
  *****************************************************************************/
 static interaction_t *          InteractionGet( vlc_object_t * );
 static void                     InteractionSearchInterface( interaction_t * );
-static void                     InteractionLoop( vlc_object_t * );
+static void*                    InteractionLoop( vlc_object_t * );
 static void                     InteractionManage( interaction_t * );
 
 static interaction_dialog_t    *DialogGetById( interaction_t* , int );
@@ -276,7 +276,7 @@ int __intf_UserLoginPassword( vlc_object_t *p_this,
     p_new->i_type = INTERACT_DIALOG_TWOWAY;
     p_new->psz_title = strdup( psz_title );
     p_new->psz_description = strdup( psz_description );
-    p_new->psz_default_button = strdup( _("Ok" ) );
+    p_new->psz_default_button = strdup( _("OK" ) );
     p_new->psz_alternate_button = strdup( _("Cancel" ) );
 
     p_new->i_flags = DIALOG_LOGIN_PW_OK_CANCEL;
@@ -362,7 +362,8 @@ interaction_t * interaction_Init( libvlc_int_t *p_libvlc )
     /* Make sure we haven't yet created an interaction object */
     assert( libvlc_priv(p_libvlc)->p_interaction == NULL );
 
-    p_interaction = vlc_custom_create( p_libvlc, sizeof( *p_interaction ),
+    p_interaction = vlc_custom_create( VLC_OBJECT(p_libvlc),
+                                       sizeof( *p_interaction ),
                                        VLC_OBJECT_GENERIC, "interaction" );
     if( !p_interaction )
         return NULL;
@@ -387,6 +388,16 @@ interaction_t * interaction_Init( libvlc_int_t *p_libvlc )
     return p_interaction;
 }
 
+void interaction_Destroy( interaction_t *p_interaction )
+{
+    if( !p_interaction )
+        return;
+
+    vlc_object_kill( p_interaction );
+    vlc_thread_join( p_interaction );
+    vlc_object_release( p_interaction );
+}
+
 /**********************************************************************
  * The following functions are local
  **********************************************************************/
@@ -463,7 +474,11 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
     if( p_dialog->i_id == 0 )
         p_dialog->i_id = ++p_interaction->i_last_id;
 
-    if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC;
+    if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
+    {
+        vlc_object_release( p_interaction );
+        return VLC_EGENERIC;
+    }
 
     if( config_GetInt( p_this, "interact" ) ||
         p_dialog->i_flags & DIALOG_BLOCKING_ERROR ||
@@ -533,7 +548,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
     }
 }
 
-static void InteractionLoop( vlc_object_t *p_this )
+static void* InteractionLoop( vlc_object_t *p_this )
 {
     int i;
     interaction_t *p_interaction = (interaction_t*) p_this;
@@ -553,6 +568,7 @@ static void InteractionLoop( vlc_object_t *p_this )
         DialogDestroy( p_dialog );
         REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, i );
     }
+    return NULL;
 }
 
 /**