diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/OutputList.cxx | 2 | ||||
| -rw-r--r-- | src/output/PipeOutputPlugin.cxx (renamed from src/output/pipe_output_plugin.c) | 85 | ||||
| -rw-r--r-- | src/output/PipeOutputPlugin.hxx (renamed from src/output/pipe_output_plugin.h) | 6 |
4 files changed, 63 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index 0cff7c13a..dbc069670 100644 --- a/Makefile.am +++ b/Makefile.am @@ -834,7 +834,7 @@ endif if ENABLE_PIPE_OUTPUT liboutput_plugins_a_SOURCES += \ - src/output/pipe_output_plugin.c src/output/pipe_output_plugin.h + src/output/PipeOutputPlugin.cxx src/output/PipeOutputPlugin.hxx endif if HAVE_JACK diff --git a/src/OutputList.cxx b/src/OutputList.cxx index b296157a9..6e72a8772 100644 --- a/src/OutputList.cxx +++ b/src/OutputList.cxx @@ -31,7 +31,7 @@ #include "output/openal_output_plugin.h" #include "output/OssOutputPlugin.hxx" #include "output/OSXOutputPlugin.hxx" -#include "output/pipe_output_plugin.h" +#include "output/PipeOutputPlugin.hxx" #include "output/PulseOutputPlugin.hxx" #include "output/RecorderOutputPlugin.hxx" #include "output/RoarOutputPlugin.hxx" diff --git a/src/output/pipe_output_plugin.c b/src/output/PipeOutputPlugin.cxx index 90c5a5331..7a60eae4e 100644 --- a/src/output/pipe_output_plugin.c +++ b/src/output/PipeOutputPlugin.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,17 +18,28 @@ */ #include "config.h" -#include "pipe_output_plugin.h" +#include "PipeOutputPlugin.hxx" #include "output_api.h" #include <stdio.h> #include <errno.h> -struct pipe_output { +struct PipeOutput { struct audio_output base; char *cmd; FILE *fh; + + bool Initialize(const config_param *param, GError **error_r) { + return ao_base_init(&base, &pipe_output_plugin, param, + error_r); + } + + void Deinitialize() { + ao_base_finish(&base); + } + + bool Configure(const config_param *param, GError **error_r); }; /** @@ -40,22 +51,33 @@ pipe_output_quark(void) return g_quark_from_static_string("pipe_output"); } +inline bool +PipeOutput::Configure(const config_param *param, GError **error_r) +{ + cmd = config_dup_block_string(param, "command", nullptr); + if (cmd == nullptr) { + g_set_error(error_r, pipe_output_quark(), 0, + "No \"command\" parameter specified"); + return false; + } + + return true; +} + static struct audio_output * -pipe_output_init(const struct config_param *param, - GError **error) +pipe_output_init(const config_param *param, GError **error_r) { - struct pipe_output *pd = g_new(struct pipe_output, 1); + PipeOutput *pd = new PipeOutput(); - if (!ao_base_init(&pd->base, &pipe_output_plugin, param, error)) { - g_free(pd); - return NULL; + if (!pd->Initialize(param, error_r)) { + delete pd; + return nullptr; } - pd->cmd = config_dup_block_string(param, "command", NULL); - if (pd->cmd == NULL) { - g_set_error(error, pipe_output_quark(), 0, - "No \"command\" parameter specified"); - return NULL; + if (!pd->Configure(param, error_r)) { + pd->Deinitialize(); + delete pd; + return nullptr; } return &pd->base; @@ -64,11 +86,11 @@ pipe_output_init(const struct config_param *param, static void pipe_output_finish(struct audio_output *ao) { - struct pipe_output *pd = (struct pipe_output *)ao; + PipeOutput *pd = (PipeOutput *)ao; g_free(pd->cmd); - ao_base_finish(&pd->base); - g_free(pd); + pd->Deinitialize(); + delete pd; } static bool @@ -76,10 +98,10 @@ pipe_output_open(struct audio_output *ao, G_GNUC_UNUSED struct audio_format *audio_format, G_GNUC_UNUSED GError **error) { - struct pipe_output *pd = (struct pipe_output *)ao; + PipeOutput *pd = (PipeOutput *)ao; pd->fh = popen(pd->cmd, "w"); - if (pd->fh == NULL) { + if (pd->fh == nullptr) { g_set_error(error, pipe_output_quark(), errno, "Error opening pipe \"%s\": %s", pd->cmd, g_strerror(errno)); @@ -92,7 +114,7 @@ pipe_output_open(struct audio_output *ao, static void pipe_output_close(struct audio_output *ao) { - struct pipe_output *pd = (struct pipe_output *)ao; + PipeOutput *pd = (PipeOutput *)ao; pclose(pd->fh); } @@ -100,7 +122,7 @@ pipe_output_close(struct audio_output *ao) static size_t pipe_output_play(struct audio_output *ao, const void *chunk, size_t size, GError **error) { - struct pipe_output *pd = (struct pipe_output *)ao; + PipeOutput *pd = (PipeOutput *)ao; size_t ret; ret = fwrite(chunk, 1, size, pd->fh); @@ -112,10 +134,19 @@ pipe_output_play(struct audio_output *ao, const void *chunk, size_t size, GError } const struct audio_output_plugin pipe_output_plugin = { - .name = "pipe", - .init = pipe_output_init, - .finish = pipe_output_finish, - .open = pipe_output_open, - .close = pipe_output_close, - .play = pipe_output_play, + "pipe", + nullptr, + pipe_output_init, + pipe_output_finish, + nullptr, + nullptr, + pipe_output_open, + pipe_output_close, + nullptr, + nullptr, + pipe_output_play, + nullptr, + nullptr, + nullptr, + nullptr, }; diff --git a/src/output/pipe_output_plugin.h b/src/output/PipeOutputPlugin.hxx index 9f014f829..f0c29706b 100644 --- a/src/output/pipe_output_plugin.h +++ b/src/output/PipeOutputPlugin.hxx @@ -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 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_PIPE_OUTPUT_PLUGIN_H -#define MPD_PIPE_OUTPUT_PLUGIN_H +#ifndef MPD_PIPE_OUTPUT_PLUGIN_HXX +#define MPD_PIPE_OUTPUT_PLUGIN_HXX extern const struct audio_output_plugin pipe_output_plugin; |