* Local prototypes
*****************************************************************************/
static void VariablesInit( playlist_t *p_playlist );
-static void playlist_Destructor( vlc_object_t * p_this );
static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *a )
pl_priv(p_playlist)->b_auto_preparse = b_auto_preparse;
}
- vlc_object_set_destructor( p_playlist, playlist_Destructor );
-
return p_playlist;
}
+/**
+ * Destroy playlist.
+ * This is not thread-safe. Any reference to the playlist is assumed gone.
+ * (In particular, all interface and services threads must have been joined).
+ *
+ * \param p_playlist the playlist object
+ */
void playlist_Destroy( playlist_t *p_playlist )
{
playlist_private_t *p_sys = pl_priv(p_playlist);
playlist_preparser_Delete( p_sys->p_preparser );
if( p_sys->p_fetcher )
playlist_fetcher_Delete( p_sys->p_fetcher );
- vlc_object_release( p_playlist );
-}
-
-/**
- * Destroy playlist
- *
- * Destroy a playlist structure.
- * \param p_playlist the playlist object
- * \return nothing
- */
-
-static void playlist_Destructor( vlc_object_t * p_this )
-{
- playlist_t *p_playlist = (playlist_t *)p_this;
- playlist_private_t *p_sys = pl_priv(p_playlist);
+ /* Already cleared when deactivating (if activated anyway) */
assert( !p_sys->p_input );
assert( !p_sys->p_input_resource );
ARRAY_RESET( p_playlist->items );
ARRAY_RESET( p_playlist->current );
- msg_Dbg( p_this, "Destroyed" );
+ vlc_object_release( p_playlist );
}
/** Get current playing input.
pl_priv(p_playlist)->status.p_node = p_node;
}
+static input_thread_t *playlist_FindInput( vlc_object_t *object )
+{
+ assert( object == VLC_OBJECT(pl_Get(object)) );
+ return playlist_CurrentInput( (playlist_t *)object );
+}
+
static void VariablesInit( playlist_t *p_playlist )
{
/* These variables control updates */
/* */
var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+ /* Variables to preserve video output parameters */
+ var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+
+ /* Audio output parameters */
+ var_Create( p_playlist, "volume-muted", VLC_VAR_BOOL );
+ var_Create( p_playlist, "saved-volume", VLC_VAR_INTEGER );
+ var_Create( p_playlist, "volume-change", VLC_VAR_VOID );
+ /* FIXME: horrible hack for audio output interface code */
+ var_Create( p_playlist, "find-input-callback", VLC_VAR_ADDRESS );
+ var_SetAddress( p_playlist, "find-input-callback", playlist_FindInput );
}
playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist )