diff options
author | Eric Wong <normalperson@yhbt.net> | 2008-09-12 02:17:13 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-09-12 02:17:13 -0700 |
commit | 12d4956528b7abd34aa5d827a2f088f6eb45df98 (patch) | |
tree | 83c070df37f8d03e562ea9ad0b9274e0d4082351 /src/storedPlaylist.h | |
parent | 1b6315e8f6372e7abe1a3eb08b27b2f331aa2728 (diff) | |
parent | cb0253d02dc1d51bc84c65d8c7362c8a18c116f2 (diff) | |
download | mpd-12d4956528b7abd34aa5d827a2f088f6eb45df98.tar.gz mpd-12d4956528b7abd34aa5d827a2f088f6eb45df98.tar.xz mpd-12d4956528b7abd34aa5d827a2f088f6eb45df98.zip |
Merge branch 'mk/client-merge'
* mk/client-merge: (49 commits)
client: shorten names of the struct client variables
client: simplified client_read()
client: client_input_received() returns 0
client: check for COMMAND_RETURN_CLOSE
client: renamed local variable "selret" to "ret"
client: moved CLOSE/KILL check after client_process_line()
client: don't check FD_ISSET(client->fd) on expired client
client: removed assert(client->fd)>=0
fix -Wcast-qual -Wwrite-strings warnings
playlist: return -1 after assert(0)
command: concatenate strings at compile time
audio: don't pass "fd" to {en,dis}ableAudioDevice()
volume: don't pass "fd" to changeVolumeLevel()
directory: printDirectoryInfo() does not call commandError()
directory: don't pass fd to traverseAllIn()
directory: don't pass fd to traverseAllIn() callbacks
playlist: PlaylistInfo() does not call commandError()
playlist: don't pass "fd" to storedPlaylist.c functions
playlist: don't pass "fd" to playlist.c functions
playlist: showPlaylist() and shufflePlaylist() cannot fail
...
Diffstat (limited to 'src/storedPlaylist.h')
-rw-r--r-- | src/storedPlaylist.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/storedPlaylist.h b/src/storedPlaylist.h index a7806386b..964669d35 100644 --- a/src/storedPlaylist.h +++ b/src/storedPlaylist.h @@ -23,14 +23,21 @@ #include "list.h" #include "playlist.h" -List *loadStoredPlaylist(int fd, const char *utf8path); +List *loadStoredPlaylist(const char *utf8path); -int moveSongInStoredPlaylistByPath(int fd, const char *utf8path, int src, int dest); -int removeAllFromStoredPlaylistByPath(int fd, const char *utf8path); -int removeOneSongFromStoredPlaylistByPath(int fd, const char *utf8path, int pos); +enum playlist_result +moveSongInStoredPlaylistByPath(const char *utf8path, int src, int dest); -int appendSongToStoredPlaylistByPath(int fd, const char *utf8path, Song *song); +enum playlist_result +removeAllFromStoredPlaylistByPath(const char *utf8path); -int renameStoredPlaylist(int fd, const char *utf8from, const char *utf8to); +enum playlist_result +removeOneSongFromStoredPlaylistByPath(const char *utf8path, int pos); + +enum playlist_result +appendSongToStoredPlaylistByPath(const char *utf8path, Song *song); + +enum playlist_result +renameStoredPlaylist(const char *utf8from, const char *utf8to); #endif |