X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fplaylist_internal.h;h=a50c0742019d5fda5ae68a14db496a0c23067ce3;hb=8a163fd8273e5feaa366c2a4dacc0eb75d0dbf77;hp=1d0d2ee38a0fedad78f332babbd748cf5a87eeb7;hpb=e3f0531d93abd49f902a324241e31200de05b45d;p=vlc diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h index 1d0d2ee38a..a50c074201 100644 --- a/src/playlist/playlist_internal.h +++ b/src/playlist/playlist_internal.h @@ -34,36 +34,65 @@ * @{ */ -#include "input/input_internal.h" +#include "input/input_interface.h" #include -typedef struct playlist_preparse_t -{ - vlc_thread_t thread; - vlc_mutex_t lock; - vlc_cond_t wait; - input_item_t **pp_waiting; - int i_waiting; - bool up; -} playlist_preparse_t; - -typedef struct playlist_fetcher_t -{ - VLC_COMMON_MEMBERS - vlc_mutex_t lock; - int i_art_policy; - int i_waiting; - input_item_t **pp_waiting; - - DECL_ARRAY(playlist_album_t) albums; -} playlist_fetcher_t; +#include "art.h" +#include "fetcher.h" +#include "preparser.h" typedef struct playlist_private_t { playlist_t public_data; - playlist_preparse_t preparse; /**< Preparser data */ - playlist_fetcher_t *p_fetcher; /**< Meta and art fetcher object */ - sout_instance_t *p_sout; /**< Kept sout instance */ + playlist_preparser_t *p_preparser; /**< Preparser data */ + playlist_fetcher_t *p_fetcher; /**< Meta and art fetcher data */ + + playlist_item_array_t items_to_delete; /**< Array of items and nodes to + delete... At the very end. This sucks. */ + + struct playlist_services_discovery_support_t { + /* the playlist items for category and onelevel */ + playlist_item_t* p_cat; + playlist_item_t* p_one; + services_discovery_t * p_sd; /**< Loaded service discovery modules */ + } ** pp_sds; + int i_sds; /**< Number of service discovery modules */ + input_thread_t * p_input; /**< the input thread associated + * with the current item */ + input_ressource_t * p_input_ressource; /**< input ressources */ + struct { + /* Current status. These fields are readonly, only the playlist + * main loop can touch it*/ + playlist_status_t i_status; /**< Current status of playlist */ + playlist_item_t * p_item; /**< Currently playing/active item */ + playlist_item_t * p_node; /**< Current node to play from */ + } status; + + struct { + /* Request. Use this to give orders to the playlist main loop */ + playlist_status_t i_status; /**< requested playlist status */ + playlist_item_t * p_node; /**< requested node to play from */ + playlist_item_t * p_item; /**< requested item to play in the node */ + + int i_skip; /**< Number of items to skip */ + + bool b_request;/**< Set to true by the requester + The playlist sets it back to false + when processing the request */ + vlc_mutex_t lock; /**< Lock to protect request */ + } request; + + vlc_thread_t thread; /**< engine thread */ + vlc_cond_t signal; /**< wakes up the playlist engine thread */ + + int i_last_playlist_id; /**< Last id to an item */ + bool b_reset_currently_playing; /** Reset current item array */ + + bool b_tree; /**< Display as a tree */ + bool b_doing_ml; /**< Doing media library stuff get quicker */ + bool b_auto_preparse; + mtime_t last_rebuild_date; + } playlist_private_t; #define pl_priv( pl ) ((playlist_private_t *)(pl)) @@ -72,33 +101,23 @@ typedef struct playlist_private_t * Prototypes *****************************************************************************/ -/* Global thread */ -#define playlist_ThreadCreate(a) __playlist_ThreadCreate(VLC_OBJECT(a)) -void __playlist_ThreadCreate ( vlc_object_t * ); +/* Creation/Deletion */ +playlist_t *playlist_Create( vlc_object_t * ); + +/* */ +void playlist_Activate( playlist_t * ); +void playlist_Deactivate( playlist_t * ); +/* */ playlist_item_t *playlist_ItemNewFromInput( playlist_t *p_playlist, input_item_t *p_input ); -/* Creation/Deletion */ -playlist_t *playlist_Create ( vlc_object_t * ); - /* Engine */ -void playlist_MainLoop( playlist_t * ); -void playlist_LastLoop( playlist_t * ); -void *playlist_PreparseLoop( void * ); -void playlist_FetcherLoop( playlist_fetcher_t * ); - -void ResetCurrentlyPlaying( playlist_t *, bool, playlist_item_t * ); - playlist_item_t * get_current_status_item( playlist_t * p_playlist); playlist_item_t * get_current_status_node( playlist_t * p_playlist ); void set_current_status_item( playlist_t *, playlist_item_t * ); void set_current_status_node( playlist_t *, playlist_item_t * ); -/* Control */ -playlist_item_t * playlist_NextItem ( playlist_t * ); -int playlist_PlayItem ( playlist_t *, playlist_item_t * ); - /* Load/Save */ int playlist_MLLoad( playlist_t *p_playlist ); int playlist_MLDump( playlist_t *p_playlist ); @@ -122,9 +141,10 @@ int playlist_DeleteFromInputInParent( playlist_t *, int, playlist_item_t *, bool int playlist_DeleteFromItemId( playlist_t*, int ); int playlist_ItemRelease( playlist_item_t * ); -void playlist_release_current_input( playlist_t * p_playlist ); -void playlist_set_current_input( - playlist_t * p_playlist, input_thread_t * p_input ); + +void playlist_NodesPairCreate( playlist_t *, const char *, playlist_item_t **, playlist_item_t **, bool ); +int playlist_NodeEmpty( playlist_t *, playlist_item_t *, bool ); + /** * @} @@ -147,8 +167,6 @@ void playlist_set_current_input( #define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null" -#define PL_ASSERT_LOCKED vlc_assert_locked( &(vlc_internals(p_playlist)->lock) ) - #define PL_LOCK_IF( cond ) pl_lock_if( p_playlist, cond ) static inline void pl_lock_if( playlist_t * p_playlist, bool cond ) {