diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-13 18:01:06 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-13 18:01:06 +0200 |
| commit | f7ce4f6239ded6681713bc9e8d281712106e6f25 (patch) | |
| tree | 1078ee0df1551a0e27bae71022c39a54affd07b6 /src/song_save.c | |
| parent | 28442cce9fa4a91c38d87c4a61b6ff6af4f97a67 (diff) | |
| download | mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.gz mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.xz mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.zip | |
song: renamed attribute "url" to "uri"
Diffstat (limited to 'src/song_save.c')
| -rw-r--r-- | src/song_save.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/song_save.c b/src/song_save.c index 3e54ce222..b18057201 100644 --- a/src/song_save.c +++ b/src/song_save.c @@ -41,14 +41,13 @@ song_save_quark(void) } static void -song_save_url(FILE *fp, struct song *song) +song_save_uri(FILE *fp, struct song *song) { if (song->parent != NULL && song->parent->path != NULL) fprintf(fp, SONG_FILE "%s/%s\n", - directory_get_path(song->parent), song->url); + directory_get_path(song->parent), song->uri); else - fprintf(fp, SONG_FILE "%s\n", - song->url); + fprintf(fp, SONG_FILE "%s\n", song->uri); } static int @@ -56,9 +55,9 @@ song_save(struct song *song, void *data) { FILE *fp = data; - fprintf(fp, SONG_KEY "%s\n", song->url); + fprintf(fp, SONG_KEY "%s\n", song->uri); - song_save_url(fp, song); + song_save_uri(fp, song); if (song->tag != NULL) tag_save(fp, song->tag); @@ -78,7 +77,7 @@ void songvec_save(FILE *fp, struct songvec *sv) static void commit_song(struct songvec *sv, struct song *newsong) { - struct song *existing = songvec_find(sv, newsong->url); + struct song *existing = songvec_find(sv, newsong->uri); if (!existing) { songvec_add(sv, newsong); |