aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-30 08:43:19 +0200
committerMax Kellermann <max@duempel.org>2013-07-30 08:43:19 +0200
commitdac740ee17aaaa368a9562db30bb687d700dbe1c (patch)
tree0dcbcc20553f99df454f30a3fca6b26ca19e5494
parent28030d7edbedcb3615c451a3d186e133ebeaeee1 (diff)
downloadmpd-dac740ee17aaaa368a9562db30bb687d700dbe1c.tar.gz
mpd-dac740ee17aaaa368a9562db30bb687d700dbe1c.tar.xz
mpd-dac740ee17aaaa368a9562db30bb687d700dbe1c.zip
encoder/null: convert to C++
-rw-r--r--Makefile.am2
-rw-r--r--src/EncoderList.cxx2
-rw-r--r--src/encoder/NullEncoderPlugin.cxx (renamed from src/encoder/null_encoder.c)53
-rw-r--r--src/encoder/NullEncoderPlugin.hxx25
4 files changed, 56 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am
index 854a147e1..20a631ab0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -640,7 +640,7 @@ ENCODER_LIBS = \
libencoder_plugins_a_SOURCES = \
src/encoder/OggStream.hxx \
- src/encoder/null_encoder.c \
+ src/encoder/NullEncoderPlugin.cxx src/encoder/NullEncoderPlugin.hxx \
src/EncoderList.cxx src/EncoderList.hxx
if ENABLE_WAVE_ENCODER
diff --git a/src/EncoderList.cxx b/src/EncoderList.cxx
index db6a69a88..6c338bd36 100644
--- a/src/EncoderList.cxx
+++ b/src/EncoderList.cxx
@@ -20,13 +20,13 @@
#include "config.h"
#include "EncoderList.hxx"
#include "encoder_plugin.h"
+#include "encoder/NullEncoderPlugin.hxx"
#include "encoder/VorbisEncoderPlugin.hxx"
#include "encoder/OpusEncoderPlugin.hxx"
#include "encoder/FlacEncoderPlugin.hxx"
#include <string.h>
-extern const struct encoder_plugin null_encoder_plugin;
extern const struct encoder_plugin lame_encoder_plugin;
extern const struct encoder_plugin twolame_encoder_plugin;
extern const struct encoder_plugin wave_encoder_plugin;
diff --git a/src/encoder/null_encoder.c b/src/encoder/NullEncoderPlugin.cxx
index b973adf76..bdfab1563 100644
--- a/src/encoder/null_encoder.c
+++ b/src/encoder/NullEncoderPlugin.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
@@ -18,10 +18,13 @@
*/
#include "config.h"
+#include "NullEncoderPlugin.hxx"
#include "encoder_api.h"
#include "encoder_plugin.h"
#include "util/fifo_buffer.h"
+extern "C" {
#include "util/growing_fifo.h"
+}
#include "gcc.h"
#include <glib.h>
@@ -29,38 +32,36 @@
#include <assert.h>
#include <string.h>
-struct null_encoder {
+struct NullEncoder final {
struct encoder encoder;
struct fifo_buffer *buffer;
-};
-extern const struct encoder_plugin null_encoder_plugin;
+ NullEncoder() {
+ encoder_struct_init(&encoder, &null_encoder_plugin);
+ }
+};
static struct encoder *
null_encoder_init(gcc_unused const struct config_param *param,
gcc_unused GError **error)
{
- struct null_encoder *encoder;
-
- encoder = g_new(struct null_encoder, 1);
- encoder_struct_init(&encoder->encoder, &null_encoder_plugin);
-
+ NullEncoder *encoder = new NullEncoder();
return &encoder->encoder;
}
static void
null_encoder_finish(struct encoder *_encoder)
{
- struct null_encoder *encoder = (struct null_encoder *)_encoder;
+ NullEncoder *encoder = (NullEncoder *)_encoder;
- g_free(encoder);
+ delete encoder;
}
static void
null_encoder_close(struct encoder *_encoder)
{
- struct null_encoder *encoder = (struct null_encoder *)_encoder;
+ NullEncoder *encoder = (NullEncoder *)_encoder;
fifo_buffer_free(encoder->buffer);
}
@@ -71,8 +72,7 @@ null_encoder_open(struct encoder *_encoder,
gcc_unused struct audio_format *audio_format,
gcc_unused GError **error)
{
- struct null_encoder *encoder = (struct null_encoder *)_encoder;
-
+ NullEncoder *encoder = (NullEncoder *)_encoder;
encoder->buffer = growing_fifo_new();
return true;
}
@@ -82,7 +82,7 @@ null_encoder_write(struct encoder *_encoder,
const void *data, size_t length,
gcc_unused GError **error)
{
- struct null_encoder *encoder = (struct null_encoder *)_encoder;
+ NullEncoder *encoder = (NullEncoder *)_encoder;
growing_fifo_append(&encoder->buffer, data, length);
return length;
@@ -91,11 +91,11 @@ null_encoder_write(struct encoder *_encoder,
static size_t
null_encoder_read(struct encoder *_encoder, void *dest, size_t length)
{
- struct null_encoder *encoder = (struct null_encoder *)_encoder;
+ NullEncoder *encoder = (NullEncoder *)_encoder;
size_t max_length;
const void *src = fifo_buffer_read(encoder->buffer, &max_length);
- if (src == NULL)
+ if (src == nullptr)
return 0;
if (length > max_length)
@@ -107,11 +107,16 @@ null_encoder_read(struct encoder *_encoder, void *dest, size_t length)
}
const struct encoder_plugin null_encoder_plugin = {
- .name = "null",
- .init = null_encoder_init,
- .finish = null_encoder_finish,
- .open = null_encoder_open,
- .close = null_encoder_close,
- .write = null_encoder_write,
- .read = null_encoder_read,
+ "null",
+ null_encoder_init,
+ null_encoder_finish,
+ null_encoder_open,
+ null_encoder_close,
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr,
+ null_encoder_write,
+ null_encoder_read,
+ nullptr,
};
diff --git a/src/encoder/NullEncoderPlugin.hxx b/src/encoder/NullEncoderPlugin.hxx
new file mode 100644
index 000000000..bf2cfee60
--- /dev/null
+++ b/src/encoder/NullEncoderPlugin.hxx
@@ -0,0 +1,25 @@
+/*
+ * 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_ENCODER_NULL_HXX
+#define MPD_ENCODER_NULL_HXX
+
+extern const struct encoder_plugin null_encoder_plugin;
+
+#endif