* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_vout.h>
#include <vlc_sout.h>
return NULL;
}
- p_playlist->p_internal = malloc(sizeof(struct playlist_internal_t));
- memset( p_playlist->p_internal, 0, sizeof(struct playlist_internal_t) );
+ TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
p_parent->p_libvlc->p_playlist = p_playlist;
p_playlist->b_doing_ml = VLC_FALSE;
p_playlist->b_auto_preparse =
- var_CreateGetBool( p_playlist, "auto-preparse") ;
+ var_CreateGetBool( p_playlist, "auto-preparse" ) ;
p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
- 0 );
+ 0, NULL );
p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL,
- 0 );
+ 0, p_playlist->p_root_category->p_input );
if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
return NULL;
/* Create playlist and media library */
- p_playlist->p_local_category = playlist_NodeCreate( p_playlist,
- _( "Playlist" ),p_playlist->p_root_category, 0 );
- p_playlist->p_local_onelevel = playlist_NodeCreate( p_playlist,
- _( "Playlist" ), p_playlist->p_root_onelevel, 0 );
+ playlist_NodesPairCreate( p_playlist, _( "Playlist" ),
+ &p_playlist->p_local_category,
+ &p_playlist->p_local_onelevel, VLC_FALSE );
+
p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
!p_playlist->p_local_onelevel->p_input )
return NULL;
- /* Link the nodes together. Todo: actually create them from the same input*/
- p_playlist->p_local_onelevel->p_input->i_id =
- p_playlist->p_local_category->p_input->i_id;
-
if( config_GetInt( p_playlist, "media-library") )
{
- p_playlist->p_ml_category = playlist_NodeCreate( p_playlist,
- _( "Media Library" ), p_playlist->p_root_category, 0 );
- p_playlist->p_ml_onelevel = playlist_NodeCreate( p_playlist,
- _( "Media Library" ), p_playlist->p_root_onelevel, 0 );
+ playlist_NodesPairCreate( p_playlist, _( "Media Library" ),
+ &p_playlist->p_ml_category,
+ &p_playlist->p_ml_onelevel, VLC_FALSE );
if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel)
return NULL;
p_playlist->p_ml_category->i_flags |= PLAYLIST_RO_FLAG;
p_playlist->p_ml_onelevel->i_flags |= PLAYLIST_RO_FLAG;
- p_playlist->p_ml_onelevel->p_input->i_id =
- p_playlist->p_ml_category->p_input->i_id;
-
}
else
{
return p_playlist;
}
+/**
+ * Destroy playlist
+ *
+ * Destroy a playlist structure.
+ * \param p_playlist the playlist object
+ * \return nothing
+ */
void playlist_Destroy( playlist_t *p_playlist )
{
var_Destroy( p_playlist, "intf-change" );
var_Destroy( p_playlist, "item-change" );
var_Destroy( p_playlist, "playlist-current" );
- var_Destroy( p_playlist, "intf-popmenu" );
+ var_Destroy( p_playlist, "intf-popupmenu" );
var_Destroy( p_playlist, "intf-show" );
var_Destroy( p_playlist, "play-and-stop" );
var_Destroy( p_playlist, "play-and-exit" );
vlc_mutex_destroy( &p_playlist->gc_lock );
vlc_object_detach( p_playlist );
- free( p_playlist->p_internal );
vlc_object_destroy( p_playlist );
}
vlc_mutex_unlock( &p_playlist->gc_lock );
}
-/** Main loop for the playlist */
+/**
+ * Main loop
+ *
+ * Main loop for the playlist
+ * \param p_playlist the playlist object
+ * \return nothing
+ */
void playlist_MainLoop( playlist_t *p_playlist )
{
playlist_item_t *p_item = NULL;
if( p_playlist->b_reset_currently_playing &&
mdate() - p_playlist->last_rebuild_date > 30000 ) // 30 ms
{
- ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random"),
+ ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ),
p_playlist->status.p_item );
p_playlist->last_rebuild_date = mdate();
}
/* Release the playlist lock, because we may get stuck
* in input_DestroyThread() for some time. */
- PL_UNLOCK
+ PL_UNLOCK;
/* Destroy input */
input_DestroyThread( p_input );
p_playlist->status.p_item = NULL;
}
- i_activity= var_GetInteger( p_playlist, "activity") ;
+ i_activity= var_GetInteger( p_playlist, "activity" );
var_SetInteger( p_playlist, "activity", i_activity -
DEFAULT_INPUT_ACTIVITY );
goto check_input;
{
PL_DEBUG( "dying input" );
PL_UNLOCK;
- msleep( 25000 ); // 25 ms
+ msleep( INTF_IDLE_SLEEP );
PL_LOCK;
goto check_input;
}
* - No request, stopped status -> collect garbage
* - Request, running requested -> start new item
* - Request, stopped requested -> collect garbage
- */
- if( (!p_playlist->request.b_request &&
- p_playlist->status.i_status != PLAYLIST_STOPPED) ||
- ( p_playlist->request.b_request &&
- p_playlist->request.i_status != PLAYLIST_STOPPED ) )
- {
- msg_Dbg( p_playlist, "starting new item" );
- p_item = playlist_NextItem( p_playlist );
+ */
+ if( p_playlist->request.i_status != PLAYLIST_STOPPED )
+ {
+ msg_Dbg( p_playlist, "starting new item" );
+ p_item = playlist_NextItem( p_playlist );
- if( p_item == NULL )
- {
+ if( p_item == NULL )
+ {
msg_Dbg( p_playlist, "nothing to play" );
+ p_playlist->status.i_status = PLAYLIST_STOPPED;
+ PL_UNLOCK;
+
if( b_playexit == VLC_TRUE )
{
msg_Info( p_playlist, "end of playlist, exiting" );
vlc_object_kill( p_playlist->p_libvlc );
}
- p_playlist->status.i_status = PLAYLIST_STOPPED;
- PL_UNLOCK
-
ObjectGarbageCollector( p_playlist, VLC_TRUE );
return;
}
PL_LOCK;
}
}
- PL_UNLOCK
+ PL_UNLOCK;
}
-/** Playlist dying last loop */
+
+/**
+ * Last loop
+ *
+ * The playlist is dying so do the last loop
+ * \param p_playlist the playlist object
+ * \return nothing
+*/
void playlist_LastLoop( playlist_t *p_playlist )
{
vlc_object_t *p_obj;
/* If there is an input, kill it */
while( 1 )
{
- PL_LOCK
-
+ PL_LOCK;
if( p_playlist->p_input == NULL )
{
- PL_UNLOCK
+ PL_UNLOCK;
break;
}
/* Unlink current input */
p_input = p_playlist->p_input;
p_playlist->p_input = NULL;
- PL_UNLOCK
+ PL_UNLOCK;
/* Destroy input */
input_DestroyThread( p_input );
else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
{
input_StopThread( p_playlist->p_input );
- PL_UNLOCK
+ PL_UNLOCK;
continue;
}
else
{
p_playlist->p_input->b_eof = 1;
}
-
- PL_UNLOCK
+ PL_UNLOCK;
msleep( INTF_IDLE_SLEEP );
}
vout_Destroy( (vout_thread_t *)p_obj );
}
- while( p_playlist->p_internal->i_asds )
+ while( p_playlist->i_sds )
{
playlist_ServicesDiscoveryRemove( p_playlist,
- p_playlist->p_internal->pp_asds[0]->p_sd->psz_module );
+ p_playlist->pp_sds[0]->p_sd->psz_module );
}
playlist_MLDump( p_playlist );
PL_UNLOCK;
}
-/** Main loop for preparser queue */
+/**
+ * Preparse loop
+ *
+ * Main loop for preparser queue
+ * \param p_obj items to preparse
+ * \return nothing
+ */
void playlist_PreparseLoop( playlist_preparse_t *p_obj )
{
playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
PL_LOCK;
if( p_current )
{
- vlc_bool_t b_preparsed = VLC_FALSE;
- if( strncmp( p_current->psz_uri, "http:", 5 ) &&
- strncmp( p_current->psz_uri, "rtsp:", 5 ) &&
- strncmp( p_current->psz_uri, "udp:", 4 ) &&
- strncmp( p_current->psz_uri, "mms:", 4 ) &&
- strncmp( p_current->psz_uri, "cdda:", 4 ) &&
- strncmp( p_current->psz_uri, "dvd:", 4 ) &&
- strncmp( p_current->psz_uri, "v4l:", 4 ) &&
- strncmp( p_current->psz_uri, "dshow:", 6 ) )
+ if( p_current->i_type == ITEM_TYPE_FILE )
{
- b_preparsed = VLC_TRUE;
stats_TimerStart( p_playlist, "Preparse run",
STATS_TIMER_PREPARSE );
/* Do not preparse if it is already done (like by playing it) */
PL_LOCK;
}
stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE );
- }
- PL_UNLOCK;
- if( b_preparsed )
- {
+ PL_UNLOCK;
input_item_SetPreparsed( p_current, VLC_TRUE );
var_SetInteger( p_playlist, "item-change", p_current->i_id );
+ PL_LOCK;
}
- PL_LOCK;
-
/* If we haven't retrieved enough meta, add to secondary queue
* which will run the "meta fetchers".
* This only checks for meta, not for art
if( !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o ) )
{
preparse_item_t p;
- PL_DEBUG("need to fetch meta for %s", p_current->psz_name );
+ PL_DEBUG( "need to fetch meta for %s", p_current->psz_name );
p.p_item = p_current;
p.b_fetch_art = VLC_FALSE;
vlc_mutex_lock( &p_playlist->p_fetcher->object_lock );
INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
p_playlist->p_fetcher->i_waiting,
p_playlist->p_fetcher->i_waiting, p);
- vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
+ vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
}
/* We already have all needed meta, but we need art right now */
else if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
- EMPTY_STR( psz_arturl ) )
+ ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
{
preparse_item_t p;
PL_DEBUG("meta ok for %s, need to fetch art", psz_name );
INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
p_playlist->p_fetcher->i_waiting,
p_playlist->p_fetcher->i_waiting, p);
- vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
+ vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
}
else
{
}
}
-/** Main loop for secondary preparser queue */
+/**
+ * Fetcher loop
+ *
+ * Main loop for secondary preparser queue
+ * \param p_obj items to preparse
+ * \return nothing
+ */
void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
{
playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
{
if( !b_fetch_art )
{
- input_MetaFetch( p_playlist, p_item );
- var_SetInteger( p_playlist, "item-change", p_item->i_id );
+ /* If the user doesn't want us to fetch meta automatically
+ * abort here. */
+ if( p_playlist->p_fetcher->b_fetch_meta )
+ {
+ input_MetaFetch( p_playlist, p_item );
+ var_SetInteger( p_playlist, "item-change", p_item->i_id );
+ }
+
/* Fetch right now */
if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL )
{
INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
p_playlist->p_fetcher->i_waiting,
0, p );
- PL_DEBUG("meta fetched for %s, get art", p_item->psz_name);
+ PL_DEBUG( "meta fetched for %s, get art", p_item->psz_name );
vlc_mutex_unlock( &p_obj->object_lock );
continue;
}
i_ret = input_ArtFind( p_playlist, p_item );
if( i_ret == 1 )
{
- PL_DEBUG("downloading art for %s", p_item->psz_name );
+ PL_DEBUG( "downloading art for %s", p_item->psz_name );
if( input_DownloadAndCacheArt( p_playlist, p_item ) )
input_item_SetArtNotFound( p_item, VLC_TRUE );
else {
}
else if( i_ret == 0 ) /* Was in cache */
{
- PL_DEBUG("found art for %s in cache", p_item->psz_name );
+ PL_DEBUG( "found art for %s in cache", p_item->psz_name );
input_item_SetArtFetched( p_item, VLC_TRUE );
var_SetInteger( p_playlist, "item-change", p_item->i_id );
}
else
{
- PL_DEBUG("art not found for %s", p_item->psz_name );
+ PL_DEBUG( "art not found for %s", p_item->psz_name );
input_item_SetArtNotFound( p_item, VLC_TRUE );
}
vlc_gc_decref( p_item );
projects / vlc / blobdiff