Commit dc415b76 authored by Max Kellermann's avatar Max Kellermann

output/pipe: convert to C++

parent f1034eb6
...@@ -834,7 +834,7 @@ endif ...@@ -834,7 +834,7 @@ endif
if ENABLE_PIPE_OUTPUT if ENABLE_PIPE_OUTPUT
liboutput_plugins_a_SOURCES += \ 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 endif
if HAVE_JACK if HAVE_JACK
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "output/openal_output_plugin.h" #include "output/openal_output_plugin.h"
#include "output/OssOutputPlugin.hxx" #include "output/OssOutputPlugin.hxx"
#include "output/OSXOutputPlugin.hxx" #include "output/OSXOutputPlugin.hxx"
#include "output/pipe_output_plugin.h" #include "output/PipeOutputPlugin.hxx"
#include "output/PulseOutputPlugin.hxx" #include "output/PulseOutputPlugin.hxx"
#include "output/RecorderOutputPlugin.hxx" #include "output/RecorderOutputPlugin.hxx"
#include "output/RoarOutputPlugin.hxx" #include "output/RoarOutputPlugin.hxx"
......
/* /*
* 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
...@@ -18,17 +18,28 @@ ...@@ -18,17 +18,28 @@
*/ */
#include "config.h" #include "config.h"
#include "pipe_output_plugin.h" #include "PipeOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
struct pipe_output { struct PipeOutput {
struct audio_output base; struct audio_output base;
char *cmd; char *cmd;
FILE *fh; 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) ...@@ -40,22 +51,33 @@ pipe_output_quark(void)
return g_quark_from_static_string("pipe_output"); 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 * static struct audio_output *
pipe_output_init(const struct config_param *param, pipe_output_init(const config_param *param, GError **error_r)
GError **error)
{ {
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)) { if (!pd->Initialize(param, error_r)) {
g_free(pd); delete pd;
return NULL; return nullptr;
} }
pd->cmd = config_dup_block_string(param, "command", NULL); if (!pd->Configure(param, error_r)) {
if (pd->cmd == NULL) { pd->Deinitialize();
g_set_error(error, pipe_output_quark(), 0, delete pd;
"No \"command\" parameter specified"); return nullptr;
return NULL;
} }
return &pd->base; return &pd->base;
...@@ -64,11 +86,11 @@ pipe_output_init(const struct config_param *param, ...@@ -64,11 +86,11 @@ pipe_output_init(const struct config_param *param,
static void static void
pipe_output_finish(struct audio_output *ao) pipe_output_finish(struct audio_output *ao)
{ {
struct pipe_output *pd = (struct pipe_output *)ao; PipeOutput *pd = (PipeOutput *)ao;
g_free(pd->cmd); g_free(pd->cmd);
ao_base_finish(&pd->base); pd->Deinitialize();
g_free(pd); delete pd;
} }
static bool static bool
...@@ -76,10 +98,10 @@ pipe_output_open(struct audio_output *ao, ...@@ -76,10 +98,10 @@ pipe_output_open(struct audio_output *ao,
G_GNUC_UNUSED struct audio_format *audio_format, G_GNUC_UNUSED struct audio_format *audio_format,
G_GNUC_UNUSED GError **error) G_GNUC_UNUSED GError **error)
{ {
struct pipe_output *pd = (struct pipe_output *)ao; PipeOutput *pd = (PipeOutput *)ao;
pd->fh = popen(pd->cmd, "w"); pd->fh = popen(pd->cmd, "w");
if (pd->fh == NULL) { if (pd->fh == nullptr) {
g_set_error(error, pipe_output_quark(), errno, g_set_error(error, pipe_output_quark(), errno,
"Error opening pipe \"%s\": %s", "Error opening pipe \"%s\": %s",
pd->cmd, g_strerror(errno)); pd->cmd, g_strerror(errno));
...@@ -92,7 +114,7 @@ pipe_output_open(struct audio_output *ao, ...@@ -92,7 +114,7 @@ pipe_output_open(struct audio_output *ao,
static void static void
pipe_output_close(struct audio_output *ao) pipe_output_close(struct audio_output *ao)
{ {
struct pipe_output *pd = (struct pipe_output *)ao; PipeOutput *pd = (PipeOutput *)ao;
pclose(pd->fh); pclose(pd->fh);
} }
...@@ -100,7 +122,7 @@ pipe_output_close(struct audio_output *ao) ...@@ -100,7 +122,7 @@ pipe_output_close(struct audio_output *ao)
static size_t static size_t
pipe_output_play(struct audio_output *ao, const void *chunk, size_t size, GError **error) 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; size_t ret;
ret = fwrite(chunk, 1, size, pd->fh); 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 ...@@ -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 = { const struct audio_output_plugin pipe_output_plugin = {
.name = "pipe", "pipe",
.init = pipe_output_init, nullptr,
.finish = pipe_output_finish, pipe_output_init,
.open = pipe_output_open, pipe_output_finish,
.close = pipe_output_close, nullptr,
.play = pipe_output_play, nullptr,
pipe_output_open,
pipe_output_close,
nullptr,
nullptr,
pipe_output_play,
nullptr,
nullptr,
nullptr,
nullptr,
}; };
/* /*
* 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
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_PIPE_OUTPUT_PLUGIN_H #ifndef MPD_PIPE_OUTPUT_PLUGIN_HXX
#define MPD_PIPE_OUTPUT_PLUGIN_H #define MPD_PIPE_OUTPUT_PLUGIN_HXX
extern const struct audio_output_plugin pipe_output_plugin; extern const struct audio_output_plugin pipe_output_plugin;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment