From 14f21378e3c623ef8ab1a0fa734a6b35bc4d9b58 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 29 Jul 2013 07:37:52 +0200 Subject: tag_table: convert to C++ --- src/ApeTag.cxx | 2 +- src/ApeTag.hxx | 2 +- src/TagId3.cxx | 2 +- src/TagTable.hxx | 66 ++++++++++++++++++++++++++++++++++++++++++ src/decoder/FfmpegMetaData.cxx | 2 +- src/decoder/FlacMetadata.cxx | 2 +- src/decoder/VorbisComments.cxx | 2 +- src/decoder/XiphTags.hxx | 2 +- src/tag_table.h | 66 ------------------------------------------ 9 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 src/TagTable.hxx delete mode 100644 src/tag_table.h (limited to 'src') diff --git a/src/ApeTag.cxx b/src/ApeTag.cxx index 7713310c1..e0ef24c75 100644 --- a/src/ApeTag.cxx +++ b/src/ApeTag.cxx @@ -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[] = { diff --git a/src/ApeTag.hxx b/src/ApeTag.hxx index 3e6655531..96b53612b 100644 --- a/src/ApeTag.hxx +++ b/src/ApeTag.hxx @@ -20,7 +20,7 @@ #ifndef MPD_APE_TAG_HXX #define MPD_APE_TAG_HXX -#include "tag_table.h" +#include "TagTable.hxx" #include diff --git a/src/TagId3.cxx b/src/TagId3.cxx index c5719f481..7f033b5c4 100644 --- a/src/TagId3.cxx +++ b/src/TagId3.cxx @@ -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" { diff --git a/src/TagTable.hxx b/src/TagTable.hxx new file mode 100644 index 000000000..0d249d181 --- /dev/null +++ b/src/TagTable.hxx @@ -0,0 +1,66 @@ +/* + * 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 + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_TAG_TABLE_HXX +#define MPD_TAG_TABLE_HXX + +#include "tag.h" +#include "gcc.h" + +#include + +struct tag_table { + const char *name; + + enum tag_type type; +}; + +/** + * Looks up a string in a tag translation table (case sensitive). + * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found + * in the table. + */ +gcc_pure +static inline enum tag_type +tag_table_lookup(const struct tag_table *table, const char *name) +{ + for (; table->name != nullptr; ++table) + if (strcmp(name, table->name) == 0) + return table->type; + + return TAG_NUM_OF_ITEM_TYPES; +} + +/** + * Looks up a string in a tag translation table (case insensitive). + * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found + * in the table. + */ +gcc_pure +static inline enum tag_type +tag_table_lookup_i(const struct tag_table *table, const char *name) +{ + for (; table->name != nullptr; ++table) + if (g_ascii_strcasecmp(name, table->name) == 0) + return table->type; + + return TAG_NUM_OF_ITEM_TYPES; +} + +#endif diff --git a/src/decoder/FfmpegMetaData.cxx b/src/decoder/FfmpegMetaData.cxx index 509aaf947..c383245d0 100644 --- a/src/decoder/FfmpegMetaData.cxx +++ b/src/decoder/FfmpegMetaData.cxx @@ -22,7 +22,7 @@ #include "config.h" #include "FfmpegMetaData.hxx" -#include "tag_table.h" +#include "TagTable.hxx" #include "TagHandler.hxx" #undef G_LOG_DOMAIN diff --git a/src/decoder/FlacMetadata.cxx b/src/decoder/FlacMetadata.cxx index 9c227e546..64f091c04 100644 --- a/src/decoder/FlacMetadata.cxx +++ b/src/decoder/FlacMetadata.cxx @@ -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 diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx index dfb9dc314..a2bec30f1 100644 --- a/src/decoder/VorbisComments.cxx +++ b/src/decoder/VorbisComments.cxx @@ -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" diff --git a/src/decoder/XiphTags.hxx b/src/decoder/XiphTags.hxx index 03a75b731..43a1d3ec7 100644 --- a/src/decoder/XiphTags.hxx +++ b/src/decoder/XiphTags.hxx @@ -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[]; diff --git a/src/tag_table.h b/src/tag_table.h deleted file mode 100644 index 8e2172c18..000000000 --- a/src/tag_table.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2003-2011 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_TAG_TABLE_H -#define MPD_TAG_TABLE_H - -#include "tag.h" -#include "gcc.h" - -#include - -struct tag_table { - const char *name; - - enum tag_type type; -}; - -/** - * Looks up a string in a tag translation table (case sensitive). - * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found - * in the table. - */ -gcc_pure -static inline enum tag_type -tag_table_lookup(const struct tag_table *table, const char *name) -{ - for (; table->name != NULL; ++table) - if (strcmp(name, table->name) == 0) - return table->type; - - return TAG_NUM_OF_ITEM_TYPES; -} - -/** - * Looks up a string in a tag translation table (case insensitive). - * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found - * in the table. - */ -gcc_pure -static inline enum tag_type -tag_table_lookup_i(const struct tag_table *table, const char *name) -{ - for (; table->name != NULL; ++table) - if (g_ascii_strcasecmp(name, table->name) == 0) - return table->type; - - return TAG_NUM_OF_ITEM_TYPES; -} - -#endif -- cgit v1.2.3