From: Pierre d'Herbemont Date: Sun, 28 Sep 2008 14:42:05 +0000 (+0200) Subject: playlist: b_auto_preparse is private. X-Git-Tag: 1.0.0-pre1~2829 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=09995291a6fed158bae8160a877e9d663a072c32;p=vlc playlist: b_auto_preparse is private. --- diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index 65c7b20f1d..29b79c18f8 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -177,8 +177,6 @@ struct playlist_t playlist_item_t * p_local_onelevel; /** < "Playlist" in ONELEVEL view */ playlist_item_t * p_ml_onelevel; /** < "Library" in ONELEVEL view */ - bool b_auto_preparse; - /* Runtime */ int i_sort; /**< Last sorting applied to the playlist */ int i_order; /**< Last ordering applied to the playlist */ diff --git a/src/playlist/engine.c b/src/playlist/engine.c index ee7e2ee258..ed041c7cb2 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -98,7 +98,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) pl_priv(p_playlist)->b_doing_ml = false; - p_playlist->b_auto_preparse = + pl_priv(p_playlist)->b_auto_preparse = var_CreateGetBool( p_playlist, "auto-preparse" ) ; PL_LOCK; /* playlist_NodeCreate will check for it */ @@ -155,10 +155,10 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) p_playlist->i_order = ORDER_NORMAL; - b_save = p_playlist->b_auto_preparse; - p_playlist->b_auto_preparse = false; + b_save = pl_priv(p_playlist)->b_auto_preparse; + pl_priv(p_playlist)->b_auto_preparse = false; playlist_MLLoad( p_playlist ); - p_playlist->b_auto_preparse = true; + pl_priv(p_playlist)->b_auto_preparse = true; vlc_object_set_destructor( p_playlist, playlist_Destructor ); diff --git a/src/playlist/item.c b/src/playlist/item.c index 6c276bd533..492ec3a95a 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -863,7 +863,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, /* Preparse if PREPARSE or SPREPARSE & not enough meta */ char *psz_artist = input_item_GetArtist( p_item_cat->p_input ); char *psz_album = input_item_GetAlbum( p_item_cat->p_input ); - if( p_playlist->b_auto_preparse && + if( pl_priv(p_playlist)->b_auto_preparse && (i_mode & PLAYLIST_PREPARSE || ( i_mode & PLAYLIST_SPREPARSE && ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) ) diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h index d0af7a7314..8a17401f19 100644 --- a/src/playlist/playlist_internal.h +++ b/src/playlist/playlist_internal.h @@ -103,6 +103,7 @@ typedef struct playlist_private_t bool b_tree; /**< Display as a tree */ bool b_doing_ml; /**< Doing media library stuff get quicker */ + bool b_auto_preparse; } playlist_private_t; #define pl_priv( pl ) ((playlist_private_t *)(pl))