Commit 09995291 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

playlist: b_auto_preparse is private.

parent 11c77e08
...@@ -177,8 +177,6 @@ struct playlist_t ...@@ -177,8 +177,6 @@ struct playlist_t
playlist_item_t * p_local_onelevel; /** < "Playlist" in ONELEVEL view */ playlist_item_t * p_local_onelevel; /** < "Playlist" in ONELEVEL view */
playlist_item_t * p_ml_onelevel; /** < "Library" in ONELEVEL view */ playlist_item_t * p_ml_onelevel; /** < "Library" in ONELEVEL view */
bool b_auto_preparse;
/* Runtime */ /* Runtime */
int i_sort; /**< Last sorting applied to the playlist */ int i_sort; /**< Last sorting applied to the playlist */
int i_order; /**< Last ordering applied to the playlist */ int i_order; /**< Last ordering applied to the playlist */
......
...@@ -98,7 +98,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) ...@@ -98,7 +98,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
pl_priv(p_playlist)->b_doing_ml = false; 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" ) ; var_CreateGetBool( p_playlist, "auto-preparse" ) ;
PL_LOCK; /* playlist_NodeCreate will check for it */ PL_LOCK; /* playlist_NodeCreate will check for it */
...@@ -155,10 +155,10 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) ...@@ -155,10 +155,10 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
p_playlist->i_order = ORDER_NORMAL; p_playlist->i_order = ORDER_NORMAL;
b_save = p_playlist->b_auto_preparse; b_save = pl_priv(p_playlist)->b_auto_preparse;
p_playlist->b_auto_preparse = false; pl_priv(p_playlist)->b_auto_preparse = false;
playlist_MLLoad( p_playlist ); 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 ); vlc_object_set_destructor( p_playlist, playlist_Destructor );
......
...@@ -863,7 +863,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode, ...@@ -863,7 +863,7 @@ static void GoAndPreparse( playlist_t *p_playlist, int i_mode,
/* Preparse if PREPARSE or SPREPARSE & not enough meta */ /* Preparse if PREPARSE or SPREPARSE & not enough meta */
char *psz_artist = input_item_GetArtist( p_item_cat->p_input ); char *psz_artist = input_item_GetArtist( p_item_cat->p_input );
char *psz_album = input_item_GetAlbum( 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_PREPARSE ||
( i_mode & PLAYLIST_SPREPARSE && ( i_mode & PLAYLIST_SPREPARSE &&
( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) ) ( EMPTY_STR( psz_artist ) || ( EMPTY_STR( psz_album ) ) )
......
...@@ -103,6 +103,7 @@ typedef struct playlist_private_t ...@@ -103,6 +103,7 @@ typedef struct playlist_private_t
bool b_tree; /**< Display as a tree */ bool b_tree; /**< Display as a tree */
bool b_doing_ml; /**< Doing media library stuff get quicker */ bool b_doing_ml; /**< Doing media library stuff get quicker */
bool b_auto_preparse;
} playlist_private_t; } playlist_private_t;
#define pl_priv( pl ) ((playlist_private_t *)(pl)) #define pl_priv( pl ) ((playlist_private_t *)(pl))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment