diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index e83f4c3c2e3a9d36a9207ae3aa836d551dc490ed..65c7b20f1def0c5fc71579520defe8939071f8e4 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_doing_ml; /**< Doing media library stuff, - * get quicker */ bool b_auto_preparse; /* Runtime */ diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 0dcbd93f198aa3df4036a8b4a25637740b462dea..ee7e2ee2580761e4d8ecaa7393b93a2cc836f580 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -96,7 +96,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) pl_priv(p_playlist)->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" ); - p_playlist->b_doing_ml = false; + pl_priv(p_playlist)->b_doing_ml = false; p_playlist->b_auto_preparse = var_CreateGetBool( p_playlist, "auto-preparse" ) ; diff --git a/src/playlist/item.c b/src/playlist/item.c index 0e922169ceb627cf3ef665dc06ef3d98097eb39b..6c276bd5336eb5103fa8f607b96900e496b8f26d 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -415,7 +415,7 @@ int playlist_AddInput( playlist_t* p_playlist, input_item_t *p_input, { playlist_item_t *p_item_cat, *p_item_one; if( p_playlist->b_die ) return VLC_EGENERIC; - if( !p_playlist->b_doing_ml ) + if( !pl_priv(p_playlist)->b_doing_ml ) PL_DEBUG( "adding item `%s' ( %s )", p_input->psz_name, p_input->psz_uri ); @@ -889,7 +889,7 @@ static void AddItem( playlist_t *p_playlist, playlist_item_t *p_item, else playlist_NodeInsert( p_playlist, p_item, p_node, i_pos ); - if( !p_playlist->b_doing_ml ) + if( !pl_priv(p_playlist)->b_doing_ml ) playlist_SendAddNotify( p_playlist, p_item->i_id, p_node->i_id, !( i_mode & PLAYLIST_NO_REBUILD ) ); } diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index e542b872d5ddfedc2e432eb5b11c8b5a44530bcb..69aac3393f876984bef89abb6d7a8b82073b30d7 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -160,7 +160,7 @@ int playlist_MLLoad( playlist_t *p_playlist ) vlc_event_attach( &p_input->event_manager, vlc_InputItemSubItemAdded, input_item_subitem_added, p_playlist ); - p_playlist->b_doing_ml = true; + pl_priv(p_playlist)->b_doing_ml = true; PL_UNLOCK; stats_TimerStart( p_playlist, "ML Load", STATS_TIMER_ML_LOAD ); @@ -168,7 +168,7 @@ int playlist_MLLoad( playlist_t *p_playlist ) stats_TimerStop( p_playlist,STATS_TIMER_ML_LOAD ); PL_LOCK; - p_playlist->b_doing_ml = false; + pl_priv(p_playlist)->b_doing_ml = false; PL_UNLOCK; vlc_event_detach( &p_input->event_manager, vlc_InputItemSubItemAdded, diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h index 69ad4cebf292bf9599ef4d09f3304dfc384cbbe2..d0af7a731443748aa9001a611711f248171d071e 100644 --- a/src/playlist/playlist_internal.h +++ b/src/playlist/playlist_internal.h @@ -101,8 +101,8 @@ typedef struct playlist_private_t vlc_mutex_t lock; /**< Lock to protect request */ } request; - bool b_tree; /**< Display as a tree */ - + bool b_tree; /**< Display as a tree */ + bool b_doing_ml; /**< Doing media library stuff get quicker */ } playlist_private_t; #define pl_priv( pl ) ((playlist_private_t *)(pl))