# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_input.h>
#include <vlc_interface.h>
if( !p_playlist ) return;
// Preparse
- p_playlist->p_preparse = vlc_object_create( p_playlist,
- sizeof( playlist_preparse_t ) );
+ static const char ppname[] = "preparser";
+ p_playlist->p_preparse =
+ vlc_custom_create( p_playlist, sizeof( playlist_preparse_t ),
+ VLC_OBJECT_GENERIC, ppname );
if( !p_playlist->p_preparse )
{
msg_Err( p_playlist, "unable to create preparser" );
}
// Secondary Preparse
- p_playlist->p_fetcher = vlc_object_create( p_playlist,
- sizeof( playlist_fetcher_t ) );
+ static const char fname[] = "fetcher";
+ p_playlist->p_fetcher =
+ vlc_custom_create( p_playlist, sizeof( playlist_fetcher_t ),
+ VLC_OBJECT_GENERIC, fname );
if( !p_playlist->p_fetcher )
{
msg_Err( p_playlist, "unable to create secondary preparser" );
vlc_object_lock( p_playlist );
while( vlc_object_alive( p_playlist ) )
{
- PL_UNLOCK;
playlist_MainLoop( p_playlist );
- PL_LOCK;
/* The playlist lock has been unlocked, so we can't tell if
* someone has killed us in the meantime. Check now. */
if( p_playlist->b_cant_sleep )
{
/* 100 ms is an acceptable delay for playlist operations */
- PL_UNLOCK;
+ vlc_object_unlock( p_playlist );
+
msleep( INTF_IDLE_SLEEP*2 );
- PL_LOCK;
+
+ vlc_object_lock( p_playlist );
}
else
{
{
playlist_preparse_t * p_preparse = (playlist_preparse_t *)p_this;
free( p_preparse->pp_waiting );
+ msg_Dbg( p_this, "Destroyed" );
}
static void FetcherDestructor( vlc_object_t * p_this )
{
playlist_fetcher_t * p_fetcher = (playlist_fetcher_t *)p_this;
free( p_fetcher->pp_waiting );
+ msg_Dbg( p_this, "Destroyed" );
}