Use vlc_object_lock and vlc_object_unlock

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index e1a3024e1c36a7c656ff5f3e5b92fc333ccd397e..58fa531bc6b7c1a8e8311e105f34adc337383911 100644 (file)
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -287,9 +287,9 @@ mvar_t *mvar_PlaylistSetNew( intf_thread_t *p_intf, char *name,
                                  playlist_t *p_pl )
 {
     mvar_t *s = mvar_New( name, "set" );
-    vlc_mutex_lock( &p_pl->object_lock );
+    vlc_object_lock( p_pl );
     PlaylistListNode( p_intf, p_pl, p_pl->p_root_category , name, s, 0 );
-    vlc_mutex_unlock( &p_pl->object_lock );
+    vlc_object_unlock( p_pl );
     return s;
 }
 

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 5d7744caf1720b90d22500ebe54e606aba3d577a..25a3d71fa71e742b82e90bb962a4cc766340acf7 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -535,17 +535,17 @@ static void Run( intf_thread_t *p_intf )
 
             if( p_playlist )
             {
-                vlc_mutex_lock( &p_playlist->object_lock );
+                vlc_object_lock( p_playlist );
                 p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED;
                 msg_rc( STATUS_CHANGE "( stop state: 0 )" );
-                vlc_mutex_unlock( &p_playlist->object_lock );
+                vlc_object_unlock( p_playlist );
             }
         }
 
         if( (p_input != NULL) && !p_input->b_dead && !p_input->b_die &&
             (p_playlist != NULL) )
         {
-            vlc_mutex_lock( &p_playlist->object_lock );
+            vlc_object_lock( p_playlist );
             if( (p_intf->p_sys->i_last_state != p_playlist->status.i_status) &&
                 (p_playlist->status.i_status == PLAYLIST_STOPPED) )
             {
@@ -566,7 +566,7 @@ static void Run( intf_thread_t *p_intf )
                 p_intf->p_sys->i_last_state = p_playlist->status.i_status;
                 msg_rc( STATUS_CHANGE "( pause state: 4 )" );
             }
-            vlc_mutex_unlock( &p_playlist->object_lock );
+            vlc_object_unlock( p_playlist );
         }
 
         if( p_input && b_showpos )

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 217d1d805fe4bf6d3ee1d1207d1aa5b45be17311..b59df439d11c5023db725849b8ff67615de33282 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -121,16 +121,16 @@
     intf_thread_t * p_intf = VLCIntf;
     playlist_t * p_playlist = pl_Yield( p_intf );
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     if( playlist_IsEmpty( p_playlist ) )
     {
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        vlc_object_unlock( p_playlist );
         vlc_object_release( p_playlist );
         [o_main intfOpenFileGeneric: (id)sender];
     }
     else
     {
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        vlc_object_unlock( p_playlist );
         vlc_object_release( p_playlist );
     }
 
@@ -886,7 +886,7 @@
     intf_thread_t * p_intf = VLCIntf;
     playlist_t * p_playlist = pl_Yield( p_intf );
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
 
 #define p_input p_playlist->p_input
 
@@ -997,7 +997,7 @@
         [o_main setupMenus]; /* Make sure video menu is up to date */
     }
 
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
     vlc_object_release( p_playlist );
 
     return( bEnabled );

diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m
index 5501e583da9434d898e35d99a62e761a382943b1..4dd7fda7dd25abb6af53b00fff093e2b3068f3bb 100644 (file)
--- a/modules/gui/macosx/interaction.m
+++ b/modules/gui/macosx/interaction.m
@@ -247,7 +247,7 @@
 - (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return
     contextInfo:(void *)o_context
 {
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
     if( i_return == NSAlertDefaultReturn )
     {
         p_dialog->i_return = DIALOG_OK_YES;
@@ -261,7 +261,7 @@
         p_dialog->i_return = DIALOG_CANCELLED;
     }
     p_dialog->i_status = ANSWERED_DIALOG;
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
 }
 
 -(void)updateDialog
@@ -347,10 +347,10 @@
 - (IBAction)cancelAndClose:(id)sender
 {
     /* tell the core that the dialog was cancelled in a yes/no-style dialogue */
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
     p_dialog->i_return = DIALOG_CANCELLED;
     p_dialog->i_status = ANSWERED_DIALOG;
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
     msg_Dbg( p_intf, "dialog cancelled" );
 }
 
@@ -358,16 +358,16 @@
 {
     /* tell core that the user wishes to cancel the dialogue
      * Use this function if cancelling is optionally like in the progress-dialogue */
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
     p_dialog->b_cancelled = true;
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
     msg_Dbg( p_intf, "cancelling dialog, will close it later on" );
 }
 
 - (IBAction)okayAndClose:(id)sender
 {
     msg_Dbg( p_intf, "running okayAndClose" );
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
     if( p_dialog->i_flags == DIALOG_LOGIN_PW_OK_CANCEL )
     {
         p_dialog->psz_returned[0] = strdup( [[o_auth_login_fld stringValue] UTF8String] );
@@ -377,7 +377,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_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
     msg_Dbg( p_intf, "dialog acknowledged" );
 }
 

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 10b3d9f031ac1ff1e270f2f2979e891648e7fc6f..b9da5aace8be248dc67292a9ebeaa92fb93e1561 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1251,9 +1251,9 @@
         i_type = ORDER_NORMAL;
     }
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_category, i_mode, i_type );
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     vlc_object_release( p_playlist );
     [self playlistUpdated];

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 2cd24c144cda5c0e9cf9c3b24ff4a7121a22caec..61170306dad5be3e8c3781dc0ea01897a7a21e37 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -417,7 +417,7 @@ static int Manage( intf_thread_t *p_intf )
         input_thread_t *p_input = p_intf->p_sys->p_input;
         int64_t i_time = 0, i_length = 0;
 
-        vlc_mutex_lock( &p_input->object_lock );
+        vlc_object_lock( p_input );
         if( !p_input->b_die )
         {
             playlist_t *p_playlist;
@@ -469,9 +469,9 @@ static int Manage( intf_thread_t *p_intf )
                         double f_pos = (double)newvalue / 100.0;
 
                         /* release the lock to be able to seek */
-                        vlc_mutex_unlock( &p_input->object_lock );
+                        vlc_object_unlock( p_input );
                         var_SetFloat( p_input, "position", f_pos );
-                        vlc_mutex_lock( &p_input->object_lock );
+                        vlc_object_lock( p_input );
 
                         /* Update the old value */
                         p_intf->p_sys->f_adj_oldvalue = newvalue;
@@ -503,9 +503,9 @@ static int Manage( intf_thread_t *p_intf )
                         double f_pos = (double)newvalue / 100.0;
 
                         /* release the lock to be able to seek */
-                        vlc_mutex_unlock( &p_input->object_lock );
+                        vlc_object_unlock( p_input );
                         var_SetFloat( p_input, "position", f_pos );
-                        vlc_mutex_lock( &p_input->object_lock );
+                        vlc_object_lock( p_input );
 
                         /* Update the old value */
                         p_intf->p_sys->i_adj_oldvalue = newvalue;
@@ -513,7 +513,7 @@ static int Manage( intf_thread_t *p_intf )
                 }
             }
         }
-        vlc_mutex_unlock( &p_input->object_lock );
+        vlc_object_unlock( p_input );
     }
     else if( p_intf->p_sys->b_playing && !intf_ShouldDie( p_intf ) )
     {

diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index e1a6d610c80d4197b40f9a8439964ae24b562dd5..334c7494b1b1f417f7f150be3ae966cd3d5c4f2d 100644 (file)
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -162,7 +162,7 @@ void PlaylistRebuildListStore( intf_thread_t *p_intf,
     red.blue    = 0;
     red.green   = 0;
 #endif
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     for( i_dummy = 0; i_dummy < playlist_CurrentSize(p_playlist) ; i_dummy++ )
     {
         playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_dummy, true );
@@ -178,7 +178,7 @@ void PlaylistRebuildListStore( intf_thread_t *p_intf,
                                 -1);
         }
     }
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 }
 
 /*****************************************************************
@@ -383,16 +383,16 @@ void onPlay(GtkButton *button, gpointer user_data)
 
     if (p_playlist)
     {
-        vlc_mutex_lock( &p_playlist->object_lock );
+        vlc_object_lock( p_playlist );
         if (playlist_CurrentSize(p_playlist))
         {
-            vlc_mutex_unlock( &p_playlist->object_lock );
+            vlc_object_unlock( p_playlist );
             playlist_Play( p_playlist );
             gdk_window_lower( p_intf->p_sys->p_window->window );
         }
         else
         {
-            vlc_mutex_unlock( &p_playlist->object_lock );
+            vlc_object_unlock( p_playlist );
         }
         vlc_object_release( p_playlist );
     }

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index 92d0bbe40ada6d675191a931e4fd579b9d57933b..887cd5ef18e27ab52a5d5115e6443aaf0d1c4c2b 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -215,7 +215,7 @@ void InteractionDialog::otherB()
 
 void InteractionDialog::Finish( int i_ret )
 {
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
 
     if( p_dialog->i_flags & DIALOG_LOGIN_PW_OK_CANCEL )
     {
@@ -235,7 +235,7 @@ void InteractionDialog::Finish( int i_ret )
         p_dialog->b_cancelled = true;
 
     hide();
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
     playlist_Signal( THEPL );
 }
 

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index bba8a657396ebf73bfd4deddbfc1ffc39b5d336e..154b57104993c2bad4920b931a598b8d51ae8866 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -253,9 +253,9 @@ static void Close( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
-    vlc_mutex_lock( &p_intf->object_lock );
+    vlc_object_lock( p_intf );
     p_intf->b_dead = true;
-    vlc_mutex_unlock( &p_intf->object_lock );
+    vlc_object_unlock( p_intf );
 
     if( p_intf->p_sys->b_isDialogProvider )
     {

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 47e69fbaa7063c9e5d271c4aebfe89f61de3e344..cd6439e6a4aa0098124ff299d760448246aba5f7 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -64,8 +64,8 @@ struct intf_sys_t
 };
 
 #define THEPL p_intf->p_sys->p_playlist
-#define QPL_LOCK vlc_mutex_lock( &THEPL->object_lock );
-#define QPL_UNLOCK vlc_mutex_unlock( &THEPL->object_lock );
+#define QPL_LOCK vlc_object_lock( THEPL );
+#define QPL_UNLOCK vlc_object_unlock( THEPL );
 
 #define THEDP DialogsProvider::getInstance()
 #define THEMIM MainInputManager::getInstance( p_intf )

diff --git a/modules/gui/skins2/commands/cmd_playtree.cpp b/modules/gui/skins2/commands/cmd_playtree.cpp
index 7045b728db71292848b9d8fb41bff22d0cc74677..9d61617f2cbcc3f6b9674c9cf515e968bfbefa72 100644 (file)
--- a/modules/gui/skins2/commands/cmd_playtree.cpp
+++ b/modules/gui/skins2/commands/cmd_playtree.cpp
@@ -37,10 +37,10 @@ void CmdPlaytreeSort::execute()
     /// \todo Choose sort method/order - Need more commands
     /// \todo Choose the correct view
     playlist_t *p_playlist = getIntf()->p_sys->p_playlist;
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     playlist_RecursiveNodeSort( p_playlist, p_playlist->p_root_onelevel,
                                 SORT_TITLE, ORDER_NORMAL );
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     // Ask for rebuild
     Playtree &rVar = VlcProc::instance( getIntf() )->getPlaytreeVar();

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index a70677cc606d5ab588976887fd8468b7094ab780..1c51dc13303bbee7c22226ae676104bdd46ef08f 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -52,7 +52,7 @@ Playtree::~Playtree()
 void Playtree::delSelected()
 {
     Iterator it = begin();
-    vlc_mutex_lock( &getIntf()->p_sys->p_playlist->object_lock );
+    vlc_object_lock( getIntf()->p_sys->p_playlist );
     for( it = begin(); it != end(); it = getNextVisibleItem( it ) )
     {
         if( (*it).m_selected && !(*it).isReadonly() )
@@ -93,12 +93,12 @@ void Playtree::delSelected()
             it = getNextVisibleItem( it );
         }
     }
-    vlc_mutex_unlock( &getIntf()->p_sys->p_playlist->object_lock );
+    vlc_object_unlock( getIntf()->p_sys->p_playlist );
 }
 
 void Playtree::action( VarTree *pItem )
 {
-    vlc_mutex_lock( &m_pPlaylist->object_lock );
+    vlc_object_lock( m_pPlaylist );
     VarTree::Iterator it;
 
     playlist_item_t *p_item = (playlist_item_t *)pItem->m_pData;
@@ -114,7 +114,7 @@ void Playtree::action( VarTree *pItem )
     {
         playlist_Control( m_pPlaylist, PLAYLIST_VIEWPLAY, true, p_parent, p_item );
     }
-    vlc_mutex_unlock( &m_pPlaylist->object_lock );
+    vlc_object_unlock( m_pPlaylist );
 }
 
 void Playtree::onChange()
@@ -213,7 +213,7 @@ void Playtree::buildNode( playlist_item_t *pNode, VarTree &rTree )
 void Playtree::buildTree()
 {
     clear();
-    vlc_mutex_lock( &m_pPlaylist->object_lock );
+    vlc_object_lock( m_pPlaylist );
 
     i_items_to_append = 0;
 
@@ -228,7 +228,7 @@ void Playtree::buildTree()
 
     buildNode( m_pPlaylist->p_root_category, *this );
 
-    vlc_mutex_unlock( &m_pPlaylist->object_lock );
+    vlc_object_unlock( m_pPlaylist );
 //  What is it ?
 //    checkParents( NULL );
 }

diff --git a/modules/gui/wince/playlist.cpp b/modules/gui/wince/playlist.cpp
index 2a8f3eaedf38f9d8b41a0337c2c37469aa2dcef5..d6af2a5badd66751039b8f6e49888076bc1e4922 100644 (file)
--- a/modules/gui/wince/playlist.cpp
+++ b/modules/gui/wince/playlist.cpp
@@ -595,7 +595,7 @@ void Playlist::UpdatePlaylist()
  
     /* Update the colour of items */
 
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     if( p_intf->p_sys->i_playing != p_playlist->i_index )
     {
         // p_playlist->i_index in RED
@@ -604,7 +604,7 @@ void Playlist::UpdatePlaylist()
         // if exists, p_intf->p_sys->i_playing in BLACK
         p_intf->p_sys->i_playing = p_playlist->i_index;
     }
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     vlc_object_release( p_playlist );
 }
@@ -625,7 +625,7 @@ void Playlist::Rebuild()
     ListView_DeleteAllItems( hListView );
 
     /* ...and rebuild it */
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     for( int i = 0; i < p_playlist->i_size; i++ )
     {
         LVITEM lv;
@@ -639,7 +639,7 @@ void Playlist::Rebuild()
             _FROMMB(p_playlist->pp_items[i]->input.psz_name) );
         UpdateItem( i );
     }
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     if ( i_focused )
         ListView_SetItemState( hListView, i_focused, LVIS_FOCUSED |
@@ -874,9 +874,9 @@ void Playlist::ShowInfos( HWND hwnd, int i_item )
         vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
     if( p_playlist == NULL ) return;
 
-    vlc_mutex_lock( &p_playlist->object_lock);
+    vlc_object_lock( p_playlist);
     playlist_item_t *p_item = playlist_ItemGetByPos( p_playlist, i_item );
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     if( p_item )
     {

diff --git a/modules/gui/wxwidgets/dialogs/interaction.cpp b/modules/gui/wxwidgets/dialogs/interaction.cpp
index d9ac5aef0d700364dd8339a0e05669f7fb015d81..28f8d8b4141cd96a682f716d4a2bfd884b3a4498 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/interaction.cpp
+++ b/modules/gui/wxwidgets/dialogs/interaction.cpp
@@ -235,7 +235,7 @@ void InteractionDialog::OnClear( wxCommandEvent& event )
 {
 #if 0
     int i;
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
     for( i = p_dialog->i_widgets - 1 ; i >= 0 ; i-- )
     {
         user_widget_t *p_widget = p_dialog->pp_widgets[i];
@@ -250,7 +250,7 @@ void InteractionDialog::OnClear( wxCommandEvent& event )
     buttons_sizer->Remove( 3 );
     buttons_panel->DestroyChildren();
     input_widgets.clear();
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
     Render();
 #endif
 }
@@ -263,7 +263,7 @@ void InteractionDialog::OnNoShow( wxCommandEvent& event )
 void InteractionDialog::Finish( int i_ret )
 {
 #if 0
-    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    vlc_object_lock( p_dialog->p_interaction );
     vector<InputWidget>::iterator it = input_widgets.begin();
     while ( it < input_widgets.end() )
     {
@@ -274,6 +274,6 @@ void InteractionDialog::Finish( int i_ret )
     Hide();
     p_dialog->i_status = ANSWERED_DIALOG;
     p_dialog->i_return = i_ret;
-    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    vlc_object_unlock( p_dialog->p_interaction );
 #endif
 }

diff --git a/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp b/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp
index 438dd268ec62055b626cd3bfe046884a66f28459..a432fe732b781d99ddfef96e88ececb7ecc80c5e 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp
+++ b/modules/gui/wxwidgets/dialogs/vlm/vlm_wrapper.cpp
@@ -48,12 +48,12 @@ bool VLMWrapper::AttachVLM()
 
 void VLMWrapper::LockVLM()
 {
-    vlc_mutex_lock( &p_vlm->object_lock );
+    vlc_object_lock( p_vlm );
 }
 
 void VLMWrapper::UnlockVLM()
 {
-    vlc_mutex_unlock( &p_vlm->object_lock );
+    vlc_object_unlock( p_vlm );
 }
 
 void VLMWrapper::AddBroadcast( const char* name, const char* input,

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index 13e1331322947c9da0e1b1c1d4489a16415f543c..a919fa3cb457cb1607661ff3817995a99452578b 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -231,9 +231,9 @@ static void Close( vlc_object_t *p_this )
 {
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
-    vlc_mutex_lock( &p_intf->object_lock );
+    vlc_object_lock( p_intf );
     p_intf->b_dead = true;
-    vlc_mutex_unlock( &p_intf->object_lock );
+    vlc_object_unlock( p_intf );
 
     if( p_intf->pf_show_dialog )
     {

diff --git a/modules/gui/wxwidgets/wxwidgets.hpp b/modules/gui/wxwidgets/wxwidgets.hpp
index bd600a731a600bb52488d728c1a244e77c32153b..39e433b97c14c2b31d13fc246d84d8854a2f7c2c 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.hpp
+++ b/modules/gui/wxwidgets/wxwidgets.hpp
@@ -225,13 +225,13 @@ wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );
 inline void LockPlaylist( intf_sys_t *p_sys, playlist_t *p_pl )
 {
     if( p_sys->i_playlist_usage++ == 0)
-        vlc_mutex_lock( &p_pl->object_lock );
+        vlc_object_lock( p_pl );
 }
 
 inline void UnlockPlaylist( intf_sys_t *p_sys, playlist_t *p_pl )
 {
     if( --p_sys->i_playlist_usage == 0)
-        vlc_mutex_unlock( &p_pl->object_lock );
+        vlc_object_unlock( p_pl );
 }
 
 #endif

diff --git a/modules/misc/lua/libs/playlist.c b/modules/misc/lua/libs/playlist.c
index 5f16040714222167ce4bdd1194324dd3b6dd0ea8..4d9b30791b277557e478990180ec4250b850ee93 100644 (file)
--- a/modules/misc/lua/libs/playlist.c
+++ b/modules/misc/lua/libs/playlist.c
@@ -362,7 +362,7 @@ static int vlclua_playlist_status( lua_State *L )
         lua_pushstring( L, psz_uri );
         free( psz_uri );
         lua_pushnumber( L, config_GetInt( p_intf, "volume" ) );*/
-        vlc_mutex_lock( &p_playlist->object_lock );
+        vlc_object_lock( p_playlist );
         switch( p_playlist->status.i_status )
         {
             case PLAYLIST_STOPPED:
@@ -378,7 +378,7 @@ static int vlclua_playlist_status( lua_State *L )
                 lua_pushstring( L, "unknown" );
                 break;
         }
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        vlc_object_unlock( p_playlist );
         /*i_count += 3;*/
     }
     else

diff --git a/modules/mux/rtp/rtcp.c b/modules/mux/rtp/rtcp.c
index c6ef545003d34fa369e1ada32ea124f74065e5c2..46745cb2cd0f3e151e168bbaf54184181ea0d4fb 100644 (file)
--- a/modules/mux/rtp/rtcp.c
+++ b/modules/mux/rtp/rtcp.c
@@ -76,7 +76,7 @@ int rtcp_add_client( vlc_object_t *p_this, uint32_t u_ssrc, uint32_t *i_pos )
     rtcp_t *p_rtcp = (rtcp_t *) p_this;
     rtcp_client_t *p_client = NULL;
 
-    vlc_mutex_lock( &p_rtcp->object_lock );
+    vlc_object_lock( p_rtcp );
     p_client = (rtcp_client_t*) malloc( sizeof(rtcp_client_t) );
     if( !p_client )
         return VLC_ENOMEM;
@@ -87,7 +87,7 @@ int rtcp_add_client( vlc_object_t *p_this, uint32_t u_ssrc, uint32_t *i_pos )
                  p_client->i_index, p_client );
     p_rtcp->i_clients++;
     p_rtcp->u_clients++;
-    vlc_mutex_unlock( &p_rtcp->object_lock );
+    vlc_object_unlock( p_rtcp );
     return VLC_SUCCESS;
 }
 
@@ -96,7 +96,7 @@ int rtcp_del_client( vlc_object_t *p_this, uint32_t u_ssrc )
     rtcp_t *p_rtcp = (rtcp_t *) p_this;
     uint32_t i_pos = 0;
 
-    vlc_mutex_lock( &p_rtcp->object_lock );
+    vlc_object_lock( p_rtcp );
     if( p_rtcp->pf_find_client( p_this, u_ssrc, &i_pos ) == VLC_SUCCESS )
     {
         rtcp_client_t *p_old = p_rtcp->pp_clients[i_pos];
@@ -107,7 +107,7 @@ int rtcp_del_client( vlc_object_t *p_this, uint32_t u_ssrc )
         p_rtcp->u_clients--;
         /* BYE message is sent by rtcp_destroy_client() */
     }
-    vlc_mutex_unlock( &p_rtcp->object_lock );
+    vlc_object_unlock( p_rtcp );
     return VLC_SUCCESS;
 }
 
@@ -117,7 +117,7 @@ int rtcp_cleanup_clients( vlc_object_t *p_this )
     rtcp_t *p_rtcp = (rtcp_t *) p_this;
     uint32_t i = 0;
 
-    vlc_mutex_lock( &p_rtcp->object_lock );
+    vlc_object_lock( p_rtcp );
     for( i=0; i < p_rtcp->i_clients; i++ )
     {
         rtcp_client_t *p_old = p_rtcp->pp_clients[i];
@@ -131,7 +131,7 @@ int rtcp_cleanup_clients( vlc_object_t *p_this )
             free( p_old );
         }
     }
-    vlc_mutex_unlock( &p_rtcp->object_lock );
+    vlc_object_unlock( p_rtcp );
     return VLC_SUCCESS;
 }
 
@@ -343,7 +343,7 @@ static int rtcp_decode_SR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
             if( result == VLC_EGENERIC )
                 return VLC_ENOMEM;
         }
-        vlc_mutex_lock( &p_rtcp->object_lock );
+        vlc_object_lock( p_rtcp );
         p_client = p_rtcp->pp_clients[i_pos];
 
         p_client->p_stats->u_SR_received++;
@@ -380,7 +380,7 @@ static int rtcp_decode_SR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
             p_client->p_stats->u_last_SR,
             p_client->p_stats->u_delay_since_last_SR );
         p_client = NULL;
-        vlc_mutex_unlock( &p_rtcp->object_lock );
+        vlc_object_unlock( p_rtcp );
     }
     return VLC_SUCCESS;
 }
@@ -412,7 +412,7 @@ static int rtcp_decode_RR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
                 return VLC_ENOMEM;
         }
 
-        vlc_mutex_lock( &p_rtcp->object_lock );
+        vlc_object_lock( p_rtcp );
         p_client = p_rtcp->pp_clients[i_pos];
 
         p_client->p_stats->u_RR_received++;
@@ -443,7 +443,7 @@ static int rtcp_decode_RR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
             p_client->p_stats->u_last_SR,
             p_client->p_stats->u_delay_since_last_SR );
         p_client = NULL;
-        vlc_mutex_unlock( &p_rtcp->object_lock );
+        vlc_object_unlock( p_rtcp );
     }
     return VLC_SUCCESS;
 }
@@ -478,7 +478,7 @@ static int rtcp_decode_SDES( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
                 return VLC_ENOMEM;
         }
 
-        vlc_mutex_lock( &p_rtcp->object_lock );
+        vlc_object_lock( p_rtcp );
         p_client = p_rtcp->pp_clients[i_pos];
 
         u_item = bs_read( p_rtcp->bs, 8 );
@@ -543,7 +543,7 @@ static int rtcp_decode_SDES( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
               ((double)(0.9375) * p_client->p_stats->u_avg_pkt_size) );
 
         p_client = NULL;
-        vlc_mutex_unlock( &p_rtcp->object_lock );
+        vlc_object_unlock( p_rtcp );
     }
     return VLC_SUCCESS;
 }
@@ -597,7 +597,7 @@ static int rtcp_decode_APP( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
             return VLC_ENOMEM;
     }
 
-    vlc_mutex_lock( &p_rtcp->object_lock );
+    vlc_object_lock( p_rtcp );
     p_client = p_rtcp->pp_clients[i_pos];
 
     for( i = 0 ; i < 4; i++ )
@@ -613,7 +613,7 @@ static int rtcp_decode_APP( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
 
     psz_data = (char *) malloc( p_pkt->u_length );
     if( !psz_data ) {
-        vlc_mutex_unlock( &p_rtcp->object_lock );
+        vlc_object_unlock( p_rtcp );
         return VLC_EGENERIC;
     }
 
@@ -627,7 +627,7 @@ static int rtcp_decode_APP( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
     p_pkt->report.app.u_length = p_pkt->u_length;
 
     p_client = NULL;
-    vlc_mutex_unlock( &p_rtcp->object_lock );
+    vlc_object_unlock( p_rtcp );
 
     /* Just ignore this packet */
     return VLC_SUCCESS;
@@ -866,7 +866,7 @@ block_t *rtcp_encode_SR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
         return NULL;
     }
 
-    vlc_mutex_lock( &p_rtcp->object_lock );
+    vlc_object_lock( p_rtcp );
     p_client = p_rtcp->pp_clients[i_pos];
 
     p_stats = p_client->p_stats;
@@ -884,7 +884,7 @@ block_t *rtcp_encode_SR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
     bs_write( s, 32, p_stats->u_delay_since_last_SR );
 
     p_client = NULL;
-    vlc_mutex_unlock( &p_rtcp->object_lock );
+    vlc_object_unlock( p_rtcp );
 
     /* possible SR extension */
     return p_block;
@@ -927,7 +927,7 @@ block_t *rtcp_encode_RR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
         return NULL;
     }
 
-    vlc_mutex_lock( &p_rtcp->object_lock );
+    vlc_object_lock( p_rtcp );
     p_client = p_rtcp->pp_clients[i_pos];
 
     p_stats = p_client->p_stats;
@@ -945,7 +945,7 @@ block_t *rtcp_encode_RR( vlc_object_t *p_this, rtcp_pkt_t *p_pkt )
     bs_write( s, 32, p_stats->u_delay_since_last_RR );
 
     p_client = NULL;
-    vlc_mutex_unlock( &p_rtcp->object_lock );
+    vlc_object_unlock( p_rtcp );
 
     /* possible RR extension */
     return p_block;

diff --git a/src/control/playlist.c b/src/control/playlist.c
index 0300243df04cac24202a5028e2a369cc53beeb57..d68971cf5ec30cde9bd6e3b60178e5b16a97b449 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -75,7 +75,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
         if (! playlist_was_locked( p_instance ) )
         {
             playlist_mark_locked( p_instance, 1 );
-            vlc_mutex_lock( &PL->object_lock );
+            vlc_object_lock( PL );
             did_lock = 1;
         }
 
@@ -85,7 +85,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
         {
             if( did_lock == 1 )
             {
-                vlc_mutex_unlock( &PL->object_lock );
+                vlc_object_unlock( PL );
                 playlist_mark_locked( p_instance, 0 );
             }
             RAISEVOID( "Unable to find item" );
@@ -95,7 +95,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
                           PL->status.p_node, p_item );
         if( did_lock == 1 )
         {
-            vlc_mutex_unlock( &PL->object_lock );
+            vlc_object_unlock( PL );
             playlist_mark_locked( p_instance, 0 );
         }
     }
@@ -222,7 +222,7 @@ int libvlc_playlist_get_current_index ( libvlc_instance_t *p_instance,
 void libvlc_playlist_lock( libvlc_instance_t *p_instance )
 {
     assert( PL );
-    vlc_mutex_lock( &PL->object_lock );
+    vlc_object_lock( PL );
     p_instance->b_playlist_locked = 1;
 }
 
@@ -230,7 +230,7 @@ void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
 {
     assert( PL );
     p_instance->b_playlist_locked = 0;
-    vlc_mutex_unlock( &PL->object_lock );
+    vlc_object_unlock( PL );
 }
 
 libvlc_media_player_t * libvlc_playlist_get_media_player(
@@ -240,7 +240,7 @@ libvlc_media_player_t * libvlc_playlist_get_media_player(
     libvlc_media_player_t *p_mi;
     assert( PL );
 
-    vlc_mutex_lock( &PL->object_lock );
+    vlc_object_lock( PL );
     if( PL->p_input )
     {
         p_mi = libvlc_media_player_new_from_input_thread(
@@ -252,7 +252,7 @@ libvlc_media_player_t * libvlc_playlist_get_media_player(
         p_mi = NULL;
         libvlc_exception_raise( p_e, "No active input" );
     }
-    vlc_mutex_unlock( &PL->object_lock );
+    vlc_object_unlock( PL );
 
     return p_mi;
 }

diff --git a/src/input/item.c b/src/input/item.c
index 579dac4aa18711bfd7351f6ecbb5b598e9760823..8bed232c33adde6eb028759ca3ddcd544c83e11f 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -193,13 +193,13 @@ static void input_ItemDestroy ( gc_object_t *p_this )
 
     input_ItemClean( p_input );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
     ARRAY_BSEARCH( priv->input_items,->i_id, int, p_input->i_id, i);
     if( i != -1 )
         ARRAY_REMOVE( priv->input_items, i);
 
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     free( p_input );
 }
@@ -310,13 +310,13 @@ input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id )
     input_item_t * p_ret = NULL;
     int i;
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
 
     ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
     if( i != -1 )
         p_ret = ARRAY_VAL( priv->input_items, i);
 
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     return p_ret;
 }
@@ -347,10 +347,10 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
     input_ItemInit( p_obj, p_input );
     vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
 
-    vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+    vlc_object_lock( p_obj->p_libvlc );
     p_input->i_id = ++priv->i_last_input_id;
     ARRAY_APPEND( priv->input_items, p_input );
-    vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+    vlc_object_unlock( p_obj->p_libvlc );
 
     p_input->b_fixed_name = false;
 

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 1e15b8c1b98be9519ed448697a62e34ce2cad7ff..b7cb768c7ccaebab4fbaddf597f410ddf44a6d61 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -235,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 );

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 9cea38cd136b971fa2d58247f45d371c8afbbe95..23188a9150b07bacb475e5cdb492c7c8c15498ca 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -611,7 +611,7 @@ void __vlc_object_kill( vlc_object_t *p_this )
     vlc_object_internals_t *internals = vlc_internals( p_this );
     int fd;
 
-    vlc_mutex_lock( &p_this->object_lock );
+    vlc_object_lock( p_this );
     p_this->b_die = true;
 
     vlc_spin_lock (&internals->spin);
@@ -626,7 +626,7 @@ void __vlc_object_kill( vlc_object_t *p_this )
     }
 
     vlc_object_signal_unlocked( p_this );
-    vlc_mutex_unlock( &p_this->object_lock );
+    vlc_object_unlock( p_this );
 
     if (p_this->i_object_type == VLC_OBJECT_LIBVLC)
     {

diff --git a/src/misc/threads.c b/src/misc/threads.c
index a7ab5c07b0d3f9441e31a55e2648d800bb41bcd7..ee94993ea6f34b93ce0d509ab4773e2bfd3c73af 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -489,7 +489,7 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
     boot->entry = func;
     boot->object = p_this;
 
-    vlc_mutex_lock( &p_this->object_lock );
+    vlc_object_lock( p_this );
 
 #if defined( LIBVLC_USE_PTHREAD )
     pthread_attr_t attr;
@@ -595,7 +595,7 @@ int __vlc_thread_create( vlc_object_t *p_this, const char * psz_file, int i_line
                          psz_name, psz_file, i_line );
     }
 
-    vlc_mutex_unlock( &p_this->object_lock );
+    vlc_object_unlock( p_this );
     return i_ret;
 }
 

diff --git a/src/playlist/control.c b/src/playlist/control.c
index de7342d25db533a5bc4e97e95c94f28ccfedbdfa..f0258e2820768d5604f2405c7f030da4aa336878 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -174,14 +174,14 @@ static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args
 int playlist_PreparseEnqueue( playlist_t *p_playlist,
                               input_item_t *p_item )
 {
-    vlc_mutex_lock( &p_playlist->p_preparse->object_lock );
+    vlc_object_lock( p_playlist->p_preparse );
     vlc_gc_incref( p_item );
     INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
                  p_playlist->p_preparse->i_waiting,
                  p_playlist->p_preparse->i_waiting,
                  p_item );
     vlc_cond_signal( &p_playlist->p_preparse->object_wait );
-    vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
+    vlc_object_unlock( p_playlist->p_preparse );
     return VLC_SUCCESS;
 }
 
@@ -190,11 +190,11 @@ int playlist_PreparseEnqueue( playlist_t *p_playlist,
 int playlist_PreparseEnqueueItem( playlist_t *p_playlist,
                                   playlist_item_t *p_item )
 {
-    vlc_mutex_lock( &p_playlist->object_lock );
-    vlc_mutex_lock( &p_playlist->p_preparse->object_lock );
+    vlc_object_lock( p_playlist );
+    vlc_object_lock( p_playlist->p_preparse );
     PreparseEnqueueItemSub( p_playlist, p_item );
-    vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist->p_preparse );
+    vlc_object_unlock( p_playlist );
     return VLC_SUCCESS;
 }
 

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index a4d2e18bf2c4e1f8a7e30a0f880da011181119b9..4419aa5ec16bd5777aff31b9a31f8fd56a649671 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -596,7 +596,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
     input_item_t *p_item;
     int i_activity;
 
-    vlc_mutex_lock( &p_obj->object_lock );
+    vlc_object_lock( p_obj );
 
     while( vlc_object_alive( p_obj ) )
     {
@@ -608,7 +608,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
 
         p_item = p_obj->pp_waiting[0];
         REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
-        vlc_mutex_unlock( &p_obj->object_lock );
+        vlc_object_unlock( p_obj );
         if( p_item )
         {
             int i_ret;
@@ -659,9 +659,9 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
         vlc_object_unlock( p_obj );
         /* Sleep at least 1ms */
         msleep( (i_activity+1) * 1000 );
-        vlc_mutex_lock( &p_obj->object_lock );
+        vlc_object_lock( p_obj );
     }
-    vlc_mutex_unlock( &p_obj->object_lock );
+    vlc_object_unlock( p_obj );
 }
 
 static void VariablesInit( playlist_t *p_playlist )

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 3ffbe5715a25931f2a4be635bcce20a53253a9f0..85eda590f0b8d5be34e50131e1f77db60e8bb3f7 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -68,7 +68,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
     p_export->p_root = p_export_root;
 
     /* Lock the playlist */
-    vlc_mutex_lock( &p_playlist->object_lock );
+    vlc_object_lock( p_playlist );
     p_playlist->p_private = (void *)p_export;
 
     /* And call the module ! All work is done now */
@@ -76,7 +76,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
     if( !p_module )
     {
         msg_Warn( p_playlist, "exporting playlist failed" );
-        vlc_mutex_unlock( &p_playlist->object_lock );
+        vlc_object_unlock( p_playlist );
         return VLC_ENOOBJ;
     }
     module_Unneed( p_playlist , p_module );
@@ -86,7 +86,7 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
     free( p_export->psz_filename );
     free ( p_export );
     p_playlist->p_private = NULL;
-    vlc_mutex_unlock( &p_playlist->object_lock );
+    vlc_object_unlock( p_playlist );
 
     return VLC_SUCCESS;
 }

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 9592f3a6781483630279f15d789fba78d884606b..30479a7505d36f0bf6fe66a4dd790d827dac97a5 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -215,7 +215,7 @@ static void RunThread( vlc_object_t *p_this)
         }
 
         /* Find the session to announce */
-        vlc_mutex_lock( &p_sap->object_lock );
+        vlc_object_lock( p_sap );
         if( p_sap->i_sessions > p_sap->i_current_session + 1)
         {
             p_sap->i_current_session++;
@@ -226,12 +226,12 @@ static void RunThread( vlc_object_t *p_this)
         }
         else
         {
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             msleep( SAP_IDLE );
             continue;
         }
         p_session = p_sap->pp_sessions[p_sap->i_current_session];
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
 
         /* And announce it */
         if( p_session->p_address->b_enabled == true &&
@@ -256,11 +256,11 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     struct sockaddr_storage addr;
     socklen_t addrlen;
 
-    vlc_mutex_lock( &p_sap->object_lock );
+    vlc_object_lock( p_sap );
     addrlen = p_session->addrlen;
     if ((addrlen == 0) || (addrlen > sizeof (addr)))
     {
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
         msg_Err( p_sap, "No/invalid address specified for SAP announce" );
         return VLC_EGENERIC;
     }
@@ -327,7 +327,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
             {
                 msg_Err( p_sap, "Out-of-scope multicast address "
                          "not supported by SAP" );
-                vlc_mutex_unlock( &p_sap->object_lock );
+                vlc_object_unlock( p_sap );
                 return VLC_EGENERIC;
             }
 
@@ -336,7 +336,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
         }
 
         default:
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             msg_Err( p_sap, "Address family %d not supported by SAP",
                      addr.ss_family );
             return VLC_EGENERIC;
@@ -347,7 +347,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
 
     if( i )
     {
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
         msg_Err( p_sap, "%s", vlc_gai_strerror( i ) );
         return VLC_EGENERIC;
     }
@@ -375,7 +375,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
                                     malloc( sizeof(sap_address_t) );
         if( !p_address )
         {
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             return VLC_ENOMEM;
         }
         p_address->psz_address = strdup( psz_addr );
@@ -438,7 +438,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
         default:
             msg_Err( p_sap, "Address family %d not supported by SAP",
                      addr.ss_family );
-            vlc_mutex_unlock( &p_sap->object_lock );
+            vlc_object_unlock( p_sap );
             return VLC_EGENERIC;
     }
 
@@ -451,7 +451,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     if (p_sap_session->psz_data == NULL)
     {
         free (p_session->psz_sdp);
-        vlc_mutex_unlock( &p_sap->object_lock );
+        vlc_object_unlock( p_sap );
         return VLC_ENOMEM;
     }
 
@@ -505,7 +505,7 @@ static int announce_SAPAnnounceAdd( sap_handler_t *p_sap,
     msg_Dbg( p_sap,"%i addresses, %i sessions",
                    p_sap->i_addresses,p_sap->i_sessions);
 
-    vlc_mutex_unlock( &p_sap->object_lock );
+    vlc_object_unlock( p_sap );
 
     return VLC_SUCCESS;
 }
@@ -515,7 +515,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
                              session_descriptor_t *p_session )
 {
     int i;
-    vlc_mutex_lock( &p_sap->object_lock );
+    vlc_object_lock( p_sap );
 
     msg_Dbg( p_sap, "removing session %p from SAP", p_session);
 
@@ -542,7 +542,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
 
     msg_Dbg( p_sap,"%i announcements remaining", p_sap->i_sessions );
 
-    vlc_mutex_unlock( &p_sap->object_lock );
+    vlc_object_unlock( p_sap );
 
     return VLC_SUCCESS;
 }

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 4aefc6729a889489cc50d9b2e77561f83f522bcf..b3dbe13ac350459e0deff24a0affc91cf357d821 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -158,17 +158,17 @@ void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window )
 
     if( !p_intf ) return;
 
-    vlc_mutex_lock( &p_intf->object_lock );
+    vlc_object_lock( p_intf );
     if( p_intf->b_dead )
     {
-        vlc_mutex_unlock( &p_intf->object_lock );
+        vlc_object_unlock( p_intf );
         return;
     }
 
     if( !p_intf->pf_release_window )
     {
         msg_Err( p_vout, "no pf_release_window");
-        vlc_mutex_unlock( &p_intf->object_lock );
+        vlc_object_unlock( p_intf );
         vlc_object_release( p_intf );
         return;
     }
@@ -176,7 +176,7 @@ void vout_ReleaseWindow( vout_thread_t *p_vout, void *p_window )
     p_intf->pf_release_window( p_intf, p_window );
 
     p_vout->p_parent_intf = NULL;
-    vlc_mutex_unlock( &p_intf->object_lock );
+    vlc_object_unlock( p_intf );
     vlc_object_release( p_intf );
 }
 
@@ -188,22 +188,22 @@ int vout_ControlWindow( vout_thread_t *p_vout, void *p_window,
 
     if( !p_intf ) return VLC_EGENERIC;
 
-    vlc_mutex_lock( &p_intf->object_lock );
+    vlc_object_lock( p_intf );
     if( p_intf->b_dead )
     {
-        vlc_mutex_unlock( &p_intf->object_lock );
+        vlc_object_unlock( p_intf );
         return VLC_EGENERIC;
     }
 
     if( !p_intf->pf_control_window )
     {
         msg_Err( p_vout, "no pf_control_window");
-        vlc_mutex_unlock( &p_intf->object_lock );
+        vlc_object_unlock( p_intf );
         return VLC_EGENERIC;
     }
 
     i_ret = p_intf->pf_control_window( p_intf, p_window, i_query, args );
-    vlc_mutex_unlock( &p_intf->object_lock );
+    vlc_object_unlock( p_intf );
     return i_ret;
 }