Custom lock for interaction

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index dbbc75b3f141919e106bd6be821575a7968c341b..4f2574ed9d225eb879dd3b2769cad847fdda2597 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -221,10 +221,10 @@ struct interaction_dialog_t
     int             i_flags;            ///< Misc flags
     int             i_return;           ///< Return status
 
-    interaction_t  *p_interaction;      ///< Parent interaction object
     vlc_object_t   *p_parent;           ///< The vlc object that asked
                                         //for interaction
     intf_thread_t  *p_interface;
+    vlc_mutex_t    *p_lock;
 };
 
 /**

diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m
index 32c9bd9c063d57049bc80579c59715502f7d70c9..819a4d512e956a057e027c5fc2b27fd15d012a80 100644 (file)
--- a/modules/gui/macosx/interaction.m
+++ b/modules/gui/macosx/interaction.m
@@ -248,7 +248,7 @@
 - (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return
     contextInfo:(void *)o_context
 {
-    vlc_object_lock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_lock( p_dialog->p_lock );
     if( i_return == NSAlertDefaultReturn )
     {
         p_dialog->i_return = DIALOG_OK_YES;
@@ -262,7 +262,7 @@
         p_dialog->i_return = DIALOG_CANCELLED;
     }
     p_dialog->i_status = ANSWERED_DIALOG;
-    vlc_object_unlock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_unlock( p_dialog->p_lock );
 }
 
 -(void)updateDialog
@@ -348,10 +348,10 @@
 - (IBAction)cancelAndClose:(id)sender
 {
     /* tell the core that the dialog was cancelled in a yes/no-style dialogue */
-    vlc_object_lock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_lock( p_dialog->p_lock );
     p_dialog->i_return = DIALOG_CANCELLED;
     p_dialog->i_status = ANSWERED_DIALOG;
-    vlc_object_unlock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_unlock( p_dialog->p_lock );
     msg_Dbg( p_intf, "dialog cancelled" );
 }
 
@@ -359,16 +359,16 @@
 {
     /* tell core that the user wishes to cancel the dialogue
      * Use this function if cancelling is optionally like in the progress-dialogue */
-    vlc_object_lock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_lock( p_dialog->p_lock );
     p_dialog->b_cancelled = true;
-    vlc_object_unlock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_unlock( p_dialog->p_lock );
     msg_Dbg( p_intf, "cancelling dialog, will close it later on" );
 }
 
 - (IBAction)okayAndClose:(id)sender
 {
     msg_Dbg( p_intf, "running okayAndClose" );
-    vlc_object_lock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_lock( p_dialog->p_lock );
     if( p_dialog->i_flags == DIALOG_LOGIN_PW_OK_CANCEL )
     {
         p_dialog->psz_returned[0] = strdup( [[o_auth_login_fld stringValue] UTF8String] );
@@ -378,7 +378,7 @@
         p_dialog->psz_returned[0] = strdup( [[o_input_fld stringValue] UTF8String] );
     p_dialog->i_return = DIALOG_OK_YES;
     p_dialog->i_status = ANSWERED_DIALOG;
-    vlc_object_unlock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_unlock( p_dialog->p_lock );
     msg_Dbg( p_intf, "dialog acknowledged" );
 }
 

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index 65b3863eae0c5ecc2400660469ecc55e7698186e..85004913e563b59d9b21820e9cdc2b50535df17e 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -240,7 +240,7 @@ void InteractionDialog::otherB()
 
 void InteractionDialog::Finish( int i_ret )
 {
-    vlc_object_lock( (vlc_object_t *)(p_dialog->p_interaction) );
+    vlc_mutex_lock( p_dialog->p_lock );
 
     /* Special cases when we have to return psz to the core */
     if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
@@ -262,7 +262,8 @@ void InteractionDialog::Finish( int i_ret )
         p_dialog->i_flags & DIALOG_INTF_PROGRESS )
         p_dialog->b_cancelled = true;
 
+    vlc_mutex_unlock( p_dialog->p_lock );
+
     hide();
-    vlc_object_unlock( (vlc_object_t *)(p_dialog->p_interaction) );
 }
 

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index 31110aace1e03faad89b2b482b1019eb3c5845ae..eb7d3c7151aef05099fc4f50d656c4c38311335e 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -56,6 +56,7 @@ struct interaction_t
     VLC_COMMON_MEMBERS
 
     vlc_thread_t thread;
+    vlc_mutex_t lock;
     vlc_cond_t wait;
 
     int                         i_dialogs;      ///< Number of dialogs
@@ -223,7 +224,7 @@ void intf_ProgressUpdate( interaction_dialog_t *p_dialog,
     interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
     assert( p_interaction );
 
-    vlc_object_lock( p_interaction );
+    vlc_mutex_lock( &p_interaction->lock );
     free( p_dialog->psz_description );
     p_dialog->psz_description = strdup( psz_status );
 
@@ -233,7 +234,7 @@ void intf_ProgressUpdate( interaction_dialog_t *p_dialog,
     p_dialog->i_status = UPDATED_DIALOG;
 
     vlc_cond_signal( &p_interaction->wait );
-    vlc_object_unlock( p_interaction );
+    vlc_mutex_unlock( &p_interaction->lock );
     vlc_object_release( p_interaction );
 }
 
@@ -250,9 +251,9 @@ bool intf_ProgressIsCancelled( interaction_dialog_t *p_dialog )
     bool b_cancel;
 
     assert( p_interaction );
-    vlc_object_lock( p_interaction );
+    vlc_mutex_lock( &p_interaction->lock );
     b_cancel = p_dialog->b_cancelled;
-    vlc_object_unlock( p_interaction );
+    vlc_mutex_unlock( &p_interaction->lock );
     vlc_object_release( p_interaction );
     return b_cancel;
 }
@@ -342,10 +343,10 @@ void intf_UserHide( interaction_dialog_t *p_dialog )
     interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
     assert( p_interaction );
 
-    vlc_object_lock( p_interaction );
+    vlc_mutex_lock( &p_interaction->lock );
     p_dialog->i_status = ANSWERED_DIALOG;
     vlc_cond_signal( &p_interaction->wait );
-    vlc_object_unlock( p_interaction );
+    vlc_mutex_unlock( &p_interaction->lock );
     vlc_object_release( p_interaction );
 }
 
@@ -373,6 +374,7 @@ interaction_t * interaction_Init( libvlc_int_t *p_libvlc )
     p_interaction->pp_dialogs = NULL;
     p_interaction->p_intf = NULL;
 
+    vlc_mutex_init( &p_interaction->lock );
     vlc_cond_init( &p_interaction->wait );
 
     if( vlc_clone( &p_interaction->thread, InteractionLoop, p_interaction,
@@ -396,6 +398,7 @@ void interaction_Destroy( interaction_t *p_interaction )
     vlc_cancel( p_interaction->thread );
     vlc_join( p_interaction->thread, NULL );
     vlc_cond_destroy( &p_interaction->wait );
+    vlc_mutex_destroy( &p_interaction->lock );
 
     /* Remove all dialogs - Interfaces must be able to clean up their data */
     for( int i = p_interaction->i_dialogs -1 ; i >= 0; i-- )
@@ -495,6 +498,8 @@ static int DialogSend( interaction_dialog_t *p_dialog )
     if( !p_interaction )
         return VLC_EGENERIC;
 
+    p_dialog->p_lock = &p_interaction->lock;
+
     p_intf = SearchInterface( p_interaction );
     if( p_intf == NULL )
     {
@@ -513,13 +518,12 @@ static int DialogSend( interaction_dialog_t *p_dialog )
     {
         vlc_value_t val;
 
-        p_dialog->p_interaction = p_interaction;
         p_dialog->i_action = INTERACT_NEW;
         val.p_address = p_dialog;
         var_Set( p_dialog->p_interface, "interaction", val );
 
         /* Check if we have already added this dialog */
-        vlc_object_lock( p_interaction );
+        vlc_mutex_lock( &p_interaction->lock );
         /* Add it to the queue, the main loop will send the orders to the
          * interface */
         INSERT_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs,
@@ -533,9 +537,9 @@ static int DialogSend( interaction_dialog_t *p_dialog )
                    p_dialog->i_status != HIDDEN_DIALOG &&
                    !p_dialog->p_parent->b_die )
             {
-                vlc_object_unlock( p_interaction );
+                vlc_mutex_unlock( &p_interaction->lock );
                 msleep( 100000 );
-                vlc_object_lock( p_interaction );
+                vlc_mutex_lock( &p_interaction->lock );
             }
             if( p_dialog->p_parent->b_die )
             {
@@ -544,7 +548,7 @@ static int DialogSend( interaction_dialog_t *p_dialog )
             }
             p_dialog->i_flags |= DIALOG_GOT_ANSWER;
             vlc_cond_signal( &p_interaction->wait );
-            vlc_object_unlock( p_interaction );
+            vlc_mutex_unlock( &p_interaction->lock );
             vlc_object_release( p_interaction );
             return p_dialog->i_return;
         }
@@ -553,7 +557,7 @@ static int DialogSend( interaction_dialog_t *p_dialog )
             /* Pretend we already retrieved the "answer" */
             p_dialog->i_flags |=  DIALOG_GOT_ANSWER;
             vlc_cond_signal( &p_interaction->wait );
-            vlc_object_unlock( p_interaction );
+            vlc_mutex_unlock( &p_interaction->lock );
             vlc_object_release( p_interaction );
             return VLC_SUCCESS;
         }
@@ -569,15 +573,15 @@ static void* InteractionLoop( void *p_this )
 {
     interaction_t *p_interaction = p_this;
 
-    vlc_object_lock( p_interaction );
-    mutex_cleanup_push( &(vlc_internals(p_interaction)->lock) );
+    vlc_mutex_lock( &p_interaction->lock );
+    mutex_cleanup_push( &p_interaction->lock );
     for( ;; )
     {
         int canc = vlc_savecancel();
         InteractionManage( p_interaction );
         vlc_restorecancel( canc );
 
-        vlc_cond_wait( &p_interaction->wait, &(vlc_internals(p_interaction)->lock) );
+        vlc_cond_wait( &p_interaction->wait, &p_interaction->lock );
     }
     vlc_cleanup_pop( );
     assert( 0 );