output/recorder: convert to C++
This commit is contained in:
Max Kellermann
parent
ac9ebe1439
commit
f1034eb657
@ -879,7 +879,7 @@ endif
|
||||
|
||||
if ENABLE_RECORDER_OUTPUT
|
||||
liboutput_plugins_a_SOURCES += \
|
||||
src/output/recorder_output_plugin.c src/output/recorder_output_plugin.h
|
||||
src/output/RecorderOutputPlugin.cxx src/output/RecorderOutputPlugin.hxx
|
||||
endif
|
||||
|
||||
if ENABLE_HTTPD_OUTPUT
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include "output/OSXOutputPlugin.hxx"
|
||||
#include "output/pipe_output_plugin.h"
|
||||
#include "output/PulseOutputPlugin.hxx"
|
||||
#include "output/recorder_output_plugin.h"
|
||||
#include "output/RecorderOutputPlugin.hxx"
|
||||
#include "output/RoarOutputPlugin.hxx"
|
||||
#include "output/shout_output_plugin.h"
|
||||
#include "output/solaris_output_plugin.h"
|
||||
|
||||
@ -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,7 +18,7 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "recorder_output_plugin.h"
|
||||
#include "RecorderOutputPlugin.hxx"
|
||||
#include "output_api.h"
|
||||
#include "encoder_plugin.h"
|
||||
#include "encoder_list.h"
|
||||
@ -34,7 +34,7 @@
|
||||
#undef G_LOG_DOMAIN
|
||||
#define G_LOG_DOMAIN "recorder"
|
||||
|
||||
struct recorder_output {
|
||||
struct RecorderOutput {
|
||||
struct audio_output base;
|
||||
|
||||
/**
|
||||
@ -56,6 +56,24 @@ struct recorder_output {
|
||||
* The buffer for encoder_read().
|
||||
*/
|
||||
char buffer[32768];
|
||||
|
||||
bool Initialize(const config_param *param, GError **error_r) {
|
||||
return ao_base_init(&base, &recorder_output_plugin, param,
|
||||
error_r);
|
||||
}
|
||||
|
||||
void Deinitialize() {
|
||||
ao_base_finish(&base);
|
||||
}
|
||||
|
||||
bool Configure(const config_param *param, GError **error_r);
|
||||
|
||||
bool WriteToFile(const void *data, size_t length, GError **error_r);
|
||||
|
||||
/**
|
||||
* Writes pending data from the encoder to the output file.
|
||||
*/
|
||||
bool EncoderToFile(GError **error_r);
|
||||
};
|
||||
|
||||
/**
|
||||
@ -67,68 +85,71 @@ recorder_output_quark(void)
|
||||
return g_quark_from_static_string("recorder_output");
|
||||
}
|
||||
|
||||
static struct audio_output *
|
||||
recorder_output_init(const struct config_param *param, GError **error_r)
|
||||
inline bool
|
||||
RecorderOutput::Configure(const config_param *param, GError **error_r)
|
||||
{
|
||||
struct recorder_output *recorder = g_new(struct recorder_output, 1);
|
||||
if (!ao_base_init(&recorder->base, &recorder_output_plugin, param,
|
||||
error_r)) {
|
||||
g_free(recorder);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* read configuration */
|
||||
|
||||
const char *encoder_name =
|
||||
config_get_block_string(param, "encoder", "vorbis");
|
||||
const struct encoder_plugin *encoder_plugin =
|
||||
encoder_plugin_get(encoder_name);
|
||||
if (encoder_plugin == NULL) {
|
||||
if (encoder_plugin == nullptr) {
|
||||
g_set_error(error_r, recorder_output_quark(), 0,
|
||||
"No such encoder: %s", encoder_name);
|
||||
goto failure;
|
||||
return false;
|
||||
}
|
||||
|
||||
recorder->path = config_get_block_string(param, "path", NULL);
|
||||
if (recorder->path == NULL) {
|
||||
path = config_get_block_string(param, "path", nullptr);
|
||||
if (path == nullptr) {
|
||||
g_set_error(error_r, recorder_output_quark(), 0,
|
||||
"'path' not configured");
|
||||
goto failure;
|
||||
return false;
|
||||
}
|
||||
|
||||
/* initialize encoder */
|
||||
|
||||
recorder->encoder = encoder_init(encoder_plugin, param, error_r);
|
||||
if (recorder->encoder == NULL)
|
||||
goto failure;
|
||||
encoder = encoder_init(encoder_plugin, param, error_r);
|
||||
if (encoder == nullptr)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static audio_output *
|
||||
recorder_output_init(const config_param *param, GError **error_r)
|
||||
{
|
||||
RecorderOutput *recorder = new RecorderOutput();
|
||||
|
||||
if (!recorder->Initialize(param, error_r)) {
|
||||
delete recorder;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (!recorder->Configure(param, error_r)) {
|
||||
recorder->Deinitialize();
|
||||
delete recorder;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return &recorder->base;
|
||||
|
||||
failure:
|
||||
ao_base_finish(&recorder->base);
|
||||
g_free(recorder);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
recorder_output_finish(struct audio_output *ao)
|
||||
{
|
||||
struct recorder_output *recorder = (struct recorder_output *)ao;
|
||||
RecorderOutput *recorder = (RecorderOutput *)ao;
|
||||
|
||||
encoder_finish(recorder->encoder);
|
||||
ao_base_finish(&recorder->base);
|
||||
g_free(recorder);
|
||||
recorder->Deinitialize();
|
||||
delete recorder;
|
||||
}
|
||||
|
||||
static bool
|
||||
recorder_write_to_file(struct recorder_output *recorder,
|
||||
const void *_data, size_t length,
|
||||
GError **error_r)
|
||||
inline bool
|
||||
RecorderOutput::WriteToFile(const void *_data, size_t length, GError **error_r)
|
||||
{
|
||||
assert(length > 0);
|
||||
|
||||
const int fd = recorder->fd;
|
||||
|
||||
const uint8_t *data = (const uint8_t *)_data, *end = data + length;
|
||||
|
||||
while (true) {
|
||||
@ -145,33 +166,27 @@ recorder_write_to_file(struct recorder_output *recorder,
|
||||
} else if (errno != EINTR) {
|
||||
g_set_error(error_r, recorder_output_quark(), 0,
|
||||
"Failed to write to '%s': %s",
|
||||
recorder->path, g_strerror(errno));
|
||||
path, g_strerror(errno));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes pending data from the encoder to the output file.
|
||||
*/
|
||||
static bool
|
||||
recorder_output_encoder_to_file(struct recorder_output *recorder,
|
||||
GError **error_r)
|
||||
inline bool
|
||||
RecorderOutput::EncoderToFile(GError **error_r)
|
||||
{
|
||||
assert(recorder->fd >= 0);
|
||||
assert(fd >= 0);
|
||||
|
||||
while (true) {
|
||||
/* read from the encoder */
|
||||
|
||||
size_t size = encoder_read(recorder->encoder, recorder->buffer,
|
||||
sizeof(recorder->buffer));
|
||||
size_t size = encoder_read(encoder, buffer, sizeof(buffer));
|
||||
if (size == 0)
|
||||
return true;
|
||||
|
||||
/* write everything into the file */
|
||||
|
||||
if (!recorder_write_to_file(recorder, recorder->buffer, size,
|
||||
error_r))
|
||||
if (!WriteToFile(buffer, size, error_r))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -181,7 +196,7 @@ recorder_output_open(struct audio_output *ao,
|
||||
struct audio_format *audio_format,
|
||||
GError **error_r)
|
||||
{
|
||||
struct recorder_output *recorder = (struct recorder_output *)ao;
|
||||
RecorderOutput *recorder = (RecorderOutput *)ao;
|
||||
|
||||
/* create the output file */
|
||||
|
||||
@ -203,7 +218,7 @@ recorder_output_open(struct audio_output *ao,
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!recorder_output_encoder_to_file(recorder, error_r)) {
|
||||
if (!recorder->EncoderToFile(error_r)) {
|
||||
encoder_close(recorder->encoder);
|
||||
close(recorder->fd);
|
||||
unlink(recorder->path);
|
||||
@ -216,12 +231,12 @@ recorder_output_open(struct audio_output *ao,
|
||||
static void
|
||||
recorder_output_close(struct audio_output *ao)
|
||||
{
|
||||
struct recorder_output *recorder = (struct recorder_output *)ao;
|
||||
RecorderOutput *recorder = (RecorderOutput *)ao;
|
||||
|
||||
/* flush the encoder and write the rest to the file */
|
||||
|
||||
if (encoder_end(recorder->encoder, NULL))
|
||||
recorder_output_encoder_to_file(recorder, NULL);
|
||||
if (encoder_end(recorder->encoder, nullptr))
|
||||
recorder->EncoderToFile(nullptr);
|
||||
|
||||
/* now really close everything */
|
||||
|
||||
@ -234,18 +249,27 @@ static size_t
|
||||
recorder_output_play(struct audio_output *ao, const void *chunk, size_t size,
|
||||
GError **error_r)
|
||||
{
|
||||
struct recorder_output *recorder = (struct recorder_output *)ao;
|
||||
RecorderOutput *recorder = (RecorderOutput *)ao;
|
||||
|
||||
return encoder_write(recorder->encoder, chunk, size, error_r) &&
|
||||
recorder_output_encoder_to_file(recorder, error_r)
|
||||
recorder->EncoderToFile(error_r)
|
||||
? size : 0;
|
||||
}
|
||||
|
||||
const struct audio_output_plugin recorder_output_plugin = {
|
||||
.name = "recorder",
|
||||
.init = recorder_output_init,
|
||||
.finish = recorder_output_finish,
|
||||
.open = recorder_output_open,
|
||||
.close = recorder_output_close,
|
||||
.play = recorder_output_play,
|
||||
"recorder",
|
||||
nullptr,
|
||||
recorder_output_init,
|
||||
recorder_output_finish,
|
||||
nullptr,
|
||||
nullptr,
|
||||
recorder_output_open,
|
||||
recorder_output_close,
|
||||
nullptr,
|
||||
nullptr,
|
||||
recorder_output_play,
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
nullptr,
|
||||
};
|
||||
@ -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_RECORDER_OUTPUT_PLUGIN_H
|
||||
#define MPD_RECORDER_OUTPUT_PLUGIN_H
|
||||
#ifndef MPD_RECORDER_OUTPUT_PLUGIN_HXX
|
||||
#define MPD_RECORDER_OUTPUT_PLUGIN_HXX
|
||||
|
||||
extern const struct audio_output_plugin recorder_output_plugin;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user