oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

XiphTags: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-07-29 07:42:50 +02:00
parent cde6a3a00c
commit bd42aeab46
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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

8
src/decoder/FlacMetadata.cxx
View File

@ -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 * 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 @@
#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"

4
src/decoder/OpusTags.cxx
View File

@ -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 * 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 @@
#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>

2
src/decoder/VorbisComments.cxx
View File

@ -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"

4
src/decoder/XiphTags.c → src/decoder/XiphTags.cxx
View File

@ -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 * 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 @@
*/ */
#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 },

6
src/decoder/XiphTags.h → src/decoder/XiphTags.hxx
View File

@ -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 * 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 @@
* 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"