From 0eb05b827fc239854773b43baff82581d65f9c5b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 2 Jan 2013 23:06:10 +0100 Subject: Directory: turn functions to methods --- src/SongSticker.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/SongSticker.cxx') diff --git a/src/SongSticker.cxx b/src/SongSticker.cxx index 2c311bfbb..14b3a1580 100644 --- a/src/SongSticker.cxx +++ b/src/SongSticker.cxx @@ -123,14 +123,12 @@ sticker_song_find_cb(const char *uri, const char *value, gpointer user_data) { struct sticker_song_find_data *data = (struct sticker_song_find_data *)user_data; - struct song *song; if (memcmp(uri, data->base_uri, data->base_uri_length) != 0) /* should not happen, ignore silently */ return; - song = directory_lookup_song(data->directory, - uri + data->base_uri_length); + song *song = data->directory->LookupSong(uri + data->base_uri_length); if (song != NULL) data->func(song, value, data->user_data); } @@ -147,7 +145,7 @@ sticker_song_find(struct directory *directory, const char *name, data.user_data = user_data; char *allocated; - data.base_uri = directory_get_path(directory); + data.base_uri = directory->GetPath(); if (*data.base_uri != 0) /* append slash to base_uri */ data.base_uri = allocated = -- cgit v1.2.3