aboutsummaryrefslogtreecommitdiffstats
path: root/src/song_print.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-10-13 18:01:06 +0200
committerMax Kellermann <max@duempel.org>2009-10-13 18:01:06 +0200
commitf7ce4f6239ded6681713bc9e8d281712106e6f25 (patch)
tree1078ee0df1551a0e27bae71022c39a54affd07b6 /src/song_print.c
parent28442cce9fa4a91c38d87c4a61b6ff6af4f97a67 (diff)
downloadmpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.gz
mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.xz
mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.zip
song: renamed attribute "url" to "uri"
Diffstat (limited to '')
-rw-r--r--src/song_print.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/song_print.c b/src/song_print.c
index 2c4da6cb0..3420b0d34 100644
--- a/src/song_print.c
+++ b/src/song_print.c
@@ -26,18 +26,18 @@
#include "uri.h"
void
-song_print_url(struct client *client, struct song *song)
+song_print_uri(struct client *client, struct song *song)
{
if (song_in_database(song) && !directory_is_root(song->parent)) {
client_printf(client, "%s%s/%s\n", SONG_FILE,
- directory_get_path(song->parent), song->url);
+ directory_get_path(song->parent), song->uri);
} else {
char *allocated;
const char *uri;
- uri = allocated = uri_remove_auth(song->url);
+ uri = allocated = uri_remove_auth(song->uri);
if (uri == NULL)
- uri = song->url;
+ uri = song->uri;
client_printf(client, "%s%s\n", SONG_FILE, uri);
@@ -48,7 +48,7 @@ song_print_url(struct client *client, struct song *song)
int
song_print_info(struct client *client, struct song *song)
{
- song_print_url(client, song);
+ song_print_uri(client, song);
if (song->mtime > 0) {
#ifndef G_OS_WIN32