/*****************************************************************************
* playlist_internal.h : Playlist internals
*****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
+ * Copyright (C) 1999-2008 VLC authors and VideoLAN
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef __LIBVLC_PLAYLIST_INTERNAL_H
#include <assert.h>
#include "art.h"
-#include "fetcher.h"
#include "preparser.h"
+typedef struct vlc_sd_internal_t vlc_sd_internal_t;
+
+void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );
+
typedef struct playlist_private_t
{
playlist_t public_data;
playlist_preparser_t *p_preparser; /**< Preparser data */
- playlist_fetcher_t *p_fetcher; /**< Meta and art fetcher data */
+ struct intf_thread_t *interface; /**< Linked-list of interfaces */
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;
+ vlc_sd_internal_t **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 */
+ input_resource_t * p_input_resource; /**< input resources */
struct {
/* Current status. These fields are readonly, only the playlist
* main loop can touch it*/
vlc_mutex_t lock; /**< Lock to protect request */
} request;
+ vlc_thread_t thread; /**< engine thread */
+ vlc_mutex_t lock; /**< dah big playlist global lock */
vlc_cond_t signal; /**< wakes up the playlist engine thread */
+ bool killed; /**< playlist is shutting down */
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))
/* Creation/Deletion */
playlist_t *playlist_Create( vlc_object_t * );
-
-/* */
+void playlist_Destroy( playlist_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 );
+ input_item_t *p_input );
/* Engine */
playlist_item_t * get_current_status_item( playlist_t * p_playlist);
playlist_item_t * playlist_NodeAddInput( playlist_t *, input_item_t *,
playlist_item_t *,int , int, bool );
+int playlist_InsertInputItemTree ( playlist_t *,
+ playlist_item_t *, input_item_node_t *, int, bool );
+
/* Tree walking */
playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist,
- int i_input_id, playlist_item_t *p_root,
- bool );
+ input_item_t *p_input, playlist_item_t *p_root,
+ bool );
-int playlist_DeleteFromInputInParent( playlist_t *, int, playlist_item_t *, bool );
+int playlist_DeleteFromInputInParent( playlist_t *, input_item_t *,
+ playlist_item_t *, bool );
int playlist_DeleteFromItemId( playlist_t*, int );
int playlist_ItemRelease( playlist_item_t * );
+int playlist_NodeEmpty( playlist_t *, playlist_item_t *, bool );
+int playlist_DeleteItem( playlist_t * p_playlist, playlist_item_t *, bool);
+
+void ResetCurrentlyPlaying( playlist_t *p_playlist, playlist_item_t *p_cur );
+void ResyncCurrentIndex( playlist_t *p_playlist, playlist_item_t *p_cur );
+
/**
* @}
*/
//#undef PLAYLIST_DEBUG2
#ifdef PLAYLIST_DEBUG
- #define PL_DEBUG( msg, args... ) msg_Dbg( p_playlist, msg, ## args )
+ #define PL_DEBUG( ... ) msg_Dbg( p_playlist, __VA_ARGS__ )
#ifdef PLAYLIST_DEBUG2
- #define PL_DEBUG2( msg, args... ) msg_Dbg( p_playlist, msg, ## args )
+ #define PL_DEBUG2( msg, ... ) msg_Dbg( p_playlist, __VA_ARGS__ )
#else
- #define PL_DEBUG2( msg, args... ) {}
+ #define PL_DEBUG2( msg, ... ) {}
#endif
#else
- #define PL_DEBUG( msg, args ... ) {}
- #define PL_DEBUG2( msg, args... ) {}
+ #define PL_DEBUG( msg, ... ) {}
+ #define PL_DEBUG2( msg, ... ) {}
#endif
#define PLI_NAME( p ) p && p->p_input ? p->p_input->psz_name : "null"
projects / vlc / blobdiff