* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.49 2003/09/08 12:02:16 zorglub Exp $
+ * $Id: playlist.c,v 1.57 2003/10/06 16:23:30 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include "vlc_playlist.h"
#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
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;
msg_Err( p_playlist, "out of memory" );
}
- p_item->psz_name = strdup( psz_name );
- p_item->psz_uri = strdup( psz_uri );
+ p_item->psz_name = strdup( psz_name );
+ p_item->psz_uri = strdup( psz_uri );
+ p_item->psz_author = strdup( "" );
p_item->i_duration = i_duration;
p_item->i_type = 0;
p_item->i_status = 0;
p_item->b_autodeletion = VLC_FALSE;
+ p_item->b_enabled = VLC_TRUE;
+ p_item->i_group = PLAYLIST_TYPE_MANUAL;
p_item->ppsz_options = NULL;
p_item->i_options = i_options;
p_playlist->i_size,
i_pos,
p_item );
+ p_playlist->i_enabled ++;
if( p_playlist->i_index >= i_pos )
{
REMOVE_ELEM( p_playlist->pp_items,
p_playlist->i_size,
i_pos );
+ if( p_playlist->i_enabled > 0 )
+ p_playlist->i_enabled--;
}
vlc_mutex_unlock( &p_playlist->object_lock );
return 0;
}
+/**
+ * Disables a playlist item
+ *
+ * \param p_playlist the playlist to disable from.
+ * \param i_pos the position of the item to disable
+ * \return returns 0
+ */
+int playlist_Disable( playlist_t * p_playlist, int i_pos )
+{
+ vlc_value_t val;
+ vlc_mutex_lock( &p_playlist->object_lock );
+
+
+ if( i_pos >= 0 && i_pos < p_playlist->i_size )
+ {
+ msg_Dbg( p_playlist, "disabling playlist item « %s »",
+ p_playlist->pp_items[i_pos]->psz_name );
+
+ if( p_playlist->pp_items[i_pos]->b_enabled == VLC_TRUE )
+ p_playlist->i_enabled--;
+ p_playlist->pp_items[i_pos]->b_enabled = VLC_FALSE;
+ }
+
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
+ return 0;
+}
+
+/**
+ * Enables a playlist item
+ *
+ * \param p_playlist the playlist to enable from.
+ * \param i_pos the position of the item to enable
+ * \return returns 0
+ */
+int playlist_Enable( playlist_t * p_playlist, int i_pos )
+{
+ vlc_value_t val;
+ vlc_mutex_lock( &p_playlist->object_lock );
+
+ if( i_pos >= 0 && i_pos < p_playlist->i_size )
+ {
+ msg_Dbg( p_playlist, "enabling playlist item « %s »",
+ p_playlist->pp_items[i_pos]->psz_name );
+
+ if( p_playlist->pp_items[i_pos]->b_enabled == VLC_FALSE )
+ p_playlist->i_enabled++;
+
+ p_playlist->pp_items[i_pos]->b_enabled = VLC_TRUE;
+ }
+
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
+ return 0;
+}
+
+/**
+ * Disables a playlist group
+ *
+ * \param p_playlist the playlist to disable from.
+ * \param i_pos the id of the group to disable
+ * \return returns 0
+ */
+int playlist_DisableGroup( playlist_t * p_playlist, int i_group)
+{
+ vlc_value_t val;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ int i;
+
+ msg_Dbg(p_playlist,"Disabling group %i",i_group);
+ for( i = 0 ; i< p_playlist->i_size; i++ )
+ {
+ if( p_playlist->pp_items[i]->i_group == i_group )
+ {
+ msg_Dbg( p_playlist, "disabling playlist item « %s »",
+ p_playlist->pp_items[i]->psz_name );
+
+ if( p_playlist->pp_items[i]->b_enabled == VLC_TRUE )
+ p_playlist->i_enabled--;
+
+ p_playlist->pp_items[i]->b_enabled = VLC_FALSE;
+ }
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
+ return 0;
+}
+
+/**
+ * Enables a playlist group
+ *
+ * \param p_playlist the playlist to enable from.
+ * \param i_pos the id of the group to enable
+ * \return returns 0
+ */
+int playlist_EnableGroup( playlist_t * p_playlist, int i_group)
+{
+ vlc_value_t val;
+ vlc_mutex_lock( &p_playlist->object_lock );
+ int i;
+
+ for( i = 0 ; i< p_playlist->i_size; i++ )
+ {
+ if( p_playlist->pp_items[i]->i_group == i_group )
+ {
+ msg_Dbg( p_playlist, "enabling playlist item « %s »",
+ p_playlist->pp_items[i]->psz_name );
+
+ if( p_playlist->pp_items[i]->b_enabled == VLC_FALSE )
+ p_playlist->i_enabled++;
+
+ p_playlist->pp_items[i]->b_enabled = VLC_TRUE;
+ }
+ }
+ vlc_mutex_unlock( &p_playlist->object_lock );
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
+
+ return 0;
+}
/**
* Sort the playlist
*/
int playlist_Sort( playlist_t * p_playlist , int i_type )
{
- int i , i_small , i_position;
+ int i , i_small , i_position;
playlist_item_t *p_temp;
vlc_mutex_lock( &p_playlist->object_lock );
-
+
for( i_position = 0; i_position < p_playlist->i_size -1 ; i_position ++ )
{
i_small = i_position;
for( i = i_position + 1 ; i< p_playlist->i_size ; i++)
{
-
- if( (strcasecmp( p_playlist->pp_items[i]->psz_name,
- p_playlist->pp_items[i_small]->psz_name) < 0
- && i_type == SORT_NORMAL ) ||
- (strcasecmp( p_playlist->pp_items[i]->psz_name,
- p_playlist->pp_items[i_small]->psz_name) > 0
- && i_type == SORT_REVERSE ) )
- i_small = i;
-
- p_temp = p_playlist->pp_items[i_position];
- p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
- p_playlist->pp_items[i_small] = p_temp;
-
- }
- }
-
- for( i=0;i< p_playlist->i_size;i++)
- msg_Dbg(p_playlist,"%s",p_playlist->pp_items[i]->psz_name);
+ int i_test;
+
+ i_test = strcasecmp( p_playlist->pp_items[i]->psz_name,
+ p_playlist->pp_items[i_small]->psz_name );
+ if( ( i_type == SORT_NORMAL && i_test < 0 ) ||
+ ( i_type == SORT_REVERSE && i_test > 0 ) )
+ {
+ i_small = i;
+ }
+ }
+ /* Keep the correct current index */
+ if( i_small == p_playlist->i_index )
+ p_playlist->i_index = i_position;
+ else if( i_position == p_playlist->i_index )
+ p_playlist->i_index = i_small;
+
+ p_temp = p_playlist->pp_items[i_position];
+ p_playlist->pp_items[i_position] = p_playlist->pp_items[i_small];
+ p_playlist->pp_items[i_small] = p_temp;
+ }
vlc_mutex_unlock( &p_playlist->object_lock );
-
- return 0;
+ return 0;
}
-
-
/**
* Move an item in a playlist
*
/* take into account that our own row disappears. */
if ( i_pos < i_newpos ) i_newpos--;
- if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size
+ if( i_pos >= 0 && i_newpos >=0 && i_pos <= p_playlist->i_size
&& i_newpos <= p_playlist->i_size )
{
playlist_item_t * temp;
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 );
switch( i_command )
case PLAYLIST_PLAY:
p_playlist->i_status = PLAYLIST_RUNNING;
- if( !p_playlist->p_input )
+ if( !p_playlist->p_input && p_playlist->i_enabled != 0 )
{
PlayItem( p_playlist );
}
if( p_playlist->p_input )
{
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_PLAY );
+ val.i_int = PLAYING_S;
+ var_Set( p_playlist->p_input, "state", val );
}
break;
p_playlist->i_status = PLAYLIST_PAUSED;
if( p_playlist->p_input )
{
- input_SetStatus( p_playlist->p_input, INPUT_STATUS_PAUSE );
+ 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 )
/* 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 );
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 );
+ &b_vout_destroyed,
+ &i_vout_destroyed_date );
ObjectGarbageCollector( p_playlist, VLC_OBJECT_SOUT,
- &b_sout_destroyed, &i_sout_destroyed_date );
+ &b_sout_destroyed,
+ &i_sout_destroyed_date );
+ vlc_mutex_lock( &p_playlist->object_lock );
}
}
else if( p_playlist->i_status != PLAYLIST_STOPPED )
}
else if( p_playlist->i_status == PLAYLIST_STOPPED )
{
- ObjectGarbageCollector( p_playlist, VLC_OBJECT_VOUT,
- &b_vout_destroyed, &i_vout_destroyed_date );
-
+ 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 );
/* 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 vout */
+ /* close all remaining sout */
while( ( p_obj = vlc_object_find( p_playlist,
- VLC_OBJECT_VOUT, FIND_CHILD ) ) )
+ VLC_OBJECT_SOUT, FIND_CHILD ) ) )
{
- vlc_object_detach( p_obj );
vlc_object_release( p_obj );
- vout_Destroy( (vout_thread_t *)p_obj );
+ sout_DeleteInstance( (sout_instance_t*)p_obj );
}
- /* close all remaining sout */
+
+ /* close all remaining vout */
while( ( p_obj = vlc_object_find( p_playlist,
- VLC_OBJECT_SOUT, FIND_CHILD ) ) )
+ VLC_OBJECT_VOUT, FIND_CHILD ) ) )
{
+ vlc_object_detach( p_obj );
vlc_object_release( p_obj );
- sout_DeleteInstance( (sout_instance_t*)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;
+ msg_Dbg(p_playlist,"%i",p_playlist->i_enabled);
/* 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 );
+ }
val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-change", val );
}
{
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] );
FILE *file;
char line[1024];
int i_current_status;
+ int i_format;
int i;
msg_Dbg( p_playlist, "opening playlist file %s", psz_filename );
if( line[strlen(line)-1] == '\r' ) line[strlen(line)-1] = (char)0;
}
/* check the file format is valid */
- if ( strcmp ( line , PLAYLIST_FILE_HEADER_0_5 ) )
+ if ( !strcmp ( line , PLAYLIST_FILE_HEADER_0_5 ) )
+ {
+ i_format = 5;
+ }
+ else if( !strcmp ( line , PLAYLIST_FILE_HEADER_0_6 ) )
+ {
+ i_format = 6;
+ }
+ else
{
msg_Err( p_playlist, "playlist file %s format is unsupported"
, psz_filename );
line[strlen(line)-1] = (char)0;
if( line[strlen(line)-1] == '\r' ) line[strlen(line)-1] = (char)0;
}
-
- playlist_Add ( p_playlist , (char *)&line ,
+ if( i_format == 5 )
+ {
+ playlist_Add ( p_playlist , (char *)&line ,
0, 0, PLAYLIST_APPEND , PLAYLIST_END );
+ }
+ else
+ {
+ msg_Warn( p_playlist, "Not supported yet");
+ }
}
/* start playing */
, psz_filename );
return -1;
}
+ /* Save is done in 0_5 mode at the moment*/
fprintf( file , PLAYLIST_FILE_HEADER_0_5 "\n" );
fprintf( file , p_playlist->pp_items[i]->psz_uri );
fprintf( file , "\n" );
}
+#if 0
+ fprintf( file, PLAYLIST_FILE_HEADER_0_6 "\n" );
+ for ( i=0 ; i< p_playlist->i_size ; i++ )
+ {
+ fprintf( file, p_playlist->pp_items[i]->psz_uri );
+ fprintf( file, "||" );
+ fprintf( file, p_playlist->pp_items[i]->psz_name );
+ fprintf( file, "||" );
+ fprintf( file, "%i",p_playlist->pp_items[i]->b_enabled = VLC_TRUE ?
+ 1:0 );
+ fprintf( file, "||" );
+ fprintf( file, "%i", p_playlist->pp_items[i]->i_group );
+ fprintf( file, "||" );
+ fprintf( file, p_playlist->pp_items[i]->psz_author );
+ fprintf( file , "\n" );
+ }
+#endif
fclose( file );
vlc_mutex_unlock( &p_playlist->object_lock );