Use pl_Release with the right argument.

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 4e247abe3e1485fa141bfe80e6687a012cae3d83..51ea50b3c13284bd673bdc719220c8cb1fe57b00 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -227,7 +227,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len)
     {
         msg_Err( p_access, "unable to find item in playlist" );
         vlc_object_release( p_input );
-        pl_Release( p_playlist );
+        pl_Release( p_access );
         return VLC_ENOOBJ;
     }
 

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index cdf7bf41b4b7e7ee9fbd3cd117072df51923aac5..4eb5b16b896f23dffee9a6ece12d13b28c1e89fe 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -309,7 +309,7 @@ static int Open( vlc_object_t *p_this )
         if( psz_file_name &&
             asprintf( &psz_txt, "path=%s", psz_file_name ) == -1 )
             {
-                pl_Release( p_playlist );
+                pl_Release( p_access );
                 free( psz_uri );
                 return VLC_ENOMEM;
             }
@@ -323,7 +323,7 @@ static int Open( vlc_object_t *p_this )
 
         if( p_sys->p_bonjour == NULL )
             msg_Err( p_access, "unable to start requested Bonjour announce" );
-        pl_Release( p_playlist );
+        pl_Release( p_access );
     }
     else
         p_sys->p_bonjour = NULL;

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 4929463124e6aba2d747780917ad796b73820d95..7c8a1c9431258f3661aa1f08d356be6934eaefa7 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -309,7 +309,7 @@ DBUS_METHOD( Pause )
     REPLY_INIT;
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
     playlist_Pause( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -333,7 +333,7 @@ DBUS_METHOD( Play )
     else
         playlist_Play( p_playlist );
 
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -346,7 +346,7 @@ DBUS_METHOD( GetCurrentMetadata )
     if( p_playlist->status.p_item )
         GetInputMeta( p_playlist->status.p_item->p_input, &args );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -410,7 +410,7 @@ DBUS_METHOD( AddTrack )
     playlist_Add( p_playlist, psz_mrl, NULL, PLAYLIST_APPEND |
             ( ( b_play == TRUE ) ? PLAYLIST_GO : 0 ) ,
             PLAYLIST_END, true, false );
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
 
     dbus_int32_t i_success = 0;
     ADD_INT32( &i_success );
@@ -425,7 +425,7 @@ DBUS_METHOD( GetCurrentTrack )
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
     dbus_int32_t i_position = p_playlist->i_current_index;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
 
     ADD_INT32( &i_position );
     REPLY_SEND;
@@ -450,7 +450,7 @@ DBUS_METHOD( GetMetadata )
     if( dbus_error_is_set( &error ) )
     {
         PL_UNLOCK;
-        pl_Release( p_playlist );
+        pl_Release( (vlc_object_t*) p_this );
         msg_Err( (vlc_object_t*) p_this, "D-Bus message reading : %s\n",
                 error.message );
         dbus_error_free( &error );
@@ -463,7 +463,7 @@ DBUS_METHOD( GetMetadata )
     }
 
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
     REPLY_SEND;
 }
 
@@ -474,7 +474,7 @@ DBUS_METHOD( GetLength )
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_this );
     dbus_int32_t i_elements = p_playlist->current.i_size;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
 
     ADD_INT32( &i_elements );
     REPLY_SEND;
@@ -511,7 +511,7 @@ DBUS_METHOD( DelTrack )
     }
     PL_UNLOCK;
 
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_this );
 
     REPLY_SEND;
 }
@@ -772,7 +772,7 @@ static int Open( vlc_object_t *p_this )
     var_AddCallback( p_playlist, "repeat", StatusChangeEmit, p_intf );
     var_AddCallback( p_playlist, "loop", StatusChangeEmit, p_intf );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_intf->pf_run = Run;
     p_intf->p_sys = p_sys;
@@ -813,7 +813,7 @@ static void Close   ( vlc_object_t *p_this )
     }
 
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     dbus_connection_unref( p_intf->p_sys->p_conn );
 
@@ -855,7 +855,7 @@ DBUS_SIGNAL( TrackListChangeSignal )
 
     playlist_t *p_playlist = pl_Yield( (vlc_object_t*) p_data );
     dbus_int32_t i_elements = p_playlist->current.i_size;
-    pl_Release( p_playlist );
+    pl_Release( (vlc_object_t*) p_data );
 
     ADD_INT32( &i_elements );
     SIGNAL_SEND;
@@ -1000,12 +1000,12 @@ static int TrackChange( vlc_object_t *p_this, const char *psz_var,
     if( !p_input )
     {
         PL_UNLOCK;
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         return VLC_SUCCESS;
     }
 
     vlc_object_yield( p_input );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_item = input_GetItem( p_input );
     if( !p_item )
@@ -1033,7 +1033,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
 {
     intf_sys_t* p_sys = p_intf->p_sys;
     dbus_int32_t i_caps = CAPS_CAN_HAS_TRACKLIST;
-    playlist_t* p_playlist = pl_Yield( (vlc_object_t*)p_intf );
+    playlist_t* p_playlist = pl_Yield( p_intf );
     if( !b_playlist_locked ) PL_LOCK;
     
     if( p_playlist->current.i_size > 0 )
@@ -1050,7 +1050,7 @@ static int UpdateCaps( intf_thread_t* p_intf, bool b_playlist_locked )
     }
 
     if( !b_playlist_locked ) PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     if( p_sys->b_meta_read )
         i_caps |= CAPS_CAN_PROVIDE_METADATA;
@@ -1158,7 +1158,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
     playlist_t* p_playlist = NULL;
     input_thread_t* p_input = NULL;
 
-    p_playlist = pl_Yield( (vlc_object_t*) p_intf );
+    p_playlist = pl_Yield( p_intf );
     if( lock )
         PL_LOCK;
 
@@ -1184,7 +1184,7 @@ static int MarshalStatus( intf_thread_t* p_intf, DBusMessageIter* args,
 
     if( lock )
         PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     dbus_message_iter_open_container( args, DBUS_TYPE_STRUCT, NULL, &status );
     dbus_message_iter_append_basic( &status, DBUS_TYPE_INT32, &i_state );

diff --git a/modules/gui/beos/ListViews.cpp b/modules/gui/beos/ListViews.cpp
index bcf245192b0d4ec94a8583f8c4b106e890646ef9..2822915f80ac392d2f209309659fd0c039037581 100644 (file)
--- a/modules/gui/beos/ListViews.cpp
+++ b/modules/gui/beos/ListViews.cpp
@@ -694,7 +694,7 @@ PlaylistView::MouseDown( BPoint where )
                     if( p_playlist )
                     {
                         playlist_Goto( p_playlist, i );
-                        pl_Release( p_playlist );
+                        pl_Release( p_intf );
                     }
                     handled = true;
                 }
@@ -1085,7 +1085,7 @@ PlaylistView::_PlayingItem() const
     }
 
     BListItem * item = ItemAt( p_playlist->i_index );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
     return item;
 }
 
@@ -1109,7 +1109,7 @@ PlaylistView::_SetPlayingIndex( BListItem* playingItem )
             playlist_Goto( p_playlist, i );
             SetCurrent( i );
 
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
             break;
         }
     }

diff --git a/modules/gui/beos/PlayListWindow.cpp b/modules/gui/beos/PlayListWindow.cpp
index d05036fc196d6b9fee0ee4ea18abb31576ab22e9..dcfc779957ebcfffd31569a2668fadbb39c6a72c 100644 (file)
--- a/modules/gui/beos/PlayListWindow.cpp
+++ b/modules/gui/beos/PlayListWindow.cpp
@@ -294,7 +294,7 @@ PlayListWindow::UpdatePlaylist( bool rebuild )
     p_playlist = pl_Yield( p_intf );
     fListView->SetCurrent( p_playlist->i_index );
     fListView->SetPlaying( p_playlist->status.i_status == PLAYLIST_RUNNING );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     _CheckItemsEnableState();
 }

diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 541054b28f7adad5e871183645136fc1e35851df..f378e51f0e4fe67ef1faa464839ada305eb1f757 100644 (file)
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -296,7 +296,7 @@ static void Run( intf_thread_t *p_intf )
     PlaylistRebuildListStore(p_intf,p_playlist_store, p_playlist);
     gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvplaylist), GTK_TREE_MODEL(p_playlist_store));
     g_object_unref(p_playlist_store);
-    pl_Release(p_playlist); /* Free the playlist */
+    pl_Release( p_intf ); /* Free the playlist */
     gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(p_intf->p_sys->p_tvplaylist)),GTK_SELECTION_MULTIPLE);
 
     /* Column properties */
@@ -436,7 +436,7 @@ static int Manage( intf_thread_t *p_intf )
                 PlaylistRebuildListStore(p_intf, p_liststore, p_playlist);
                 gtk_tree_view_set_model(p_intf->p_sys->p_tvplaylist, (GtkTreeModel*) p_liststore);
                 g_object_unref(p_liststore);
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
             }
 
             /* Manage the slider */

diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index 15b3f63508a158662e5f4767a9ee9e80a41f4633..936060489a2f56443927e9ce0783b2f701f5697a 100644 (file)
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -146,7 +146,7 @@ static void PlaylistAddItem(GtkWidget *widget, gchar *name, char **ppsz_options,
             free(ppsz_options);
         }
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void PlaylistRebuildListStore( intf_thread_t *p_intf,
@@ -393,7 +393,7 @@ void onPlay(GtkButton *button, gpointer user_data)
         {
             vlc_object_unlock( p_playlist );
         }
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 }
 
@@ -404,7 +404,7 @@ void onStop(GtkButton *button, gpointer user_data)
     if (p_playlist)
     {
         playlist_Stop( p_playlist );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         gdk_window_raise( p_intf->p_sys->p_window->window );
     }
 }
@@ -802,7 +802,7 @@ void onPlaylistRow(GtkTreeView *treeview, GtkTreePath *path,
         i_skip = i_row - p_playlist->i_current_index;
         playlist_Skip( p_playlist, i_skip );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 
@@ -834,7 +834,7 @@ void onUpdatePlaylist(GtkButton *button, gpointer user_data)
             g_object_unref(p_model);
         }
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 static void deleteItemFromPlaylist(gpointer data, gpointer user_data)
@@ -907,7 +907,7 @@ void onDeletePlaylist(GtkButton *button, gpointer user_data)
             g_object_unref(p_store);
         }
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 
@@ -927,7 +927,7 @@ void onClearPlaylist(GtkButton *button, gpointer user_data)
     {
         msg_Err( p_playlist, "fix pda delete" );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     // Remove all entries from the Playlist widget.
     p_tvplaylist = (GtkTreeView*) lookup_widget( GTK_WIDGET(button), "tvPlaylist");

diff --git a/modules/gui/qt4/components/info_panels.cpp b/modules/gui/qt4/components/info_panels.cpp
index 107f4caf5cb2504e00d28a34b14ba34fb5788002..3f9742f50b3779b7288328687cc8197aeda6639d 100644 (file)
--- a/modules/gui/qt4/components/info_panels.cpp
+++ b/modules/gui/qt4/components/info_panels.cpp
@@ -291,7 +291,7 @@ void MetaPanel::saveMeta()
     if( p_mod )
         module_Unneed( p_playlist, p_mod );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     /* Reset the status of the mode. No need to emit any signal because parent
        is the only caller */

diff --git a/modules/gui/wince/dialogs.cpp b/modules/gui/wince/dialogs.cpp
index 1fa35cdbc82b72b72e9842818dc54144cd29e629..2dbc9c8d4795057b1dc9f838648a8e8284f63fec 100644 (file)
--- a/modules/gui/wince/dialogs.cpp
+++ b/modules/gui/wince/dialogs.cpp
@@ -366,7 +366,7 @@ void DialogsProvider::OnOpenFileSimple( int i_arg )
                       PLAYLIST_APPEND | (i_arg?PLAYLIST_GO:0), PLAYLIST_END );
     }
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void DialogsProvider::OnOpenDirectory( int i_arg )
@@ -431,7 +431,7 @@ void DialogsProvider::OnOpenDirectory( int i_arg )
  error:
 
     if( p_malloc) p_malloc->Release();
-    if( p_playlist ) pl_Release( p_playlist );
+    if( p_playlist ) pl_Release( p_intf );
 
 #ifdef UNDER_CE
     FreeLibrary( ceshell_dll );

diff --git a/modules/gui/wince/interface.cpp b/modules/gui/wince/interface.cpp
index 660e43214a8b8dde49d79d68b41045a482225bfd..d9c1463f221aa79b387df38c7a50875cbe6fe6e3 100644 (file)
--- a/modules/gui/wince/interface.cpp
+++ b/modules/gui/wince/interface.cpp
@@ -652,7 +652,7 @@ void Interface::OnPlayStream( void )
             /* No stream was playing, start one */
             playlist_Play( p_playlist );
             TogglePlayButton( PLAYING_S );
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
             return;
         }
 
@@ -678,7 +678,7 @@ void Interface::OnPlayStream( void )
         /* If the playlist is empty, open a file requester instead */
         OnShowDialog( ID_FILE_QUICKOPEN );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Interface::TogglePlayButton( int i_playing_status )
@@ -815,7 +815,7 @@ void Interface::OnStopStream( void )
 
     playlist_Stop( p_playlist );
     TogglePlayButton( PAUSE_S );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Interface::OnPrevStream( void )
@@ -824,7 +824,7 @@ void Interface::OnPrevStream( void )
     if( p_playlist == NULL ) return;
 
     playlist_Prev( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Interface::OnNextStream( void )
@@ -833,7 +833,7 @@ void Interface::OnNextStream( void )
     if( p_playlist == NULL ) return;
 
     playlist_Next( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Interface::OnSlowStream( void )

diff --git a/modules/gui/wince/iteminfo.cpp b/modules/gui/wince/iteminfo.cpp
index 160f72a2103cdc9731c20a295e05c8f4f3eefeee..c0f967f40b38b98cc45b8c4a0c3b53d544301595 100644 (file)
--- a/modules/gui/wince/iteminfo.cpp
+++ b/modules/gui/wince/iteminfo.cpp
@@ -273,7 +273,7 @@ void ItemInfoDialog::OnOk()
     if( p_playlist != NULL )
     {
         b_state = SendMessage( enabled_checkbox, BM_GETCHECK, 0, 0 );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 
     p_item->b_enabled = (b_state & BST_CHECKED) ? true : false ;

diff --git a/modules/gui/wince/menus.cpp b/modules/gui/wince/menus.cpp
index db7306c283be42f6a4801bef0a7fbbafb5df3c59..75b27c152179af72010a052f65685d10a3e2e255 100644 (file)
--- a/modules/gui/wince/menus.cpp
+++ b/modules/gui/wince/menus.cpp
@@ -227,7 +227,7 @@ void PopupMenu( intf_thread_t *p_intf, HWND p_parent, POINT point )
             AppendMenu( hmenu, MF_SEPARATOR, 0, _T("") );
             AppendMenu( hmenu, MF_STRING, PlayStream_Event, _T("Play") );
         }
-        if( p_playlist ) pl_Release( p_playlist );
+        if( p_playlist ) pl_Release( p_intf );
     }
 
     AppendMenu( hmenu, MF_POPUP|MF_STRING, (UINT)MiscMenu( p_intf ),

diff --git a/modules/gui/wince/open.cpp b/modules/gui/wince/open.cpp
index 911b4524b891e37b274aa5cc3eb5f33b8795e86e..6a2d3e12239d2c383ac191bd50b36e25ad77cba0 100644 (file)
--- a/modules/gui/wince/open.cpp
+++ b/modules/gui/wince/open.cpp
@@ -655,7 +655,7 @@ void OpenDialog::OnOk()
         free( pp_args[i_args] );
         if( !i_args ) free( pp_args );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /*****************************************************************************

diff --git a/modules/gui/wince/playlist.cpp b/modules/gui/wince/playlist.cpp
index dca6f6c10ea5feeed4d6f6f32b5b9cf254fea678..44ffe549436b8917ad6a01587846b6eab4ac260d 100644 (file)
--- a/modules/gui/wince/playlist.cpp
+++ b/modules/gui/wince/playlist.cpp
@@ -303,7 +303,7 @@ LRESULT Playlist::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
         bState = val.b_bool ? TBSTATE_CHECKED : 0;
         SendMessage( hwndTB, TB_SETSTATE, Repeat_Event,
                      MAKELONG(bState | TBSTATE_ENABLED, 0) );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
 
         GetClientRect( hwnd, &rect );
         hListView = CreateWindow( WC_LISTVIEW, NULL, WS_VISIBLE | WS_CHILD |
@@ -521,7 +521,7 @@ LRESULT Playlist::ProcessCustomDraw( LPARAM lParam )
         if( (int)lplvcd->nmcd.dwItemSpec == p_playlist->i_index )
         {
             lplvcd->clrText = RGB(255,0,0);
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
             return CDRF_NEWFONT;
         }
  
@@ -529,16 +529,16 @@ LRESULT Playlist::ProcessCustomDraw( LPARAM lParam )
                                         (int)lplvcd->nmcd.dwItemSpec );
         if( !p_item )
         {
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
             return CDRF_DODEFAULT;
         }
         if( p_item->b_enabled == false )
         {
             lplvcd->clrText = RGB(192,192,192);
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
             return CDRF_NEWFONT;
         }
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 
     return CDRF_DODEFAULT;
@@ -604,7 +604,7 @@ void Playlist::UpdatePlaylist()
     }
     vlc_object_unlock( p_playlist );
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /**********************************************************************
@@ -645,7 +645,7 @@ void Playlist::Rebuild()
         ListView_SetItemState( hListView, i_focused, LVIS_FOCUSED,
                                LVIS_STATEIMAGEMASK );
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /**********************************************************************
@@ -661,7 +661,7 @@ void Playlist::UpdateItem( int i )
 
     if( !p_item )
     {
-        pl_Release(p_playlist);
+        pl_Release( p_intf );
         return;
     }
 
@@ -677,7 +677,7 @@ void Playlist::UpdateItem( int i )
 
     ListView_SetItemText( hListView, i, 3, _FROMMB(psz_duration) );
 
-    pl_Release(p_playlist);
+    pl_Release( p_intf );
 }
 
 /**********************************************************************
@@ -691,7 +691,7 @@ void Playlist::DeleteItem( int item )
     playlist_Delete( p_playlist, item );
     ListView_DeleteItem( hListView, item );
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /**********************************************************************
@@ -708,7 +708,7 @@ static void OnOpenCB( intf_dialog_args_t *p_arg )
         if( p_playlist )
         {
             playlist_Import( p_playlist, p_arg->psz_results[0] );
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
         }
     }
 }
@@ -747,7 +747,7 @@ static void OnSaveCB( intf_dialog_args_t *p_arg )
             else psz_export = "export-m3u";
 
             playlist_Export( p_playlist, p_arg->psz_results[0], psz_export );
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
         }
     }
 }
@@ -814,7 +814,7 @@ void Playlist::OnEnableSelection()
             UpdateItem( item );
         }
     }
-    pl_Release( p_playlist);
+    pl_Release( p_intf );
 }
 
 void Playlist::OnDisableSelection()
@@ -834,7 +834,7 @@ void Playlist::OnDisableSelection()
             UpdateItem( item );
         }
     }
-    pl_Release( p_playlist);
+    pl_Release( p_intf );
 }
 
 void Playlist::OnSelectAll()
@@ -853,7 +853,7 @@ void Playlist::OnActivateItem( int i_item )
 
     playlist_Goto( p_playlist, i_item );
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Playlist::ShowInfos( HWND hwnd, int i_item )
@@ -874,7 +874,7 @@ void Playlist::ShowInfos( HWND hwnd, int i_item )
         delete iteminfo_dialog;
     }
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /********************************************************************
@@ -903,7 +903,7 @@ void Playlist::OnUp()
                                    LVIS_STATEIMAGEMASK );
         }
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     return;
 }
@@ -923,7 +923,7 @@ void Playlist::OnDown()
         ListView_SetItemState( hListView, i_item + 1, LVIS_FOCUSED,
                                LVIS_STATEIMAGEMASK );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     return;
 }
@@ -941,7 +941,7 @@ void Playlist::OnRandom()
     if( p_playlist == NULL ) return;
 
     var_Set( p_playlist , "random", val );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Playlist::OnLoop ()
@@ -954,7 +954,7 @@ void Playlist::OnLoop ()
     if( p_playlist == NULL ) return;
 
     var_Set( p_playlist , "loop", val );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Playlist::OnRepeat ()
@@ -967,7 +967,7 @@ void Playlist::OnRepeat ()
     if( p_playlist == NULL ) return;
 
     var_Set( p_playlist , "repeat", val );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /********************************************************************
@@ -997,7 +997,7 @@ void Playlist::OnSort( UINT event )
         break;
     }
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     b_need_update = true;
 
@@ -1039,7 +1039,7 @@ void Playlist::OnColSelect( int iSubItem )
         break;
     }
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     b_need_update = true;
 
@@ -1062,7 +1062,7 @@ void Playlist::OnPopupPlay()
         playlist_Goto( p_playlist, i_popup_item );
     }
 
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Playlist::OnPopupDel()
@@ -1094,7 +1094,7 @@ void Playlist::OnPopupEna()
         playlist_Enable( p_playlist, p_item );
     }
 
-    pl_Release( p_playlist);
+    pl_Release( p_intf );
     UpdateItem( i_popup_item );
 }
 

diff --git a/modules/gui/wince/timer.cpp b/modules/gui/wince/timer.cpp
index df58e803b089b9556a017124096f024172171b3e..5135609e0e31cc3f10f78f8537cd60b50e7be796 100644 (file)
--- a/modules/gui/wince/timer.cpp
+++ b/modules/gui/wince/timer.cpp
@@ -56,7 +56,7 @@ Timer::Timer( intf_thread_t *_p_intf, HWND hwnd, Interface *_p_main_interface)
     if( p_playlist != NULL )
     {
         var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 
     SetTimer( hwnd, 1, 200 /*milliseconds*/, NULL );
@@ -69,7 +69,7 @@ Timer::~Timer()
     if( p_playlist != NULL )
     {
         var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 }
 

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 2204abf445f9d6a6ab1ba8c675a2c4eeb7d27e49..898302a1d58b76d70c8262a8551bc8247930e8e5 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -471,7 +471,7 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
             wxLocaleFree( psz_utf8 );
         }
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
@@ -494,7 +494,7 @@ void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
                       PLAYLIST_END, true, false );
         wxLocaleFree( psz_utf8 );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void DialogsProvider::OnOpenFile( wxCommandEvent& event )

diff --git a/modules/gui/wxwidgets/dialogs/bookmarks.cpp b/modules/gui/wxwidgets/dialogs/bookmarks.cpp
index 13dfa1d45d29f3fb3ed36aba452070f95e284d07..864a86b59049d18a9c3ad881ed945879e11075c4 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/bookmarks.cpp
+++ b/modules/gui/wxwidgets/dialogs/bookmarks.cpp
@@ -210,7 +210,7 @@ BookmarksDialog::BookmarksDialog( intf_thread_t *_p_intf, wxWindow *p_parent )
        /* Some global changes happened -> Rebuild all */
        var_AddCallback( p_playlist, "playlist-current",
                         PlaylistChanged, this );
-       pl_Release( p_playlist );
+       pl_Release( p_intf );
     }
 }
 
@@ -221,7 +221,7 @@ BookmarksDialog::~BookmarksDialog()
     {
        var_DelCallback( p_playlist, "playlist-current",
                         PlaylistChanged, this );
-       pl_Release( p_playlist );
+       pl_Release( p_intf );
     }
 }
 

diff --git a/modules/gui/wxwidgets/dialogs/fileinfo.cpp b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
index df06c633c32065d570c0fcadca50af5b0698e1bc..0a75ac35192b47b326dc5011e1152ea6eddd9eed 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/fileinfo.cpp
+++ b/modules/gui/wxwidgets/dialogs/fileinfo.cpp
@@ -101,7 +101,7 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, wxWindow *p_parent ):
     if( p_playlist )
     {
         var_AddCallback( p_playlist, "item-change", ItemChanged, this );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 
     last_update = 0L;
@@ -124,10 +124,10 @@ void FileInfo::Update()
         advanced_info->Clear();
         if( b_stats )
             stats_info->Clear();
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         return;
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     vlc_object_yield( p_input );
     vlc_mutex_lock( &input_GetItem(p_input)->lock );
@@ -143,7 +143,7 @@ void FileInfo::Update()
     vlc_mutex_unlock( &input_GetItem(p_input)->lock );
 
     vlc_object_release(p_input);
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
     b_need_update = false;
     panel_sizer->Layout();
 

diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 9d1981178c92903debc36c9e5da5bde00dc76e5d..7430c62290d8bec87ab11ee5bbef3bd144f98ce8 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1209,7 +1209,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
                PLAYLIST_END, true, pl_Unlocked );
         vlc_gc_decref( p_input );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     Hide();
 

diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp
index 07f559dd5a2bc10b166080a529de5aed09647812..8d0c6f5deba80bf69ac9fce908c139b404f3e5dc 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/wizard.cpp
+++ b/modules/gui/wxwidgets/dialogs/wizard.cpp
@@ -599,7 +599,7 @@ wizInputPage::wizInputPage( wxWizard *parent, wxWizardPage *prev, intf_thread_t
         {
             input_radios[1]->Disable();
         }
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
     else
     {
@@ -727,7 +727,7 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event)
                 }
                 else
                     event.Veto();
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
             }
             else
                 event.Veto();
@@ -1633,7 +1633,7 @@ void WizardDialog::Run()
             playlist_AddInput( p_playlist, p_input,
                                PLAYLIST_GO, PLAYLIST_END, true, pl_Unlocked );
             vlc_gc_decref( p_input );
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
         }
         else
         {

diff --git a/modules/gui/wxwidgets/input_manager.cpp b/modules/gui/wxwidgets/input_manager.cpp
index 8663051c546da3cf8b48d4dc7a4b5ed82278fe9b..aefa73a8f12f5e896309ebcd26a2b4d3e82739bd 100644 (file)
--- a/modules/gui/wxwidgets/input_manager.cpp
+++ b/modules/gui/wxwidgets/input_manager.cpp
@@ -202,7 +202,7 @@ void InputManager::UpdateInput()
         if( p_intf->p_sys->p_input )
              vlc_object_yield( p_intf->p_sys->p_input );
         UnlockPlaylist( p_intf->p_sys, p_playlist );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
     }
 }
 

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 60b1973bfedbf96e09f9b84a3a6b8b6474f9baf8..c78f6c5ff29dfcd4300eb667df84b54ec86775e9 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -1089,7 +1089,7 @@ void Interface::PlayStream()
         {
             /* No stream was playing, start one */
             playlist_Play( p_playlist );
-            pl_Release( p_playlist );
+            pl_Release( p_intf );
             input_manager->Update();
             return;
         }
@@ -1108,13 +1108,13 @@ void Interface::PlayStream()
         var_Set( p_input, "state", state );
 
         vlc_object_release( p_input );
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         input_manager->Update();
     }
     else
     {
         /* If the playlist is empty, open a file requester instead */
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         OnShowDialog( dummy );
         GetToolBar()->ToggleTool( PlayStream_Event, false );
     }
@@ -1133,7 +1133,7 @@ void Interface::StopStream()
     }
 
     playlist_Stop( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
     input_manager->Update();
 }
 
@@ -1151,7 +1151,7 @@ void Interface::PrevStream()
     }
 
     playlist_Prev( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Interface::OnNextStream( wxCommandEvent& WXUNUSED(event) )
@@ -1167,7 +1167,7 @@ void Interface::NextStream()
         return;
     }
     playlist_Next( p_playlist );
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void Interface::OnSlowStream( wxCommandEvent& WXUNUSED(event) )
@@ -1333,7 +1333,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
             {
                 vlc_object_release( p_input );
                 wxDnDLocaleFree( psz_utf8 );
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
                 return TRUE;
             }
             vlc_object_release( p_input );
@@ -1351,7 +1351,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
 
         wxDnDLocaleFree( psz_utf8 );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     return TRUE;
 }

diff --git a/modules/gui/wxwidgets/menus.cpp b/modules/gui/wxwidgets/menus.cpp
index 9d02544e3cc6d64a87b02f682720cfae582a464f..ff0a99c1804131a7c0337f281c2bb3a2c3577aae 100644 (file)
--- a/modules/gui/wxwidgets/menus.cpp
+++ b/modules/gui/wxwidgets/menus.cpp
@@ -269,7 +269,7 @@ int IntfAutoMenuBuilder( intf_thread_t *p_intf, ArrayOfInts &ri_objects,
             popupmenu.InsertSeparator( 0 ); \
             popupmenu.Insert( 0, Play_Event, wxU(_("Play")) ); \
         } \
-        if( p_playlist ) pl_Release( p_playlist ); \
+        if( p_playlist ) pl_Release( p_intf ); \
     } \
     \
     popupmenu.Append( MenuDummy_Event, wxU(_("Miscellaneous")), \
@@ -296,7 +296,7 @@ void VideoPopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
         }
         vlc_object_release( p_input );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
     CREATE_POPUP;
 }
 
@@ -318,7 +318,7 @@ void AudioPopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
         }
         vlc_object_release( p_input );
     }
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
     CREATE_POPUP;
 }
 
@@ -347,7 +347,7 @@ void MiscPopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
     p_intf->p_sys->p_popup_menu = &popupmenu;
     p_parent->PopupMenu( &popupmenu, pos.x, pos.y );
     p_intf->p_sys->p_popup_menu = NULL;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
@@ -403,7 +403,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
     p_intf->p_sys->p_popup_menu = &popupmenu;
     p_parent->PopupMenu( &popupmenu, pos.x, pos.y );
     p_intf->p_sys->p_popup_menu = NULL;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 }
 
 /*****************************************************************************
@@ -967,7 +967,7 @@ void MenuEvtHandler::OnMenuEvent( wxCommandEvent& event )
             playlist_Next( p_playlist );
             break;
         }
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         return;
     }
 

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index da02d64de1b756c8417af44c7032cb8051c2491d..8bde95ef6a8ca1f9e9474a61f4bf3a0d33e75b50 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -187,7 +187,7 @@ static int Open( vlc_object_t *p_this )
     PL_LOCK;
     var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_intf->pf_run = Run;
 
@@ -221,7 +221,7 @@ static void Close( vlc_object_t *p_this )
     }
 
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_intf->b_dead = true;
     /* we lock the mutex in case p_sys is being accessed from a callback */
@@ -520,13 +520,13 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     if( !p_input || p_input->b_dead )
     {
         PL_UNLOCK;
-        pl_Release( p_playlist );
+        pl_Release( p_intf );
         return VLC_SUCCESS;
     }
 
     vlc_object_yield( p_input );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_intf );
 
     p_item = input_GetItem( p_input );
     if( !p_item )
@@ -927,13 +927,13 @@ static int ReadMetaData( intf_thread_t *p_this )
     if( !p_input )
     {
         PL_UNLOCK;
-        pl_Release( p_playlist );
+        pl_Release( p_this );
         return( VLC_SUCCESS );
     }
 
     vlc_object_yield( p_input );
     PL_UNLOCK;
-    pl_Release( p_playlist );
+    pl_Release( p_this );
 
     p_item = input_GetItem( p_input );
     if( !p_item )

diff --git a/modules/misc/notify/growl.m b/modules/misc/notify/growl.m
index f506e966e2dbbe96ad9e127b190c00fa2733380e..908bf3d4aa58cf86e48565dfcb0816c88f72ee50 100644 (file)
--- a/modules/misc/notify/growl.m
+++ b/modules/misc/notify/growl.m
@@ -162,7 +162,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     playlist_t *p_playlist = pl_Yield( p_this );
 
     p_input = p_playlist->p_input;
-    pl_Release( p_playlist );
+    pl_Release( p_this );
 
     if( !p_input ) return VLC_SUCCESS;
     vlc_object_yield( p_input );

diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c
index e1d25805e942c063a8ee88659d4bf04a44afe44f..17ec991555a10684606aebe64cb05412870dfab3 100644 (file)
--- a/modules/misc/notify/growl_udp.c
+++ b/modules/misc/notify/growl_udp.c
@@ -124,7 +124,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     playlist_t *p_playlist = pl_Yield( p_this );
 
     p_input = p_playlist->p_input;
-    pl_Release( p_playlist );
+    pl_Release( p_this );
 
     if( !p_input ) return VLC_SUCCESS;
     vlc_object_yield( p_input );

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 9e2d1a5c55d8a0894a34e896557307c175cbc203..81b85ca8bfd8c2bfe77e66c64f8813a9216917fb 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -150,7 +150,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     intf_sys_t          *p_sys          = p_intf->p_sys;
 
     p_input = p_playlist->p_input;
-    pl_Release( p_playlist );
+    pl_Release( p_this );
 
     if( !p_input ) return VLC_SUCCESS;
     vlc_object_yield( p_input );

diff --git a/modules/misc/notify/xosd.c b/modules/misc/notify/xosd.c
index 4c766bfe85acf99c856fccb7e65181088e9546f8..80f68b66f0400e7c7f4a01e50f93d04c8889a3d1 100644 (file)
--- a/modules/misc/notify/xosd.c
+++ b/modules/misc/notify/xosd.c
@@ -220,7 +220,7 @@ static void Run( intf_thread_t *p_intf )
 
             if( playlist_IsEmpty( p_playlist ) )
             {
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
                 continue;
             }
             free( psz_display );
@@ -228,19 +228,19 @@ static void Run( intf_thread_t *p_intf )
             if( p_playlist->status.i_status == PLAYLIST_STOPPED )
             {
                 psz_display = strdup(_("Stop"));
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
             }
             else if( p_playlist->status.i_status == PLAYLIST_PAUSED )
             {
                 psz_display = strdup(_("Pause"));
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
             }
             else
             {
                 p_item = p_playlist->status.p_item;
                 p_input = p_item->p_input;
 
-                pl_Release( p_playlist );
+                pl_Release( p_intf );
                 if( !p_item )
                     continue;
 

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index 1418a1b73428e68ae62d206f0322324313ea9142..a6ee80b852008bf3970f465801003e1baa3a461e 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -2131,7 +2131,7 @@ static int WallpaperCallback( vlc_object_t *p_this, char const *psz_cmd,
              * restarted */
             var_Create( p_playlist, "directx-wallpaper", VLC_VAR_BOOL );
             var_Set( p_playlist, "directx-wallpaper", newval );
-            pl_Release( p_playlist );
+            pl_Release( p_vout );
         }
 
         p_vout->p_sys->i_changes |= DX_WALLPAPER_CHANGE;

diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 7f1aefc594bddb2954488156234153eed79ae026..60af482f5f9ecbb316253ac027b20855a3d7a4aa 100644 (file)
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -865,7 +865,7 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
         if( p_playlist )
         {
             playlist_Stop( p_playlist );
-            pl_Release( p_playlist );
+            pl_Release( p_vout );
         }
         return 0;
     }

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index f39a58c744d13687809819dd5e6858a91661d223..cfd012dfb62f30cf723778ffc09efd74eeead5a4 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -517,7 +517,7 @@ static int Manage( vout_thread_t *p_vout )
                 if( p_playlist != NULL )
                 {
                     playlist_Stop( p_playlist );
-                    pl_Release( p_playlist );
+                    pl_Release( p_vout );
                 }
 #else
 #warning FIXME FIXME ?

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 9b70a2cd0f51ee590ae500e8938789a50441c924..e364eb7f8342fcc81a8a87f1c5da02f8c982b0ba 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1465,7 +1465,7 @@ static int ManageVideo( vout_thread_t *p_vout )
             if( p_playlist != NULL )
             {
                 playlist_Stop( p_playlist );
-                pl_Release( p_playlist );
+                pl_Release( p_vout );
             }
         }
     }