[vlc-commits] preparser: use vlc_object_t instead of playlist_t
Rémi Denis-Courmont
git at videolan.org
Tue Aug 21 18:53:05 CEST 2012
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 21 19:50:11 2012 +0300| [31d471deb16cdbc9abfcffb0ca17b93de21dadc8] | committer: Rémi Denis-Courmont
preparser: use vlc_object_t instead of playlist_t
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31d471deb16cdbc9abfcffb0ca17b93de21dadc8
---
src/playlist/engine.c | 14 +++++---------
src/playlist/preparser.c | 28 ++++++++++++++--------------
src/playlist/preparser.h | 3 ++-
3 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index a27dd09..8ba3383 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -239,16 +239,12 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
/* Fetcher */
p->p_fetcher = playlist_fetcher_New( VLC_OBJECT(p_playlist) );
if( unlikely(p->p_fetcher == NULL) )
- {
msg_Err( p_playlist, "cannot create fetcher" );
- p->p_preparser = NULL;
- }
- else
- { /* Preparse */
- p->p_preparser = playlist_preparser_New( p_playlist, p->p_fetcher );
- if( unlikely(p->p_preparser == NULL) )
- msg_Err( p_playlist, "cannot create preparser" );
- }
+ /* Preparser */
+ p->p_preparser = playlist_preparser_New( VLC_OBJECT(p_playlist),
+ p->p_fetcher );
+ if( unlikely(p->p_preparser == NULL) )
+ msg_Err( p_playlist, "cannot create preparser" );
/* Create the root node */
PL_LOCK;
diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c
index d6ecf03..72e0a12 100644
--- a/src/playlist/preparser.c
+++ b/src/playlist/preparser.c
@@ -39,7 +39,7 @@
*****************************************************************************/
struct playlist_preparser_t
{
- playlist_t *p_playlist;
+ vlc_object_t *object;
playlist_fetcher_t *p_fetcher;
vlc_mutex_t lock;
@@ -56,18 +56,19 @@ static void *Thread( void * );
/*****************************************************************************
* Public functions
*****************************************************************************/
-playlist_preparser_t *playlist_preparser_New( playlist_t *p_playlist, playlist_fetcher_t *p_fetcher )
+playlist_preparser_t *playlist_preparser_New( vlc_object_t *parent,
+ playlist_fetcher_t *p_fetcher )
{
playlist_preparser_t *p_preparser = malloc( sizeof(*p_preparser) );
if( !p_preparser )
return NULL;
- p_preparser->p_playlist = p_playlist;
+ p_preparser->object = parent;
p_preparser->p_fetcher = p_fetcher;
vlc_mutex_init( &p_preparser->lock );
vlc_cond_init( &p_preparser->wait );
p_preparser->b_live = false;
- p_preparser->i_art_policy = var_GetInteger( p_playlist, "album-art" );
+ p_preparser->i_art_policy = var_InheritInteger( parent, "album-art" );
p_preparser->i_waiting = 0;
p_preparser->pp_waiting = NULL;
@@ -85,8 +86,7 @@ void playlist_preparser_Push( playlist_preparser_t *p_preparser, input_item_t *p
{
if( vlc_clone_detach( NULL, Thread, p_preparser,
VLC_THREAD_PRIORITY_LOW ) )
- msg_Warn( p_preparser->p_playlist,
- "cannot spawn pre-parser thread" );
+ msg_Warn( p_preparser->object, "cannot spawn pre-parser thread" );
else
p_preparser->b_live = true;
}
@@ -119,7 +119,7 @@ void playlist_preparser_Delete( playlist_preparser_t *p_preparser )
/**
* This function preparses an item when needed.
*/
-static void Preparse( playlist_t *p_playlist, input_item_t *p_item )
+static void Preparse( vlc_object_t *obj, input_item_t *p_item )
{
vlc_mutex_lock( &p_item->lock );
int i_type = p_item->i_type;
@@ -134,10 +134,10 @@ static void Preparse( playlist_t *p_playlist, input_item_t *p_item )
/* Do not preparse if it is already done (like by playing it) */
if( !input_item_IsPreparsed( p_item ) )
{
- input_Preparse( VLC_OBJECT(p_playlist), p_item );
+ input_Preparse( obj, p_item );
input_item_SetPreparsed( p_item, true );
- var_SetAddress( p_playlist, "item-change", p_item );
+ var_SetAddress( obj, "item-change", p_item );
}
}
@@ -146,7 +146,7 @@ static void Preparse( playlist_t *p_playlist, input_item_t *p_item )
*/
static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
{
- playlist_t *p_playlist = p_preparser->p_playlist;
+ vlc_object_t *obj = p_preparser->object;
playlist_fetcher_t *p_fetcher = p_preparser->p_fetcher;
bool b_fetch = false;
@@ -167,13 +167,13 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
( strncmp( psz_arturl, "file://", 7 ) &&
strncmp( psz_arturl, "attachment://", 13 ) ) ) )
{
- msg_Dbg( p_playlist, "meta ok for %s, need to fetch art",
+ msg_Dbg( obj, "meta ok for %s, need to fetch art",
psz_name ? psz_name : "(null)" );
b_fetch = true;
}
else
{
- msg_Dbg( p_playlist, "no fetch required for %s (art currently %s)",
+ msg_Dbg( obj, "no fetch required for %s (art currently %s)",
psz_name ? psz_name : "(null)",
psz_arturl ? psz_arturl : "(null)" );
}
@@ -190,7 +190,7 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
static void *Thread( void *data )
{
playlist_preparser_t *p_preparser = data;
- playlist_t *p_playlist = p_preparser->p_playlist;
+ vlc_object_t *obj = p_preparser->object;
for( ;; )
{
@@ -214,7 +214,7 @@ static void *Thread( void *data )
if( !p_current )
break;
- Preparse( p_playlist, p_current );
+ Preparse( obj, p_current );
Art( p_preparser, p_current );
vlc_gc_decref(p_current);
diff --git a/src/playlist/preparser.h b/src/playlist/preparser.h
index 4c10e68..0fecead 100644
--- a/src/playlist/preparser.h
+++ b/src/playlist/preparser.h
@@ -37,7 +37,8 @@ typedef struct playlist_preparser_t playlist_preparser_t;
/**
* This function creates the preparser object and thread.
*/
-playlist_preparser_t *playlist_preparser_New( playlist_t *, playlist_fetcher_t * );
+playlist_preparser_t *playlist_preparser_New( vlc_object_t *,
+ playlist_fetcher_t * );
/**
* This function enqueues the provided item to be preparsed.
More information about the vlc-commits
mailing list