summaryrefslogtreecommitdiff
path: root/src/UpdateSong.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-28 13:25:12 +0200
committerMax Kellermann <max@duempel.org>2013-07-28 13:25:12 +0200
commitba161ec572b98d3bcf9f735ff122133319fe896a (patch)
treea211690e3a8b7fce1fb6db540228122bead1f2bc /src/UpdateSong.cxx
parent43f613d9be9aa2953dcfc0aacfbdfb56d5d1a708 (diff)
song: convert header to C++
Diffstat (limited to 'src/UpdateSong.cxx')
-rw-r--r--src/UpdateSong.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/UpdateSong.cxx b/src/UpdateSong.cxx
index 0c2f2fb54..b1f8cac4d 100644
--- a/src/UpdateSong.cxx
+++ b/src/UpdateSong.cxx
@@ -25,7 +25,7 @@
#include "UpdateContainer.hxx"
#include "DatabaseLock.hxx"
#include "Directory.hxx"
-#include "song.h"
+#include "Song.hxx"
#include "DecoderPlugin.hxx"
#include "DecoderList.hxx"
@@ -39,7 +39,7 @@ update_song_file2(Directory *directory,
const struct decoder_plugin *plugin)
{
db_lock();
- struct song *song = directory->FindSong(name);
+ Song *song = directory->FindSong(name);
db_unlock();
if (!directory_child_access(directory, name, R_OK)) {
@@ -68,7 +68,7 @@ update_song_file2(Directory *directory,
if (song == NULL) {
g_debug("reading %s/%s", directory->GetPath(), name);
- song = song_file_load(name, directory);
+ song = Song::LoadFile(name, directory);
if (song == NULL) {
g_debug("ignoring unrecognized file %s/%s",
directory->GetPath(), name);
@@ -85,7 +85,7 @@ update_song_file2(Directory *directory,
} else if (st->st_mtime != song->mtime || walk_discard) {
g_message("updating %s/%s",
directory->GetPath(), name);
- if (!song_file_update(song)) {
+ if (!song->UpdateFile()) {
g_debug("deleting unrecognized file %s/%s",
directory->GetPath(), name);
db_lock();