libvlc: Move input_item array from playlist to libvlc.

[vlc] / include / vlc_playlist.h

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 9e8321139d4f6d5b991e4c0520984f2bbe965a82..b7f33a91f453c91e6729be879288a8ea708238e0 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -39,7 +39,6 @@ extern "C" {
 #include <stdlib.h>
 
 TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t);
-TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
 
 /**
  * \file
@@ -120,7 +119,7 @@ TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
  * will maybe become useful again when we merge VLM;
  *
  * To delete an item, use playlist_DeleteFromInput( input_id ) which will
- * remove all occurences of the input in both trees
+ * remove all occurrences of the input in both trees
  *
  * @{
  */
@@ -176,8 +175,6 @@ struct playlist_t
     playlist_item_array_t items; /**< Arrays of items */
     playlist_item_array_t all_items; /**< Array of items and nodes */
 
-    input_item_array_t    input_items; /**< Array of input items */
-
     playlist_item_array_t current; /**< Items currently being played */
     int                   i_current_index; /**< Index in current array */
     /** Reset current item array */
@@ -185,7 +182,6 @@ struct playlist_t
     mtime_t               last_rebuild_date;
 
     int                   i_last_playlist_id; /**< Last id to an item */
-    int                   i_last_input_id ; /**< Last id on an input */
 
     /* Predefined items */
     playlist_item_t *     p_root_category; /**< Root of category tree */
@@ -237,7 +233,6 @@ struct playlist_t
     } request;
 
     // Playlist-unrelated fields
-    interaction_t       *p_interaction;    /**< Interaction manager */
     input_thread_t      *p_stats_computer; /**< Input thread computing stats */
     global_stats_t      *p_stats;          /**< Global statistics */
 };