Playlist: put private data after public data

[vlc] / include / vlc_playlist.h

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index f451adaaa24bc448ea38a7da5722467a48b5a655..95b90cd66e7d92d09d760459190c44d65c88c5e7 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" {
@@ -200,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
@@ -215,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 */
 
@@ -411,7 +407,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 );