diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-10-05 00:36:55 -0700 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-10-05 00:36:55 -0700 |
| commit | c4802008b899cc2d272d5e9b6c7000736ed3a6df (patch) | |
| tree | 5d9146af43e9999ed32e726d52de7e0d2674958c /src/player_error.h | |
| parent | 9beb6b61ab28122de049da918afad424b1e92c42 (diff) | |
| parent | 1533279fb18b2b0f53345f0e0727d2f0f968c00d (diff) | |
| download | mpd-c4802008b899cc2d272d5e9b6c7000736ed3a6df.tar.gz mpd-c4802008b899cc2d272d5e9b6c7000736ed3a6df.tar.xz mpd-c4802008b899cc2d272d5e9b6c7000736ed3a6df.zip | |
Merge commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d'
* commit '1533279fb18b2b0f53345f0e0727d2f0f968c00d':
directory: reuse existing directory if found on update
song: better handling of existing songs when rereading DB
tag: merge clearMpdTag into tag_free
song: start avoiding race in updateSongInfo
command: get rid of specialized list handlers
directory: simplify list update handling logic
main_notify: define main_task so we can use it for assertions
directory: streamline deletes
song: start avoiding race in updateSongInfo
playlist: small lines of code reduction
Revert "Start using song pointers in core data structures"
Conflicts:
src/playlist.c
Diffstat (limited to 'src/player_error.h')
| -rw-r--r-- | src/player_error.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/player_error.h b/src/player_error.h index c90c98420..997cb4604 100644 --- a/src/player_error.h +++ b/src/player_error.h @@ -19,8 +19,6 @@ #ifndef PLAYER_ERROR_H #define PLAYER_ERROR_H -#include "song.h" - enum player_error { PLAYER_ERROR_NONE = 0, PLAYER_ERROR_FILE, @@ -31,10 +29,9 @@ enum player_error { }; extern enum player_error player_errno; -extern Song *player_errsong; void player_clearerror(void); -void player_seterror(enum player_error err, Song *song); +void player_seterror(enum player_error err, const char *url); const char *player_strerror(void); #endif /* PLAYER_ERROR_H */ |