From 6728b8c1a386d82ac15137f82d693559a0d51a8f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 9 Apr 2013 00:20:49 +0200
Subject: [PATCH] decoder_plugin: convert to C++
---
Makefile.am | 2 +-
src/{decoder_plugin.c => DecoderPlugin.cxx} | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
rename src/{decoder_plugin.c => DecoderPlugin.cxx} (82%)
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/decoder_plugin.c b/src/DecoderPlugin.cxx
similarity index 82%
rename from src/decoder_plugin.c
rename to src/DecoderPlugin.cxx
index d32043f0e..ccea032de 100644
--- a/src/decoder_plugin.c
+++ b/src/DecoderPlugin.cxx
@@ -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
@@ -27,10 +27,10 @@ bool
decoder_plugin_supports_suffix(const struct decoder_plugin *plugin,
const char *suffix)
{
- assert(plugin != NULL);
- assert(suffix != NULL);
+ assert(plugin != nullptr);
+ assert(suffix != nullptr);
- return plugin->suffixes != NULL &&
+ return plugin->suffixes != nullptr &&
string_array_contains(plugin->suffixes, suffix);
}
@@ -39,9 +39,9 @@ bool
decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin,
const char *mime_type)
{
- assert(plugin != NULL);
- assert(mime_type != NULL);
+ assert(plugin != nullptr);
+ assert(mime_type != nullptr);
- return plugin->mime_types != NULL &&
+ return plugin->mime_types != nullptr &&
string_array_contains(plugin->mime_types, mime_type);
}