oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

database: renamed get_get_song() to db_get_song()

Browse Source 
Search'n'replace typo..
This commit is contained in:
Max Kellermann 2008-10-09 16:26:09 +02:00
parent 4409c34a8c
commit 6b9ffcffe2
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/database.c
View File

@ -70,7 +70,7 @@ db_get_directory(const char *name)
} }
struct song * struct song *
get_get_song(const char *file) db_get_song(const char *file)
{ {
struct song *song = NULL; struct song *song = NULL;
struct directory *directory; struct directory *directory;
@ -108,7 +108,7 @@ db_walk(const char *name,
if ((directory = db_get_directory(name)) == NULL) { if ((directory = db_get_directory(name)) == NULL) {
struct song *song; struct song *song;
if ((song = get_get_song(name)) && forEachSong) { if ((song = db_get_song(name)) && forEachSong) {
return forEachSong(song, data); return forEachSong(song, data);
} }
return -1; return -1;

2
src/database.h
View File

@ -37,7 +37,7 @@ struct directory *
db_get_directory(const char *name); db_get_directory(const char *name);
struct song * struct song *
get_get_song(const char *file); db_get_song(const char *file);
int db_walk(const char *name, int db_walk(const char *name,
int (*forEachSong)(struct song *, void *), int (*forEachSong)(struct song *, void *),

6
src/playlist.c
View File

@ -559,7 +559,7 @@ enum playlist_result addToPlaylist(const char *url, int *added_id)
DEBUG("add to playlist: %s\n", url); DEBUG("add to playlist: %s\n", url);
if ((song = get_get_song(url))) { if ((song = db_get_song(url))) {
} else if (!(isValidRemoteUtf8Url(url) && } else if (!(isValidRemoteUtf8Url(url) &&
(song = song_remote_new(url)))) { (song = song_remote_new(url)))) {
return PLAYLIST_RESULT_NO_SUCH_SONG; 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); DEBUG("add to stored playlist: %s\n", url);
song = get_get_song(url); song = db_get_song(url);
if (song) if (song)
return appendSongToStoredPlaylistByPath(utf8file, song); return appendSongToStoredPlaylistByPath(utf8file, song);
@ -1360,7 +1360,7 @@ int PlaylistInfo(struct client *client, const char *utf8file, int detail)
int wrote = 0; int wrote = 0;
if (detail) { if (detail) {
struct song *song = get_get_song(temp); struct song *song = db_get_song(temp);
if (song) { if (song) {
song_print_info(client, song); song_print_info(client, song);
wrote = 1; wrote = 1;

2
src/storedPlaylist.c
View File

@ -116,7 +116,7 @@ List *loadStoredPlaylist(const char *utf8path)
!strncmp(s, musicDir, musicDir_len)) !strncmp(s, musicDir, musicDir_len))
memmove(s, s + musicDir_len + 1, memmove(s, s + musicDir_len + 1,
strlen(s + musicDir_len + 1) + 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); song_get_url(song, path_max_tmp);
insertInListWithoutKey(list, xstrdup(path_max_tmp)); insertInListWithoutKey(list, xstrdup(path_max_tmp));
} else if (isValidRemoteUtf8Url(s)) } else if (isValidRemoteUtf8Url(s))

2
src/update.c
View File

@ -404,7 +404,7 @@ static enum update_return updatePath(const char *path)
ret = UPDATE_RETURN_UPDATED; ret = UPDATE_RETURN_UPDATED;
/* don't return, path maybe a song now */ /* 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; parentDirectory = song->parent;
if (!parentDirectory->stat if (!parentDirectory->stat
&& statDirectory(parentDirectory) < 0) && statDirectory(parentDirectory) < 0)