* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.27 2002/12/06 10:10:40 sam Exp $
+ * $Id: playlist.c,v 1.62 2003/10/29 17:32:55 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <string.h> /* strerror() */
#include <vlc/vlc.h>
+#include <vlc/vout.h>
+#include <vlc/sout.h>
#include "stream_control.h"
#include "input_ext-intf.h"
#include "vlc_playlist.h"
-#define PLAYLIST_STOPPED 0
-#define PLAYLIST_RUNNING 1
+#define PLAYLIST_FILE_HEADER_0_5 "# vlc playlist file version 0.5"
+#define PLAYLIST_FILE_HEADER_0_6 "# vlc playlist file version 0.6"
/*****************************************************************************
* Local prototypes
static void Poubellize ( playlist_t *, input_thread_t * );
-/*****************************************************************************
- * playlist_Create: create playlist
- *****************************************************************************
+/**
+ * Create playlist
+ *
* Create a playlist structure.
- *****************************************************************************/
+ * \param p_parent the vlc object that is to be the parent of this playlist
+ * \return a pointer to the created playlist, or NULL on error
+ */
playlist_t * __playlist_Create ( vlc_object_t *p_parent )
{
playlist_t *p_playlist;
+ vlc_value_t val;
/* Allocate structure */
p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST );
return NULL;
}
+ var_Create( p_playlist, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
+ var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL );
+
+ var_Create( p_playlist, "intf-show", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-show", val );
+
+ var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_playlist, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_playlist, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+
p_playlist->p_input = NULL;
p_playlist->i_status = PLAYLIST_STOPPED;
p_playlist->i_index = -1;
p_playlist->i_size = 0;
p_playlist->pp_items = NULL;
+ p_playlist->i_groups = 0;
+ p_playlist->pp_groups = NULL;
+ p_playlist->i_max_id = 0;
+
+ playlist_CreateGroup( p_playlist, strdup("Normal") );
+
+ msg_Dbg(p_playlist,"pouet");
if( vlc_thread_create( p_playlist, "playlist", RunThread,
VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
{
return NULL;
}
+ msg_Dbg(p_playlist,"pouet2");
/* The object has been initialized, now attach it */
vlc_object_attach( p_playlist, p_parent );
return p_playlist;
}
-/*****************************************************************************
- * playlist_Destroy: destroy the playlist
- *****************************************************************************
+/**
+ * Destroy the playlist.
+ *
* Delete all items in the playlist and free the playlist structure.
- *****************************************************************************/
+ * \param p_playlist the playlist structure to destroy
+ */
void playlist_Destroy( playlist_t * p_playlist )
{
p_playlist->b_die = 1;
vlc_thread_join( p_playlist );
- vlc_object_destroy( p_playlist );
-}
+ var_Destroy( p_playlist, "intf-change" );
-/*****************************************************************************
- * playlist_Add: add an item to the playlist
- *****************************************************************************
- * Add an item to the playlist at position i_pos. If i_pos is PLAYLIST_END,
- * add it at the end regardless of the playlist current size.
- *****************************************************************************/
-int playlist_Add( playlist_t *p_playlist, const char * psz_target,
- int i_mode, int i_pos )
-{
- playlist_item_t * p_item;
-
- p_item = malloc( sizeof( playlist_item_t ) );
- if( p_item == NULL )
- {
- msg_Err( p_playlist, "out of memory" );
- }
-
- p_item->psz_name = strdup( psz_target );
- p_item->psz_uri = strdup( psz_target );
- p_item->i_type = 0;
- p_item->i_status = 0;
- p_item->b_autodeletion = VLC_FALSE;
-
- return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
+ vlc_object_destroy( p_playlist );
}
-int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
- int i_mode, int i_pos)
+/**
+ * Do a playlist action
+ *
+ * \param p_playlist the playlist to do the command on
+ * \param i_command the command to do
+ * \param i_arg the argument to the command. See playlist_command_t for details
+ */
+ void playlist_Command( playlist_t * p_playlist, playlist_command_t i_command,
+ int i_arg )
{
+ vlc_value_t val;
vlc_mutex_lock( &p_playlist->object_lock );
- /*
- * CHECK_INSERT : checks if the item is already enqued before
- * enqueing it
- */
- if ( i_mode & PLAYLIST_CHECK_INSERT )
- {
- int j;
-
- if ( p_playlist->pp_items )
- {
- for ( j = 0; j < p_playlist->i_size; j++ )
- {
- if ( !strcmp( p_playlist->pp_items[j]->psz_uri, p_item->psz_uri ) )
- {
- if( p_item->psz_name )
- {
- free( p_item->psz_name );
- }
- if( p_item->psz_uri )
- {
- free( p_item->psz_uri );
- }
- free( p_item );
- vlc_mutex_unlock( &p_playlist->object_lock );
- return 0;
- }
- }
- }
- i_mode &= ~PLAYLIST_CHECK_INSERT;
- i_mode |= PLAYLIST_APPEND;
- }
-
-
- msg_Dbg( p_playlist, "adding playlist item « %s »", p_item->psz_name );
-
- /* Create the new playlist item */
-
-
- /* Do a few boundary checks and allocate space for the item */
- if( i_pos == PLAYLIST_END )
- {
- if( i_mode & PLAYLIST_INSERT )
- {
- i_mode &= ~PLAYLIST_INSERT;
- i_mode |= PLAYLIST_APPEND;
- }
-
- i_pos = p_playlist->i_size - 1;
- }
-
- if( !(i_mode & PLAYLIST_REPLACE)
- || i_pos < 0 || i_pos >= p_playlist->i_size )
- {
- /* Additional boundary checks */
- if( i_mode & PLAYLIST_APPEND )
- {
- i_pos++;
- }
-
- if( i_pos < 0 )
- {
- i_pos = 0;
- }
- else if( i_pos > p_playlist->i_size )
- {
- i_pos = p_playlist->i_size;
- }
-
- INSERT_ELEM( p_playlist->pp_items,
- p_playlist->i_size,
- i_pos,
- p_item );
-
- if( p_playlist->i_index >= i_pos )
- {
- p_playlist->i_index++;
- }
- }
- else
- {
- /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */
- free( p_playlist->pp_items[i_pos]->psz_name );
- /* XXX: what if the item is still in use? */
- free( p_playlist->pp_items[i_pos] );
- p_playlist->pp_items[i_pos] = p_item;
- }
-
- if( i_mode & PLAYLIST_GO )
+ switch( i_command )
{
- p_playlist->i_index = i_pos;
+ case PLAYLIST_STOP:
+ p_playlist->i_status = PLAYLIST_STOPPED;
if( p_playlist->p_input )
{
input_StopThread( p_playlist->p_input );
}
- p_playlist->i_status = PLAYLIST_RUNNING;
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- return 0;
-}
-
-/*****************************************************************************
- * playlist_Delete: delete an item from the playlist
- *****************************************************************************
- * Delete the item in the playlist with position i_pos.
- *****************************************************************************/
-int playlist_Delete( playlist_t * p_playlist, int i_pos )
-{
- vlc_mutex_lock( &p_playlist->object_lock );
-
- if( i_pos >= 0 && i_pos < p_playlist->i_size )
- {
- msg_Dbg( p_playlist, "deleting playlist item « %s »",
- p_playlist->pp_items[i_pos]->psz_name );
-
- free( p_playlist->pp_items[i_pos]->psz_name );
- /* XXX: what if the item is still in use? */
- free( p_playlist->pp_items[i_pos] );
+ break;
- if( i_pos <= p_playlist->i_index )
+ case PLAYLIST_PLAY:
+ p_playlist->i_status = PLAYLIST_RUNNING;
+ if( !p_playlist->p_input && p_playlist->i_enabled != 0 )
{
- p_playlist->i_index--;
+ PlayItem( p_playlist );
}
-
- /* Renumber the playlist */
- REMOVE_ELEM( p_playlist->pp_items,
- p_playlist->i_size,
- i_pos );
- }
-
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- return 0;
-}
-
-/*****************************************************************************
- * playlist_Command: do a playlist action
- *****************************************************************************
- *
- *****************************************************************************/
-void playlist_Command( playlist_t * p_playlist, int i_command, int i_arg )
-{
- vlc_mutex_lock( &p_playlist->object_lock );
-
- switch( i_command )
- {
- case PLAYLIST_STOP:
- p_playlist->i_status = PLAYLIST_STOPPED;
if( p_playlist->p_input )
{
- input_StopThread( p_playlist->p_input );
+ val.i_int = PLAYING_S;
+ var_Set( p_playlist->p_input, "state", val );
}
break;
- case PLAYLIST_PLAY:
- p_playlist->i_status = PLAYLIST_RUNNING;
- if ( p_playlist->p_input )
- {
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_PLAY );
- }
+ case PLAYLIST_PAUSE:
+ p_playlist->i_status = PLAYLIST_PAUSED;
+ if( p_playlist->p_input )
+ {
+ val.i_int = PAUSE_S;
+ var_Set( p_playlist->p_input, "state", val );
+ }
break;
case PLAYLIST_SKIP:
p_playlist->i_status = PLAYLIST_STOPPED;
+ if( p_playlist->i_enabled == 0)
+ {
+ break;
+ }
SkipItem( p_playlist, i_arg );
if( p_playlist->p_input )
{
break;
case PLAYLIST_GOTO:
- if( i_arg >= 0 && i_arg < p_playlist->i_size )
+ if( i_arg >= 0 && i_arg < p_playlist->i_size &&
+ p_playlist->i_enabled != 0 )
{
p_playlist->i_index = i_arg;
if( p_playlist->p_input )
vlc_mutex_unlock( &p_playlist->object_lock );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
return;
}
-
/* Following functions are local */
+static void ObjectGarbageCollector( playlist_t *p_playlist,
+ int i_type,
+ vlc_bool_t *pb_obj_destroyed,
+ mtime_t *pi_obj_destroyed_date )
+{
+ vlc_object_t *p_obj;
+ if( *pb_obj_destroyed || *pi_obj_destroyed_date > mdate() )
+ {
+ return;
+ }
+
+ if( *pi_obj_destroyed_date == 0 )
+ {
+ /* give a little time */
+ *pi_obj_destroyed_date = mdate() + 300000LL;
+ }
+ else
+ {
+ while( ( p_obj = vlc_object_find( p_playlist,
+ i_type,
+ FIND_CHILD ) ) )
+ {
+ if( p_obj->p_parent != (vlc_object_t*)p_playlist )
+ {
+ /* only first chiled (ie unused) */
+ vlc_object_release( p_obj );
+ break;
+ }
+ if( i_type == VLC_OBJECT_VOUT )
+ {
+ msg_Dbg( p_playlist, "vout garbage collector destroying 1 vout" );
+ vlc_object_detach( p_obj );
+ vlc_object_release( p_obj );
+ vout_Destroy( (vout_thread_t *)p_obj );
+ }
+ else if( i_type == VLC_OBJECT_SOUT )
+ {
+ vlc_object_release( p_obj );
+ sout_DeleteInstance( (sout_instance_t*)p_obj );
+ }
+ }
+ *pb_obj_destroyed = VLC_TRUE;
+ }
+}
+
/*****************************************************************************
* RunThread: main playlist thread
*****************************************************************************/
static void RunThread ( playlist_t *p_playlist )
{
+ vlc_object_t *p_obj;
+ vlc_value_t val;
+
+ vlc_bool_t b_vout_destroyed = VLC_FALSE; /*we do vout garbage collector */
+ mtime_t i_vout_destroyed_date = 0;
+
+ vlc_bool_t b_sout_destroyed = VLC_FALSE; /*we do vout garbage collector */
+ mtime_t i_sout_destroyed_date = 0;
+
/* Tell above that we're ready */
vlc_thread_ready( p_playlist );
+ msg_Dbg(p_playlist,"pouet3");
+
while( !p_playlist->b_die )
{
vlc_mutex_lock( &p_playlist->object_lock );
{
input_thread_t *p_input;
- /* Unlink current input */
p_input = p_playlist->p_input;
p_playlist->p_input = NULL;
- vlc_object_detach( p_input );
/* Release the playlist lock, because we may get stuck
* in input_DestroyThread() for some time. */
/* Destroy input */
input_DestroyThread( p_input );
+
+ /* Unlink current input
+ * (_after_ input_DestroyThread for vout garbage collector) */
+ vlc_object_detach( p_input );
+
+ /* Destroy object */
vlc_object_destroy( p_input );
+
+ b_vout_destroyed = VLC_FALSE;
+ i_vout_destroyed_date = 0;
+ b_sout_destroyed = VLC_FALSE;
+ i_sout_destroyed_date = 0;
continue;
}
/* This input is dying, let him do */
/* Select the next playlist item */
SkipItem( p_playlist, 1 );
- /* Release the playlist lock, because we may get stuck
- * in input_StopThread() for some time. */
- vlc_mutex_unlock( &p_playlist->object_lock );
input_StopThread( p_playlist->p_input );
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
continue;
}
+ else if( p_playlist->p_input->stream.control.i_status != INIT_S )
+ {
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ ObjectGarbageCollector( p_playlist, VLC_OBJECT_VOUT,
+ &b_vout_destroyed,
+ &i_vout_destroyed_date );
+ ObjectGarbageCollector( p_playlist, VLC_OBJECT_SOUT,
+ &b_sout_destroyed,
+ &i_sout_destroyed_date );
+ vlc_mutex_lock( &p_playlist->object_lock );
+ }
}
else if( p_playlist->i_status != PLAYLIST_STOPPED )
{
+ SkipItem( p_playlist, 0 );
PlayItem( p_playlist );
}
-
+ else if( p_playlist->i_status == PLAYLIST_STOPPED )
+ {
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ ObjectGarbageCollector( p_playlist, VLC_OBJECT_SOUT,
+ &b_sout_destroyed, &i_sout_destroyed_date );
+ ObjectGarbageCollector( p_playlist, VLC_OBJECT_VOUT,
+ &b_vout_destroyed, &i_vout_destroyed_date );
+ vlc_mutex_lock( &p_playlist->object_lock );
+ }
vlc_mutex_unlock( &p_playlist->object_lock );
msleep( INTF_IDLE_SLEEP );
/* Unlink current input */
p_input = p_playlist->p_input;
p_playlist->p_input = NULL;
- vlc_object_detach( p_input );
vlc_mutex_unlock( &p_playlist->object_lock );
/* Destroy input */
input_DestroyThread( p_input );
+ /* Unlink current input (_after_ input_DestroyThread for vout
+ * garbage collector)*/
+ vlc_object_detach( p_input );
+
+ /* Destroy object */
vlc_object_destroy( p_input );
continue;
}
}
else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
input_StopThread( p_playlist->p_input );
+ vlc_mutex_unlock( &p_playlist->object_lock );
continue;
}
else
msleep( INTF_IDLE_SLEEP );
}
+
+ /* close all remaining sout */
+ while( ( p_obj = vlc_object_find( p_playlist,
+ VLC_OBJECT_SOUT, FIND_CHILD ) ) )
+ {
+ vlc_object_release( p_obj );
+ sout_DeleteInstance( (sout_instance_t*)p_obj );
+ }
+
+ /* close all remaining vout */
+ while( ( p_obj = vlc_object_find( p_playlist,
+ VLC_OBJECT_VOUT, FIND_CHILD ) ) )
+ {
+ vlc_object_detach( p_obj );
+ vlc_object_release( p_obj );
+ vout_Destroy( (vout_thread_t *)p_obj );
+ }
}
/*****************************************************************************
static void SkipItem( playlist_t *p_playlist, int i_arg )
{
int i_oldindex = p_playlist->i_index;
- vlc_bool_t b_random;
+ vlc_bool_t b_random, b_repeat, b_loop;
+ vlc_value_t val;
/* If the playlist is empty, there is no current item */
if( p_playlist->i_size == 0 )
return;
}
- b_random = config_GetInt( p_playlist, "random" );
+ var_Get( p_playlist, "random", &val );
+ b_random = val.b_bool;
+ var_Get( p_playlist, "repeat", &val );
+ b_repeat = val.b_bool;
+ var_Get( p_playlist, "loop", &val );
+ b_loop = val.b_bool;
/* Increment */
if( b_random )
i_arg = (int)((float)p_playlist->i_size * rand() / (RAND_MAX+1.0));
}
}
-
+ if( b_repeat )
+ {
+ i_arg = 0;
+ }
p_playlist->i_index += i_arg;
/* Boundary check */
{
if( p_playlist->i_status == PLAYLIST_STOPPED
|| b_random
- || config_GetInt( p_playlist, "loop" ) )
+ || b_loop )
{
p_playlist->i_index -= p_playlist->i_size
* ( p_playlist->i_index / p_playlist->i_size );
{
p_playlist->i_index = p_playlist->i_size - 1;
}
+
+ /* Check that the item is enabled */
+ if( p_playlist->pp_items[p_playlist->i_index]->b_enabled == VLC_FALSE &&
+ p_playlist->i_enabled != 0)
+ {
+ SkipItem( p_playlist , 1 );
+ }
}
/*****************************************************************************
{
if( p_playlist->i_index == -1 )
{
- if( p_playlist->i_size == 0 )
+ if( p_playlist->i_size == 0 || p_playlist->i_enabled == 0)
{
return;
}
SkipItem( p_playlist, 1 );
}
+ if( p_playlist->i_enabled == 0)
+ {
+ return;
+ }
+
msg_Dbg( p_playlist, "creating new input thread" );
p_playlist->p_input = input_CreateThread( p_playlist,
p_playlist->pp_items[p_playlist->i_index] );
}
-
-/*****************************************************************************
- * Poubellize: put an input thread in the trashcan
- *****************************************************************************
- * XXX: unused
- *****************************************************************************/
-static void Poubellize ( playlist_t *p_playlist, input_thread_t *p_input )
-{
- msg_Dbg( p_playlist, "poubellizing input %i\n", p_input->i_object_id );
-}
-
projects / vlc / blobdiff