From 6728b8c1a386d82ac15137f82d693559a0d51a8f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 9 Apr 2013 00:20:49 +0200 Subject: decoder_plugin: convert to C++ --- Makefile.am | 2 +- src/DecoderPlugin.cxx | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/decoder_plugin.c | 47 ----------------------------------------------- 3 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 src/DecoderPlugin.cxx delete mode 100644 src/decoder_plugin.c diff --git a/Makefile.am b/Makefile.am index 84ca7e491..c4a2d1443 100644 --- a/Makefile.am +++ b/Makefile.am @@ -460,7 +460,7 @@ libdecoder_plugins_a_SOURCES = \ src/decoder/dsdlib.c \ src/decoder/dsdlib.h \ src/decoder_buffer.c \ - src/decoder_plugin.c \ + src/DecoderPlugin.cxx \ src/DecoderList.cxx src/DecoderList.hxx libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \ diff --git a/src/DecoderPlugin.cxx b/src/DecoderPlugin.cxx new file mode 100644 index 000000000..ccea032de --- /dev/null +++ b/src/DecoderPlugin.cxx @@ -0,0 +1,47 @@ +/* + * 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. + */ + +#include "config.h" +#include "decoder_plugin.h" +#include "string_util.h" + +#include + +bool +decoder_plugin_supports_suffix(const struct decoder_plugin *plugin, + const char *suffix) +{ + assert(plugin != nullptr); + assert(suffix != nullptr); + + return plugin->suffixes != nullptr && + string_array_contains(plugin->suffixes, suffix); + +} + +bool +decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin, + const char *mime_type) +{ + assert(plugin != nullptr); + assert(mime_type != nullptr); + + return plugin->mime_types != nullptr && + string_array_contains(plugin->mime_types, mime_type); +} diff --git a/src/decoder_plugin.c b/src/decoder_plugin.c deleted file mode 100644 index d32043f0e..000000000 --- a/src/decoder_plugin.c +++ /dev/null @@ -1,47 +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. - */ - -#include "config.h" -#include "decoder_plugin.h" -#include "string_util.h" - -#include - -bool -decoder_plugin_supports_suffix(const struct decoder_plugin *plugin, - const char *suffix) -{ - assert(plugin != NULL); - assert(suffix != NULL); - - return plugin->suffixes != NULL && - string_array_contains(plugin->suffixes, suffix); - -} - -bool -decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin, - const char *mime_type) -{ - assert(plugin != NULL); - assert(mime_type != NULL); - - return plugin->mime_types != NULL && - string_array_contains(plugin->mime_types, mime_type); -} -- cgit v1.2.3