From 44d9f62f34e0561d83ea32941f0ea1b529b1490d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 16 Aug 2008 09:28:15 -0700 Subject: core rewrite (decode,player,outputBuffer,playlist) This is a huge refactoring of the core mpd process. The queueing/buffering mechanism is heavily reworked. The player.c code has been merged into outputBuffer (the actual ring buffering logic is handled by ringbuf.c); and decode.c actually handles decoding stuff. The end result is several hundreds of lines shorter, even though we still have a lot of DEBUG statements left in there for tracing and a lot of assertions, too. --- src/playlist.h | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src/playlist.h') 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); -- cgit v1.2.3