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

decoder_plugin: convert to C++

This commit is contained in:
Max Kellermann 2013-04-09 00:20:49 +02:00
parent 450c26c471
commit 6728b8c1a3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -460,7 +460,7 @@ libdecoder_plugins_a_SOURCES = \
src/decoder/dsdlib.c \ src/decoder/dsdlib.c \
src/decoder/dsdlib.h \ src/decoder/dsdlib.h \
src/decoder_buffer.c \ src/decoder_buffer.c \
src/decoder_plugin.c \ src/DecoderPlugin.cxx \
src/DecoderList.cxx src/DecoderList.hxx src/DecoderList.cxx src/DecoderList.hxx
libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \ $(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \

14
src/decoder_plugin.c → src/DecoderPlugin.cxx
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 * 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
@ -27,10 +27,10 @@ bool
decoder_plugin_supports_suffix(const struct decoder_plugin *plugin, decoder_plugin_supports_suffix(const struct decoder_plugin *plugin,
const char *suffix) const char *suffix)
{ {
assert(plugin != NULL); assert(plugin != nullptr);
assert(suffix != NULL); assert(suffix != nullptr);
return plugin->suffixes != NULL && return plugin->suffixes != nullptr &&
string_array_contains(plugin->suffixes, suffix); string_array_contains(plugin->suffixes, suffix);
} }
@ -39,9 +39,9 @@ bool
decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin, decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin,
const char *mime_type) const char *mime_type)
{ {
assert(plugin != NULL); assert(plugin != nullptr);
assert(mime_type != NULL); assert(mime_type != nullptr);
return plugin->mime_types != NULL && return plugin->mime_types != nullptr &&
string_array_contains(plugin->mime_types, mime_type); string_array_contains(plugin->mime_types, mime_type);
} }