diff options
Diffstat (limited to '')
| -rw-r--r-- | src/SongUpdate.cxx (renamed from src/song_update.c) | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/song_update.c b/src/SongUpdate.cxx index 37f502a20..b96c7c43e 100644 --- a/src/song_update.c +++ b/src/SongUpdate.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,17 +18,24 @@ */ #include "config.h" /* must be first for large file support */ + +extern "C" { #include "song.h" #include "uri.h" -#include "directory.h" -#include "mapper.h" +} + +#include "Directory.hxx" +#include "Mapper.hxx" +#include "tag.h" +#include "input_stream.h" + +extern "C" { #include "decoder_list.h" #include "decoder_plugin.h" #include "tag_ape.h" #include "tag_id3.h" -#include "tag.h" #include "tag_handler.h" -#include "input_stream.h" +} #include <glib.h> @@ -38,7 +45,7 @@ #include <stdio.h> struct song * -song_file_load(const char *path, struct directory *parent) +song_file_load(const char *path, Directory *parent) { struct song *song; bool ret; @@ -187,7 +194,7 @@ song_file_update_inarchive(struct song *song) if (suffix == NULL) return false; - plugin = decoder_plugin_from_suffix(suffix, false); + plugin = decoder_plugin_from_suffix(suffix, nullptr); if (plugin == NULL) return false; |