aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/database.c4
-rw-r--r--src/database.h2
-rw-r--r--src/playlist.c6
-rw-r--r--src/storedPlaylist.c2
-rw-r--r--src/update.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/database.c b/src/database.c
index ff1473820..93d0d7ef8 100644
--- a/src/database.c
+++ b/src/database.c
@@ -70,7 +70,7 @@ db_get_directory(const char *name)
}
struct song *
-get_get_song(const char *file)
+db_get_song(const char *file)
{
struct song *song = NULL;
struct directory *directory;
@@ -108,7 +108,7 @@ db_walk(const char *name,
if ((directory = db_get_directory(name)) == NULL) {
struct song *song;
- if ((song = get_get_song(name)) && forEachSong) {
+ if ((song = db_get_song(name)) && forEachSong) {
return forEachSong(song, data);
}
return -1;
diff --git a/src/database.h b/src/database.h
index 152baeb10..134c21dc4 100644
--- a/src/database.h
+++ b/src/database.h
@@ -37,7 +37,7 @@ struct directory *
db_get_directory(const char *name);
struct song *
-get_get_song(const char *file);
+db_get_song(const char *file);
int db_walk(const char *name,
int (*forEachSong)(struct song *, void *),
diff --git a/src/playlist.c b/src/playlist.c
index 438eb473b..e14bafc79 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -559,7 +559,7 @@ enum playlist_result addToPlaylist(const char *url, int *added_id)
DEBUG("add to playlist: %s\n", url);
- if ((song = get_get_song(url))) {
+ if ((song = db_get_song(url))) {
} else if (!(isValidRemoteUtf8Url(url) &&
(song = song_remote_new(url)))) {
return PLAYLIST_RESULT_NO_SUCH_SONG;
@@ -574,7 +574,7 @@ int addToStoredPlaylist(const char *url, const char *utf8file)
DEBUG("add to stored playlist: %s\n", url);
- song = get_get_song(url);
+ song = db_get_song(url);
if (song)
return appendSongToStoredPlaylistByPath(utf8file, song);
@@ -1360,7 +1360,7 @@ int PlaylistInfo(struct client *client, const char *utf8file, int detail)
int wrote = 0;
if (detail) {
- struct song *song = get_get_song(temp);
+ struct song *song = db_get_song(temp);
if (song) {
song_print_info(client, song);
wrote = 1;
diff --git a/src/storedPlaylist.c b/src/storedPlaylist.c
index ffb87cafc..ca74ba8b1 100644
--- a/src/storedPlaylist.c
+++ b/src/storedPlaylist.c
@@ -116,7 +116,7 @@ List *loadStoredPlaylist(const char *utf8path)
!strncmp(s, musicDir, musicDir_len))
memmove(s, s + musicDir_len + 1,
strlen(s + musicDir_len + 1) + 1);
- if ((song = get_get_song(s))) {
+ if ((song = db_get_song(s))) {
song_get_url(song, path_max_tmp);
insertInListWithoutKey(list, xstrdup(path_max_tmp));
} else if (isValidRemoteUtf8Url(s))
diff --git a/src/update.c b/src/update.c
index aad40de42..3aae95d25 100644
--- a/src/update.c
+++ b/src/update.c
@@ -404,7 +404,7 @@ static enum update_return updatePath(const char *path)
ret = UPDATE_RETURN_UPDATED;
/* don't return, path maybe a song now */
}
- } else if ((song = get_get_song(path))) {
+ } else if ((song = db_get_song(path))) {
parentDirectory = song->parent;
if (!parentDirectory->stat
&& statDirectory(parentDirectory) < 0)