* Playlist control
*****************************************************************************/
-playlist_t *__pl_Hold( vlc_object_t *p_this )
+static vlc_mutex_t global_lock = VLC_STATIC_MUTEX;
+
+#undef pl_Hold
+playlist_t *pl_Hold (vlc_object_t *obj)
{
playlist_t *pl;
+ libvlc_int_t *p_libvlc = obj->p_libvlc;
- barrier();
- pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
+ vlc_mutex_lock (&global_lock);
+ pl = libvlc_priv (p_libvlc)->p_playlist;
+ assert (pl != NULL);
- assert( VLC_OBJECT(pl) != p_this /* This does not make sense to hold the playlist
- using pl_Hold. use vlc_object_hold in this case */ );
+ if (!libvlc_priv (p_libvlc)->playlist_active)
+ {
+ playlist_Activate (pl);
+ libvlc_priv (p_libvlc)->playlist_active = true;
+ }
+ /* The playlist should hold itself with vlc_object_hold() if ever. */
+ assert (VLC_OBJECT (pl) != obj);
if (pl)
vlc_object_hold (pl);
+ vlc_mutex_unlock (&global_lock);
return pl;
}
-void __pl_Release( vlc_object_t *p_this )
+#undef pl_Release
+void pl_Release( vlc_object_t *p_this )
{
playlist_t *pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
assert( pl != NULL );
vlc_object_release( pl );
}
+void pl_Deactivate (libvlc_int_t *p_libvlc)
+{
+ vlc_mutex_lock (&global_lock);
+ if (libvlc_priv (p_libvlc)->playlist_active)
+ playlist_Deactivate (libvlc_priv (p_libvlc)->p_playlist);
+ vlc_mutex_unlock (&global_lock);
+}
+
void playlist_Lock( playlist_t *pl )
{
vlc_mutex_lock( &pl_priv(pl)->lock );