]> git.sesse.net Git - vlc/blobdiff - src/playlist/playlist.c
* src/playlist/* && Makefile.am
[vlc] / src / playlist / playlist.c
index f4c877527e2b489e551828f408f7d292502fecff..27ea9cc2bbf44616bcff87b8d5eaf804c9b99ba2 100644 (file)
@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.61 2003/10/20 22:28:26 gbazin Exp $
+ * $Id: playlist.c,v 1.62 2003/10/29 17:32:55 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -85,6 +85,13 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
     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 ) )
     {
@@ -93,6 +100,7 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
         return NULL;
     }
 
+    msg_Dbg(p_playlist,"pouet2");
     /* The object has been initialized, now attach it */
     vlc_object_attach( p_playlist, p_parent );
 
@@ -116,507 +124,6 @@ void playlist_Destroy( playlist_t * p_playlist )
     vlc_object_destroy( p_playlist );
 }
 
-/**
- * Add an MRL to the playlist. This is a simplified version of
- * playlist_AddExt inculded for convenince. It equals calling playlist_AddExt
- * with psz_name == psz_target and i_duration == -1
- */
-
-int playlist_Add( playlist_t *p_playlist, const char *psz_target,
-                  const char **ppsz_options, int i_options,
-                  int i_mode, int i_pos )
-{
-    return playlist_AddExt( p_playlist, psz_target, psz_target, -1,
-                            ppsz_options, i_options, i_mode, i_pos );
-}
-
-/**
- * Add a MRL into the playlist.
- *
- * \param p_playlist the playlist to add into
- * \param psz_uri the mrl to add to the playlist
- * \param psz_name a text giving a name or description of this item
- * \param i_duration a hint about the duration of this item, in miliseconds, or
- *        -1 if unknown.
- * \param ppsz_options array of options
- * \param i_options number of items in ppsz_options
- * \param i_mode the mode used when adding
- * \param i_pos the position in the playlist where to add. If this is
- *        PLAYLIST_END the item will be added at the end of the playlist
- *        regardless of it's size
- * \return always returns 0
-*/
-int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri,
-                     const char * psz_name, mtime_t i_duration,
-                     const char **ppsz_options, int i_options, 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_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;
-
-    if( i_options )
-    {
-        int i;
-
-        p_item->ppsz_options = (char **)malloc( i_options * sizeof(char *) );
-        for( i = 0; i < i_options; i++ )
-            p_item->ppsz_options[i] = strdup( ppsz_options[i] );
-
-    }
-
-    return playlist_AddItem( p_playlist, p_item, i_mode, i_pos );
-}
-
-/**
- * Add a playlist item into a playlist
- *
- * \param p_playlist the playlist to insert into
- * \param p_item the playlist item to insert
- * \param i_mode the mode used when adding
- * \param i_pos the possition in the playlist where to add. If this is
- *        PLAYLIST_END the item will be added at the end of the playlist
- *        regardless of it's size
- * \return always returns 0
-*/
-int playlist_AddItem( playlist_t *p_playlist, playlist_item_t * p_item,
-                int i_mode, int i_pos)
-{
-    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 » ( %s )", p_item->psz_name, p_item->psz_uri);
-
-    /* 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 );
-        p_playlist->i_enabled ++;
-
-        if( p_playlist->i_index >= i_pos )
-        {
-            p_playlist->i_index++;
-        }
-    }
-    else
-    {
-        /* i_mode == PLAYLIST_REPLACE and 0 <= i_pos < p_playlist->i_size */
-        if( p_playlist->pp_items[i_pos]->psz_name )
-        {
-            free( p_playlist->pp_items[i_pos]->psz_name );
-        }
-        if( p_playlist->pp_items[i_pos]->psz_uri )
-        {
-            free( p_playlist->pp_items[i_pos]->psz_uri );
-        }
-        /* 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 )
-    {
-        p_playlist->i_index = i_pos;
-        if( p_playlist->p_input )
-        {
-            input_StopThread( p_playlist->p_input );
-        }
-        p_playlist->i_status = PLAYLIST_RUNNING;
-    }
-
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    val.b_bool = VLC_TRUE;
-    var_Set( p_playlist, "intf-change", val );
-
-    return 0;
-}
-
-/**
- * delete an item from a playlist.
- *
- * \param p_playlist the playlist to remove from.
- * \param i_pos the position of the item to remove
- * \return returns 0
- */
-int playlist_Delete( 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, "deleting playlist item « %s »",
-                             p_playlist->pp_items[i_pos]->psz_name );
-
-        if( p_playlist->pp_items[i_pos]->psz_name )
-        {
-            free( p_playlist->pp_items[i_pos]->psz_name );
-        }
-        if( p_playlist->pp_items[i_pos]->psz_uri )
-        {
-            free( p_playlist->pp_items[i_pos]->psz_uri );
-        }
-        if( p_playlist->pp_items[i_pos]->i_options )
-        {
-            int i;
-
-            for( i = 0; i < p_playlist->pp_items[i_pos]->i_options; i++ )
-                free( p_playlist->pp_items[i_pos]->ppsz_options[i] );
-
-            free( p_playlist->pp_items[i_pos]->ppsz_options );
-        }
-
-        /* XXX: what if the item is still in use? */
-        free( p_playlist->pp_items[i_pos] );
-
-        if( i_pos <= p_playlist->i_index )
-        {
-            p_playlist->i_index--;
-        }
-
-        /* Renumber the playlist */
-        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 );
-
-    val.b_bool = VLC_TRUE;
-    var_Set( p_playlist, "intf-change", val );
-
-    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;
-    int i;
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    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;
-    int i;
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    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;
-    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++)
-        {
-            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;
-}
-
-/**
- * Move an item in a playlist
- *
- * Move the item in the playlist with position i_pos before the current item
- * at position i_newpos.
- * \param p_playlist the playlist to move items in
- * \param i_pos the position of the item to move
- * \param i_newpos the position of the item that will be behind the moved item
- *        after the move
- * \return returns 0
- */
-int playlist_Move( playlist_t * p_playlist, int i_pos, int i_newpos)
-{
-    vlc_value_t     val;
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    /* 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
-                     && i_newpos <= p_playlist->i_size )
-    {
-        playlist_item_t * temp;
-
-        msg_Dbg( p_playlist, "moving playlist item « %s »",
-                             p_playlist->pp_items[i_pos]->psz_name );
-
-        if( i_pos == p_playlist->i_index )
-        {
-            p_playlist->i_index = i_newpos;
-        }
-        else if( i_pos > p_playlist->i_index && i_newpos <= p_playlist->i_index )
-        {
-            p_playlist->i_index++;
-        }
-        else if( i_pos < p_playlist->i_index && i_newpos >= p_playlist->i_index )
-        {
-            p_playlist->i_index--;
-        }
-
-        if ( i_pos < i_newpos )
-        {
-            temp = p_playlist->pp_items[i_pos];
-            while ( i_pos < i_newpos )
-            {
-                p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos+1];
-                i_pos++;
-            }
-            p_playlist->pp_items[i_newpos] = temp;
-        }
-        else if ( i_pos > i_newpos )
-        {
-            temp = p_playlist->pp_items[i_pos];
-            while ( i_pos > i_newpos )
-            {
-                p_playlist->pp_items[i_pos] = p_playlist->pp_items[i_pos-1];
-                i_pos--;
-            }
-            p_playlist->pp_items[i_newpos] = temp;
-        }
-    }
-
-    vlc_mutex_unlock( &p_playlist->object_lock );
-
-    val.b_bool = VLC_TRUE;
-    var_Set( p_playlist, "intf-change", val );
-
-    return 0;
-}
 
 /**
  * Do a playlist action
@@ -767,6 +274,8 @@ static void RunThread ( playlist_t *p_playlist )
     /* 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 );
@@ -1031,157 +540,3 @@ static void PlayItem( playlist_t *p_playlist )
     p_playlist->p_input = input_CreateThread( p_playlist,
                                   p_playlist->pp_items[p_playlist->i_index] );
 }
-
-/*****************************************************************************
- * playlist_LoadFile: load a playlist file.
- ****************************************************************************/
-int playlist_LoadFile( playlist_t * p_playlist, const char *psz_filename )
-{
-    FILE *file;
-    char line[1024];
-    int i_current_status;
-    int i_format;
-    int i;
-
-    msg_Dbg( p_playlist, "opening playlist file %s", psz_filename );
-
-    file = fopen( psz_filename, "rt" );
-    if( !file )
-    {
-        msg_Err( p_playlist, "playlist file %s does not exist", psz_filename );
-        return -1;
-    }
-    fseek( file, 0L, SEEK_SET );
-
-    /* check the file is not empty */
-    if ( ! fgets( line, 1024, file ) )
-    {
-        msg_Err( p_playlist, "playlist file %s is empty", psz_filename );
-        fclose( file );
-        return -1;
-    }
-
-    /* get rid of line feed */
-    if( line[strlen(line)-1] == '\n' || line[strlen(line)-1] == '\r' )
-    {
-       line[strlen(line)-1] = (char)0;
-       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 ) )
-    {
-       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 );
-        fclose( file );
-        return -1;
-    }
-
-    /* stop playing */
-    i_current_status = p_playlist->i_status;
-    if ( p_playlist->i_status != PLAYLIST_STOPPED )
-    {
-        playlist_Stop ( p_playlist );
-    }
-
-    /* delete current content of the playlist */
-    for( i = p_playlist->i_size - 1; i >= 0; i-- )
-    {
-        playlist_Delete ( p_playlist , i );
-    }
-
-    /* simply add each line */
-    while( fgets( line, 1024, file ) )
-    {
-       /* ignore comments or empty lines */
-       if( (line[0] == '#') || (line[0] == '\r') || (line[0] == '\n')
-               || (line[0] == (char)0) )
-           continue;
-
-       /* get rid of line feed */
-       if( line[strlen(line)-1] == '\n' || line[strlen(line)-1] == '\r' )
-       {
-           line[strlen(line)-1] = (char)0;
-           if( line[strlen(line)-1] == '\r' ) line[strlen(line)-1] = (char)0;
-       }
-       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 */
-    if ( i_current_status != PLAYLIST_STOPPED )
-    {
-        playlist_Play ( p_playlist );
-    }
-
-    fclose( file );
-
-    return 0;
-}
-
-/*****************************************************************************
- * playlist_SaveFile: Save a playlist in a file.
- *****************************************************************************/
-int playlist_SaveFile( playlist_t * p_playlist, const char * psz_filename )
-{
-    FILE *file;
-    int i;
-
-    vlc_mutex_lock( &p_playlist->object_lock );
-
-    msg_Dbg( p_playlist, "saving playlist file %s", psz_filename );
-
-    file = fopen( psz_filename, "wt" );
-    if( !file )
-    {
-        msg_Err( p_playlist , "could not create playlist file %s"
-                , psz_filename );
-        return -1;
-    }
-    /* Save is done in 0_5 mode at the moment*/
-
-    fprintf( file , PLAYLIST_FILE_HEADER_0_5 "\n" );
-
-    for ( i = 0 ; i < p_playlist->i_size ; i++ )
-    {
-        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 );
-
-    return 0;
-}