* Fixed a bunch of coding errors here and there.

[vlc] / src / playlist / item.c

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 852b1f3b0be04491a55c036a193328451ed9d47e..b5c6603c758cd2c11dc2d401d4351d344027cca5 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * item.c : Playlist item functions
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
@@ -27,6 +27,7 @@
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
+#include "vlc_input.h"
 #include "vlc_playlist.h"
 
 static void GuessType( input_item_t *p_item);
@@ -77,6 +78,7 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj,
 
     p_item->i_flags = 0;
     p_item->i_flags |= PLAYLIST_SKIP_FLAG;
+    p_item->i_flags |= PLAYLIST_SAVE_FLAG;
 
     p_item->input.i_duration = -1;
     p_item->input.ppsz_options = NULL;
@@ -87,11 +89,95 @@ playlist_item_t * playlist_ItemNewWithType( vlc_object_t *p_obj,
     if( p_item->input.i_type == ITEM_TYPE_UNKNOWN )
         GuessType( &p_item->input );
 
-    playlist_ItemCreateCategory( p_item, _("General") );
-
     return p_item;
 }
 
+/**
+ * Copy a playlist item
+ *
+ * Creates a new item with name, mrl and meta infor like the
+ * source. Does not copy children for node type items.
+ * \param p_obj any vlc object, needed for mutex init
+ * \param p_item the item to copy
+ * \return pointer to the new item, or NULL on error
+ * \note function takes the lock on p_item
+ */
+playlist_item_t *__playlist_ItemCopy( vlc_object_t *p_obj,
+                                      playlist_item_t *p_item )
+{
+    playlist_item_t *p_res;
+    int i;
+    vlc_mutex_lock( &p_item->input.lock );
+
+    p_res = malloc( sizeof( playlist_item_t ) );
+    if( p_res == NULL )
+    {
+        vlc_mutex_unlock( &p_item->input.lock );
+        return NULL;
+    }
+
+    *p_res = *p_item;
+    vlc_mutex_init( p_obj, &p_res->input.lock );
+
+    if( p_item->input.i_options )
+        p_res->input.ppsz_options =
+            malloc( p_item->input.i_options * sizeof(char*) );
+    for( i = 0; i < p_item->input.i_options; i++ )
+    {
+        p_res->input.ppsz_options[i] = strdup( p_item->input.ppsz_options[i] );
+    }
+
+    if( p_item->i_children != -1 )
+    {
+        msg_Warn( p_obj, "not copying playlist items children" );
+        p_res->i_children = -1;
+        p_res->pp_children = NULL;
+    }
+    p_res->i_parents = 0;
+    p_res->pp_parents = NULL;
+    
+    if( p_item->input.psz_name )
+        p_res->input.psz_name = strdup( p_item->input.psz_name );
+    if( p_item->input.psz_uri )
+        p_res->input.psz_uri = strdup( p_item->input.psz_uri );
+    
+    if( p_item->input.i_es )
+    {
+        p_res->input.es =
+            (es_format_t**)malloc( p_item->input.i_es * sizeof(es_format_t*));
+        for( i = 0; i < p_item->input.i_es; i++ )
+        {
+            p_res->input.es[ i ] = (es_format_t*)malloc(sizeof(es_format_t*));
+            es_format_Copy( p_res->input.es[ i ],
+                         p_item->input.es[ i ] );
+        }
+    }
+    if( p_item->input.i_categories )
+    {
+        p_res->input.pp_categories = NULL;
+        p_res->input.i_categories = 0;
+        for( i = 0; i < p_item->input.i_categories; i++ )
+        {
+            info_category_t *p_incat;
+            p_incat = p_item->input.pp_categories[i];
+            if( p_incat->i_infos )
+            {
+                int j;
+                for( j = 0; j < p_incat->i_infos; j++ )
+                {
+                    vlc_input_item_AddInfo( &p_res->input, p_incat->psz_name,
+                                            p_incat->pp_infos[j]->psz_name,
+                                            "%s", /* to be safe */
+                                            p_incat->pp_infos[j]->psz_value );
+                }
+            }
+        }
+    }
+
+    vlc_mutex_unlock( &p_item->input.lock );
+    return p_res;
+}
+
 /**
  * Deletes a playlist item
  *
@@ -248,6 +334,7 @@ int playlist_ItemSetName( playlist_item_t *p_item, char *psz_name )
 {
     if( psz_name && p_item )
     {
+        if( p_item->input.psz_name ) free( p_item->input.psz_name );
         p_item->input.psz_name = strdup( psz_name );
         return VLC_SUCCESS;
     }
@@ -276,8 +363,8 @@ int playlist_ItemSetDuration( playlist_item_t *p_item, mtime_t i_duration )
         {
             memcpy( psz_buffer, "--:--:--", sizeof("--:--:--") );
         }
-        playlist_ItemAddInfo( p_item, _("General") , _("Duration"),
-                              "%s", psz_buffer );
+        vlc_input_item_AddInfo( &p_item->input, _("General") , _("Duration"),
+                                "%s", psz_buffer );
 
         return VLC_SUCCESS;
     }
@@ -308,11 +395,13 @@ static void GuessType( input_item_t *p_item)
         { NULL, 0 }
     };
 
+#if 0 /* Unused */
     static struct { char *psz_search; int i_type; } exts_array[] =
     {
         { "mp3", ITEM_TYPE_AFILE },
         { NULL, 0 }
     };
+#endif
 
     for( i = 0; types_array[i].psz_search != NULL; i++ )
     {