Merge branch 'core-rewrite' of git://git.musicpd.org/normalperson/mpd

* 'core-rewrite' of git://git.musicpd.org/normalperson/mpd:
  Remove ob_wait_sync and cleanup triggering in playlist
  fix output buffer deadlock when daemonizing
  log.c: thread-safety for warning log
  core rewrite (decode,player,outputBuffer,playlist)

1 files changed, 6 insertions, 17 deletions

diff --git a/src/playlist.h b/src/playlist.h
index db5243ba9..2ba28f9e4 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -24,21 +24,6 @@
 #define PLAYLIST_FILE_SUFFIX 	"m3u"
 #define PLAYLIST_COMMENT	'#'
 
-typedef struct _Playlist {
-	Song **songs;
-	/* holds version a song was modified on */
-	mpd_uint32 *songMod;
-	int *order;
-	int *positionToId;
-	int *idToPosition;
-	int length;
-	int current;
-	int queued;
-	int repeat;
-	int random;
-	mpd_uint32 version;
-} Playlist;
-
 extern int playlist_saveAbsolutePaths;
 
 extern int playlist_max_length;
@@ -71,6 +56,12 @@ int playlistInfo(int fd, int song);
 
 int playlistId(int fd, int song);
 
+Song *playlist_queued_song(void);
+
+void playlist_queue_next(void);
+
+int playlist_playing(void);
+
 int stopPlaylist(int fd);
 
 int playPlaylist(int fd, int song, int stopOnError);
@@ -119,8 +110,6 @@ int getPlaylistLength(void);
 
 unsigned long getPlaylistVersion(void);
 
-void playPlaylistIfPlayerStopped(void);
-
 int seekSongInPlaylist(int fd, int song, float seek_time);
 
 int seekSongInPlaylistById(int fd, int id, float seek_time);