diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data.c | 4 | ||||
| -rw-r--r-- | src/data.h | 1 | ||||
| -rw-r--r-- | src/player.c | 4 | ||||
| -rw-r--r-- | src/player.h | 3 | ||||
| -rw-r--r-- | src/player_mpd.c | 1 |
5 files changed, 8 insertions, 5 deletions
@@ -569,7 +569,7 @@ track_rename(struct track *track, const char *name) } bool -aquire_lock(const char *datadir) +acquire_lock(const char *datadir) { char *lockpath, *procpath; char linebuf[512]; @@ -643,7 +643,7 @@ data_load(void) datadir = getenv("TMUS_DATA"); if (!datadir) ERROR("TMUS_DATA not set!\n"); - if (!aquire_lock(datadir)) + if (!acquire_lock(datadir)) ERROR("Failed to acquire lock\n"); dir = opendir(datadir); @@ -25,6 +25,7 @@ struct track { bool path_exists(const char *path); bool make_dir(const char *path); +bool move_dir(const char *dst, const char *src); bool rm_dir(const char *path, bool recursive); bool rm_file(const char *path); bool copy_file(const char *dst, const char *src); diff --git a/src/player.c b/src/player.c index 9367a14..6e1a69b 100644 --- a/src/player.c +++ b/src/player.c @@ -3,6 +3,10 @@ #include "list.h" #include "data.h" +static bool player_history_contains(struct track *cmp, int depth); +static struct track *playlist_track_next_unused(struct link *start); +static struct track *player_next_from_playlist(void); + bool player_history_contains(struct track *cmp, int depth) { diff --git a/src/player.h b/src/player.h index 145158c..e2c5faf 100644 --- a/src/player.h +++ b/src/player.h @@ -79,8 +79,5 @@ int player_stop(void); int player_set_volume(unsigned int vol); -bool player_history_contains(struct track *track, int depth); -struct track *playlist_track_next_unused(struct link *link); - extern struct player player; diff --git a/src/player_mpd.c b/src/player_mpd.c index ae57605..ae227a7 100644 --- a/src/player_mpd.c +++ b/src/player_mpd.c @@ -39,6 +39,7 @@ struct mpd_player mpd; static void player_clear_status(void); static bool mpd_handle_status(int status); +static char *mpd_loaded_track_name(struct mpd_song *song); static void player_add_history(struct track *track); |