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

tag_table: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-07-29 07:37:52 +02:00
parent bd42aeab46
commit 14f21378e3
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -82,7 +82,6 @@ mpd_headers = \
src/stats.h \
src/tag.h \
src/tag_internal.h \
src/tag_table.h \
src/Timer.hxx \
src/mpd_error.h
@ -222,6 +221,7 @@ src_mpd_SOURCES = \
src/StateFile.cxx src/StateFile.hxx \
src/Stats.cxx \
src/Tag.cxx \
src/TagTable.hxx \
src/TagNames.c \
src/TagPool.cxx src/TagPool.hxx \
src/TagPrint.cxx src/TagPrint.hxx \

2
src/ApeTag.cxx
View File

@ -21,7 +21,7 @@
#include "ApeTag.hxx"
#include "ApeLoader.hxx"
#include "tag.h"
#include "tag_table.h"
#include "TagTable.hxx"
#include "TagHandler.hxx"
const struct tag_table ape_tags[] = {

2
src/ApeTag.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_APE_TAG_HXX
#define MPD_APE_TAG_HXX
#include "tag_table.h"
#include "TagTable.hxx"
#include <stdbool.h>

2
src/TagId3.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "TagId3.hxx"
#include "TagHandler.hxx"
#include "tag_table.h"
#include "TagTable.hxx"
#include "tag.h"
extern "C" {

10
src/tag_table.h → src/TagTable.hxx
View File

@ -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
@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_TAG_TABLE_H
#define MPD_TAG_TABLE_H
#ifndef MPD_TAG_TABLE_HXX
#define MPD_TAG_TABLE_HXX
#include "tag.h"
#include "gcc.h"
@ -40,7 +40,7 @@ gcc_pure
static inline enum tag_type
tag_table_lookup(const struct tag_table *table, const char *name)
{
for (; table->name != NULL; ++table)
for (; table->name != nullptr; ++table)
if (strcmp(name, table->name) == 0)
return table->type;
@ -56,7 +56,7 @@ gcc_pure
static inline enum tag_type
tag_table_lookup_i(const struct tag_table *table, const char *name)
{
for (; table->name != NULL; ++table)
for (; table->name != nullptr; ++table)
if (g_ascii_strcasecmp(name, table->name) == 0)
return table->type;

2
src/decoder/FfmpegMetaData.cxx
View File

@ -22,7 +22,7 @@
#include "config.h"
#include "FfmpegMetaData.hxx"
#include "tag_table.h"
#include "TagTable.hxx"
#include "TagHandler.hxx"
#undef G_LOG_DOMAIN

2
src/decoder/FlacMetadata.cxx
View File

@ -22,7 +22,7 @@
#include "XiphTags.hxx"
#include "tag.h"
#include "TagHandler.hxx"
#include "tag_table.h"
#include "TagTable.hxx"
#include "replay_gain_info.h"
#include <glib.h>

2
src/decoder/VorbisComments.cxx
View File

@ -21,7 +21,7 @@
#include "VorbisComments.hxx"
#include "XiphTags.hxx"
#include "tag.h"
#include "tag_table.h"
#include "TagTable.hxx"
#include "TagHandler.hxx"
#include "replay_gain_info.h"

2
src/decoder/XiphTags.hxx
View File

@ -21,7 +21,7 @@
#define MPD_XIPH_TAGS_HXX
#include "check.h"
#include "tag_table.h"
#include "TagTable.hxx"
extern const struct tag_table xiph_tags[];