diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/decoder/FlacMetadata.cxx | 8 | ||||
| -rw-r--r-- | src/decoder/OpusTags.cxx | 4 | ||||
| -rw-r--r-- | src/decoder/VorbisComments.cxx | 2 | ||||
| -rw-r--r-- | src/decoder/XiphTags.cxx (renamed from src/decoder/XiphTags.c) | 4 | ||||
| -rw-r--r-- | src/decoder/XiphTags.hxx (renamed from src/decoder/XiphTags.h) | 6 |
6 files changed, 11 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 528f9c87f..e70b5df04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -541,7 +541,7 @@ endif if HAVE_XIPH libdecoder_plugins_a_SOURCES += \ - src/decoder/XiphTags.c src/decoder/XiphTags.h \ + src/decoder/XiphTags.cxx src/decoder/XiphTags.hxx \ src/decoder/OggCodec.cxx src/decoder/OggCodec.hxx endif diff --git a/src/decoder/FlacMetadata.cxx b/src/decoder/FlacMetadata.cxx index 02a5f509e..9c227e546 100644 --- a/src/decoder/FlacMetadata.cxx +++ b/src/decoder/FlacMetadata.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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 @@ -19,11 +19,7 @@ #include "config.h" #include "FlacMetadata.hxx" - -extern "C" { -#include "XiphTags.h" -} - +#include "XiphTags.hxx" #include "tag.h" #include "TagHandler.hxx" #include "tag_table.h" diff --git a/src/decoder/OpusTags.cxx b/src/decoder/OpusTags.cxx index fec47a28d..a63dc1c24 100644 --- a/src/decoder/OpusTags.cxx +++ b/src/decoder/OpusTags.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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 @@ -20,7 +20,7 @@ #include "config.h" #include "OpusTags.hxx" #include "OpusReader.hxx" -#include "XiphTags.h" +#include "XiphTags.hxx" #include "TagHandler.hxx" #include <stdint.h> diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx index 47e853762..dfb9dc314 100644 --- a/src/decoder/VorbisComments.cxx +++ b/src/decoder/VorbisComments.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "VorbisComments.hxx" -#include "XiphTags.h" +#include "XiphTags.hxx" #include "tag.h" #include "tag_table.h" #include "TagHandler.hxx" diff --git a/src/decoder/XiphTags.c b/src/decoder/XiphTags.cxx index d55787b94..b2aa6e82d 100644 --- a/src/decoder/XiphTags.c +++ b/src/decoder/XiphTags.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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,7 +18,7 @@ */ #include "config.h" -#include "XiphTags.h" +#include "XiphTags.hxx" const struct tag_table xiph_tags[] = { { "tracknumber", TAG_TRACK }, diff --git a/src/decoder/XiphTags.h b/src/decoder/XiphTags.hxx index 22a4e2204..03a75b731 100644 --- a/src/decoder/XiphTags.h +++ b/src/decoder/XiphTags.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 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 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_XIPH_TAGS_H -#define MPD_XIPH_TAGS_H +#ifndef MPD_XIPH_TAGS_HXX +#define MPD_XIPH_TAGS_HXX #include "check.h" #include "tag_table.h" |