Initial Services discovery support

[vlc] / src / playlist / loadsave.c

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 064f0533b1eb90db4b61b703b1ee6e45cb4affd8..007e9d4a90027cd692c8ecf389b9e4073769b472 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -2,7 +2,7 @@
  * loadsave.c : Playlist loading / saving functions
  *****************************************************************************
  * Copyright (C) 1999-2004 VideoLAN
- * $Id: loadsave.c,v 1.6 2004/01/22 19:35:14 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -23,30 +23,25 @@
 #include <stdlib.h>                                      /* free(), strtol() */
 #include <stdio.h>                                              /* sprintf() */
 #include <string.h>                                            /* strerror() */
+#include <errno.h>
 
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
 #include <vlc/sout.h>
-
-#ifdef HAVE_ERRNO_H
-#   include <errno.h>
-#endif
-
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include <vlc/input.h>
 
 #include "vlc_playlist.h"
 
 #define PLAYLIST_FILE_HEADER  "# vlc playlist file version 0.5"
 
-
 /**
- * Import a playlist file
+ * Import a certain playlist file into the library
+ * This file will get inserted as a new category
  *
- * Import a certain playlist file into the playlist
+ * XXX: TODO
  * \param p_playlist the playlist to which the new items will be added
  * \param psz_filename the name of the playlistfile to import
- * \return 0 on succes
+ * \return VLC_SUCCESS on success
  */
 int playlist_Import( playlist_t * p_playlist, const char *psz_filename )
 {
@@ -55,8 +50,6 @@ int playlist_Import( playlist_t * p_playlist, const char *psz_filename )
     int i_id;
 
     msg_Dbg( p_playlist, "clearing playlist");
-
-    /* Create our "fake" playlist item */
     playlist_Clear( p_playlist );
 
 
@@ -64,31 +57,59 @@ int playlist_Import( playlist_t * p_playlist, const char *psz_filename )
     sprintf( psz_uri, "file/playlist://%s", psz_filename);
 
     i_id = playlist_Add( p_playlist, psz_uri, psz_uri,
-                  PLAYLIST_INSERT | PLAYLIST_GO , PLAYLIST_END);
+                  PLAYLIST_INSERT  , PLAYLIST_END);
 
-    p_item = playlist_GetItemById( p_playlist, i_id );
+    vlc_mutex_lock( &p_playlist->object_lock );
+    p_item = playlist_ItemGetById( p_playlist, i_id );
     p_item->b_autodeletion = VLC_TRUE;
+    vlc_mutex_unlock( &p_playlist->object_lock );
 
-    //p_playlist->i_index = 0;
-
-/*
- *     if( p_item )
-    {
-        p_playlist->p_input = input_CreateThread( p_playlist, p_item );
-    }
-    */
+    playlist_Play(p_playlist);
 
     return VLC_SUCCESS;
 }
 
 /**
- * Export a playlist to a file
+ * Load a certain playlist file into the playlist
+ * This file will replace the contents of the "current" view
  *
+ * \param p_playlist the playlist to which the new items will be added
+ * \param psz_filename the name of the playlistfile to import
+ * \return VLC_SUCCESS on success
+ */
+int playlist_Load( playlist_t * p_playlist, const char *psz_filename )
+{
+    playlist_item_t *p_item;
+    char *psz_uri;
+    int i_id;
+
+    msg_Dbg( p_playlist, "clearing playlist");
+    playlist_Clear( p_playlist );
+
+
+    psz_uri = (char *)malloc(sizeof(char)*strlen(psz_filename) + 17 );
+    sprintf( psz_uri, "file/playlist://%s", psz_filename);
+
+    i_id = playlist_Add( p_playlist, psz_uri, psz_uri,
+                  PLAYLIST_INSERT  , PLAYLIST_END);
+
+    vlc_mutex_lock( &p_playlist->object_lock );
+    p_item = playlist_ItemGetById( p_playlist, i_id );
+    p_item->b_autodeletion = VLC_TRUE;
+    vlc_mutex_unlock( &p_playlist->object_lock );
+
+    playlist_Play(p_playlist);
+
+    return VLC_SUCCESS;
+}
+
+/**
  * Export a playlist to a certain type of playlistfile
+ *
  * \param p_playlist the playlist to export
  * \param psz_filename the location where the exported file will be saved
  * \param psz_type the type of playlist file to create.
- * \return 0 on succes
+ * \return VLC_SUCCESS on success
  */
 int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
                      const char *psz_type)
@@ -96,24 +117,20 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
     module_t *p_module;
     playlist_export_t *p_export;
 
-    msg_Info( p_playlist, "Saving playlist to file %s", psz_filename );
+    msg_Info( p_playlist, "saving playlist to file %s", psz_filename );
 
     /* Prepare the playlist_export_t structure */
     p_export = (playlist_export_t *)malloc( sizeof(playlist_export_t) );
     if( !p_export)
     {
-        msg_Err( p_playlist, "Out of memory");
+        msg_Err( p_playlist, "out of memory");
         return VLC_ENOMEM;
     }
     p_export->p_file = fopen( psz_filename, "wt" );
     if( !p_export->p_file )
     {
-        msg_Err( p_playlist , "Could not create playlist file %s"
-#ifdef HAVE_ERRNO_H
+        msg_Err( p_playlist , "could not create playlist file %s"
                  " (%s)", psz_filename, strerror(errno) );
-#else
-                 , psz_filename );
-#endif
         return VLC_EGENERIC;
     }
 
@@ -122,10 +139,10 @@ int playlist_Export( playlist_t * p_playlist, const char *psz_filename ,
     vlc_mutex_lock( &p_playlist->object_lock );
 
     /* And call the module ! All work is done now */
-    p_module = module_Need( p_playlist, "playlist export",  psz_type);
+    p_module = module_Need( p_playlist, "playlist export", psz_type, VLC_TRUE);
     if( !p_module )
     {
-        msg_Warn( p_playlist, "Failed to export playlist" );
+        msg_Warn( p_playlist, "failed to export playlist" );
         vlc_mutex_unlock( &p_playlist->object_lock );
         return VLC_ENOOBJ;
     }