Skip to content

M
mpd
Commit bd42aeab authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

XiphTags: convert to C++

parent cde6a3a0
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 15 deletions
Makefile.am
View file @ bd42aeab
...@@ -541,7 +541,7 @@ endif ...@@ -541,7 +541,7 @@ endif
if HAVE_XIPH if HAVE_XIPH
libdecoder_plugins_a_SOURCES += \ 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 src/decoder/OggCodec.cxx src/decoder/OggCodec.hxx
endif endif
......
src/decoder/FlacMetadata.cxx
View file @ bd42aeab
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -19,11 +19,7 @@ ...@@ -19,11 +19,7 @@
#include "config.h" #include "config.h"
#include "FlacMetadata.hxx" #include "FlacMetadata.hxx"
#include "XiphTags.hxx"
extern "C" {
#include "XiphTags.h"
}
#include "tag.h" #include "tag.h"
#include "TagHandler.hxx" #include "TagHandler.hxx"
#include "tag_table.h" #include "tag_table.h"
......
src/decoder/OpusTags.cxx
View file @ bd42aeab
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "OpusTags.hxx" #include "OpusTags.hxx"
#include "OpusReader.hxx" #include "OpusReader.hxx"
#include "XiphTags.h" #include "XiphTags.hxx"
#include "TagHandler.hxx" #include "TagHandler.hxx"
#include <stdint.h> #include <stdint.h>
......
src/decoder/VorbisComments.cxx
View file @ bd42aeab
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "VorbisComments.hxx" #include "VorbisComments.hxx"
#include "XiphTags.h" #include "XiphTags.hxx"
#include "tag.h" #include "tag.h"
#include "tag_table.h" #include "tag_table.h"
#include "TagHandler.hxx" #include "TagHandler.hxx"
......
src/decoder/XiphTags.c → src/decoder/XiphTags.cxx
View file @ bd42aeab
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "XiphTags.h" #include "XiphTags.hxx"
const struct tag_table xiph_tags[] = { const struct tag_table xiph_tags[] = {
{ "tracknumber", TAG_TRACK }, { "tracknumber", TAG_TRACK },
......
src/decoder/XiphTags.h → src/decoder/XiphTags.hxx
View file @ bd42aeab
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_XIPH_TAGS_H #ifndef MPD_XIPH_TAGS_HXX
#define MPD_XIPH_TAGS_H #define MPD_XIPH_TAGS_HXX
#include "check.h" #include "check.h"
#include "tag_table.h" #include "tag_table.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment