Add URI column to Qt4 playlist. Add sorting by URI in playlist core.

[vlc] / include / vlc_playlist.h

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 2f837e45437a41af90e03e72f3d4d03498e759ba..430b4a0d7ecfa48e97c75309a6b7c73ec1141090 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_PLAYLIST_H_
-#define _VLC_PLAYLIST_H_
+#ifndef VLC_PLAYLIST_H_
+#define VLC_PLAYLIST_H_
 
 # ifdef __cplusplus
 extern "C" {
@@ -168,6 +168,8 @@ struct playlist_t
 
     playlist_item_array_t items; /**< Arrays of items */
     playlist_item_array_t all_items; /**< Array of items and nodes */
+    playlist_item_array_t items_to_delete; /**< Array of items and nodes to
+            delete... At the very end. This sucks. */
 
     playlist_item_array_t current; /**< Items currently being played */
     int                   i_current_index; /**< Index in current array */
@@ -198,10 +200,6 @@ struct playlist_t
     int                   i_order; /**< Last ordering applied to the playlist */
     mtime_t               gc_date;
     bool            b_cant_sleep;
-    playlist_preparse_t  *p_preparse; /**< Preparser object */
-    playlist_fetcher_t   *p_fetcher;/**< Meta and art fetcher object */
-
-    vlc_mutex_t gc_lock;         /**< Lock to protect the garbage collection */
 
     struct {
         /* Current status. These fields are readonly, only the playlist
@@ -213,7 +211,7 @@ struct playlist_t
 
     struct {
         /* Request. Use this to give orders to the playlist main loop  */
-        int                 i_status; /**< requested playlist status */
+        playlist_status_t   i_status; /**< requested playlist status */
         playlist_item_t *   p_node;   /**< requested node to play from */
         playlist_item_t *   p_item;   /**< requested item to play in the node */
 
@@ -246,6 +244,7 @@ struct playlist_add_t
 #define SORT_TRACK_NUMBER 9
 #define SORT_DESCRIPTION 10
 #define SORT_RATING 11
+#define SORT_URI 12
 
 #define ORDER_NORMAL 0
 #define ORDER_REVERSE 1
@@ -368,7 +367,6 @@ VLC_EXPORT( int, playlist_ItemSetName, (playlist_item_t *, const char * ) );
 VLC_EXPORT( int,  playlist_Add,    ( playlist_t *, const char *, const char *, int, int, bool, bool ) );
 VLC_EXPORT( int,  playlist_AddExt, ( playlist_t *, const char *, const char *, int, int, mtime_t, const char *const *,int, bool, bool ) );
 VLC_EXPORT( int, playlist_AddInput, ( playlist_t *, input_item_t *, int, int, bool, bool ) );
-VLC_EXPORT( playlist_item_t *, playlist_NodeAddInput, ( playlist_t *, input_item_t *,playlist_item_t *,int , int, bool ) );
 VLC_EXPORT( int, playlist_BothAddInput, ( playlist_t *, input_item_t *,playlist_item_t *,int , int, int*, int*, bool ) );
 
 /********************** Misc item operations **********************/
@@ -410,7 +408,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file)
     input_item_t *p_input;
     snprintf( psz_uri, 256+9, "file/://%s", psz_file );
     const char *const psz_option = "meta-file";
-    p_input = input_ItemNewExt( p_playlist, psz_uri, psz_file,
+    p_input = input_item_NewExt( p_playlist, psz_uri, psz_file,
                                 1, &psz_option, -1 );
     playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END,
                        true, false );