From 86c276f5383d5362ae65e58fe5ea522f907ed724 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 17 Apr 2013 00:56:09 +0200 Subject: output/ao: convert to C++ --- Makefile.am | 2 +- src/OutputList.cxx | 2 +- src/output/AoOutputPlugin.cxx | 289 ++++++++++++++++++++++++++++++++++++++++++ src/output/AoOutputPlugin.hxx | 25 ++++ src/output/ao_output_plugin.c | 264 -------------------------------------- src/output/ao_output_plugin.h | 25 ---- 6 files changed, 316 insertions(+), 291 deletions(-) create mode 100644 src/output/AoOutputPlugin.cxx create mode 100644 src/output/AoOutputPlugin.hxx delete mode 100644 src/output/ao_output_plugin.c delete mode 100644 src/output/ao_output_plugin.h diff --git a/Makefile.am b/Makefile.am index c07e17194..57f668578 100644 --- a/Makefile.am +++ b/Makefile.am @@ -817,7 +817,7 @@ endif if HAVE_AO liboutput_plugins_a_SOURCES += \ - src/output/ao_output_plugin.c src/output/ao_output_plugin.h + src/output/AoOutputPlugin.cxx src/output/AoOutputPlugin.hxx endif if HAVE_FIFO diff --git a/src/OutputList.cxx b/src/OutputList.cxx index fa7d1091c..c754d5ff2 100644 --- a/src/OutputList.cxx +++ b/src/OutputList.cxx @@ -21,7 +21,7 @@ #include "OutputList.hxx" #include "output_api.h" #include "output/AlsaOutputPlugin.hxx" -#include "output/ao_output_plugin.h" +#include "output/AoOutputPlugin.hxx" #include "output/FifoOutputPlugin.hxx" #include "output/HttpdOutputPlugin.hxx" #include "output/JackOutputPlugin.hxx" diff --git a/src/output/AoOutputPlugin.cxx b/src/output/AoOutputPlugin.cxx new file mode 100644 index 000000000..c6ee6a2ea --- /dev/null +++ b/src/output/AoOutputPlugin.cxx @@ -0,0 +1,289 @@ +/* + * 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. + */ + +#include "config.h" +#include "AoOutputPlugin.hxx" +#include "output_api.h" + +#include +#include + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "ao" + +/* An ao_sample_format, with all fields set to zero: */ +static ao_sample_format OUR_AO_FORMAT_INITIALIZER; + +static unsigned ao_output_ref; + +struct AoOutput { + struct audio_output base; + + size_t write_size; + int driver; + ao_option *options; + ao_device *device; + + bool Initialize(const config_param *param, GError **error_r) { + return ao_base_init(&base, &ao_output_plugin, param, + error_r); + } + + void Deinitialize() { + ao_base_finish(&base); + } + + bool Configure(const config_param *param, GError **error_r); +}; + +static inline GQuark +ao_output_quark(void) +{ + return g_quark_from_static_string("ao_output"); +} + +static void +ao_output_error(GError **error_r) +{ + const char *error; + + switch (errno) { + case AO_ENODRIVER: + error = "No such libao driver"; + break; + + case AO_ENOTLIVE: + error = "This driver is not a libao live device"; + break; + + case AO_EBADOPTION: + error = "Invalid libao option"; + break; + + case AO_EOPENDEVICE: + error = "Cannot open the libao device"; + break; + + case AO_EFAIL: + error = "Generic libao failure"; + break; + + default: + error = g_strerror(errno); + } + + g_set_error(error_r, ao_output_quark(), errno, + "%s", error); +} + +inline bool +AoOutput::Configure(const config_param *param, GError **error_r) +{ + const char *value; + + options = nullptr; + + write_size = config_get_block_unsigned(param, "write_size", 1024); + + if (ao_output_ref == 0) { + ao_initialize(); + } + ao_output_ref++; + + value = config_get_block_string(param, "driver", "default"); + if (0 == strcmp(value, "default")) + driver = ao_default_driver_id(); + else + driver = ao_driver_id(value); + + if (driver < 0) { + g_set_error(error_r, ao_output_quark(), 0, + "\"%s\" is not a valid ao driver", + value); + return false; + } + + ao_info *ai = ao_driver_info(driver); + if (ai == nullptr) { + g_set_error(error_r, ao_output_quark(), 0, + "problems getting driver info"); + return false; + } + + g_debug("using ao driver \"%s\" for \"%s\"\n", ai->short_name, + config_get_block_string(param, "name", nullptr)); + + value = config_get_block_string(param, "options", nullptr); + if (value != nullptr) { + gchar **_options = g_strsplit(value, ";", 0); + + for (unsigned i = 0; _options[i] != nullptr; ++i) { + gchar **key_value = g_strsplit(_options[i], "=", 2); + + if (key_value[0] == nullptr || key_value[1] == nullptr) { + g_set_error(error_r, ao_output_quark(), 0, + "problems parsing options \"%s\"", + _options[i]); + return false; + } + + ao_append_option(&options, key_value[0], + key_value[1]); + + g_strfreev(key_value); + } + + g_strfreev(_options); + } + + return true; +} + +static struct audio_output * +ao_output_init(const config_param *param, GError **error_r) +{ + AoOutput *ad = new AoOutput(); + + if (!ad->Initialize(param, error_r)) { + delete ad; + return nullptr; + } + + if (!ad->Configure(param, error_r)) { + ad->Deinitialize(); + delete ad; + return nullptr; + } + + return &ad->base; +} + +static void +ao_output_finish(struct audio_output *ao) +{ + AoOutput *ad = (AoOutput *)ao; + + ao_free_options(ad->options); + ad->Deinitialize(); + delete ad; + + ao_output_ref--; + + if (ao_output_ref == 0) + ao_shutdown(); +} + +static void +ao_output_close(struct audio_output *ao) +{ + AoOutput *ad = (AoOutput *)ao; + + ao_close(ad->device); +} + +static bool +ao_output_open(struct audio_output *ao, struct audio_format *audio_format, + GError **error) +{ + ao_sample_format format = OUR_AO_FORMAT_INITIALIZER; + AoOutput *ad = (AoOutput *)ao; + + switch (audio_format->format) { + case SAMPLE_FORMAT_S8: + format.bits = 8; + break; + + case SAMPLE_FORMAT_S16: + format.bits = 16; + break; + + default: + /* support for 24 bit samples in libao is currently + dubious, and until we have sorted that out, + convert everything to 16 bit */ + audio_format->format = SAMPLE_FORMAT_S16; + format.bits = 16; + break; + } + + format.rate = audio_format->sample_rate; + format.byte_format = AO_FMT_NATIVE; + format.channels = audio_format->channels; + + ad->device = ao_open_live(ad->driver, &format, ad->options); + + if (ad->device == nullptr) { + ao_output_error(error); + return false; + } + + return true; +} + +/** + * For whatever reason, libao wants a non-const pointer. Let's hope + * it does not write to the buffer, and use the union deconst hack to + * work around this API misdesign. + */ +static int ao_play_deconst(ao_device *device, const void *output_samples, + uint_32 num_bytes) +{ + union { + const void *in; + char *out; + } u; + + u.in = output_samples; + return ao_play(device, u.out, num_bytes); +} + +static size_t +ao_output_play(struct audio_output *ao, const void *chunk, size_t size, + GError **error) +{ + AoOutput *ad = (AoOutput *)ao; + + if (size > ad->write_size) + size = ad->write_size; + + if (ao_play_deconst(ad->device, chunk, size) == 0) { + ao_output_error(error); + return 0; + } + + return size; +} + +const struct audio_output_plugin ao_output_plugin = { + "ao", + nullptr, + ao_output_init, + ao_output_finish, + nullptr, + nullptr, + ao_output_open, + ao_output_close, + nullptr, + nullptr, + ao_output_play, + nullptr, + nullptr, + nullptr, + nullptr, +}; diff --git a/src/output/AoOutputPlugin.hxx b/src/output/AoOutputPlugin.hxx new file mode 100644 index 000000000..a44885e56 --- /dev/null +++ b/src/output/AoOutputPlugin.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_AO_OUTPUT_PLUGIN_HXX +#define MPD_AO_OUTPUT_PLUGIN_HXX + +extern const struct audio_output_plugin ao_output_plugin; + +#endif diff --git a/src/output/ao_output_plugin.c b/src/output/ao_output_plugin.c deleted file mode 100644 index d7e577fa4..000000000 --- a/src/output/ao_output_plugin.c +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Copyright (C) 2003-2011 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. - */ - -#include "config.h" -#include "ao_output_plugin.h" -#include "output_api.h" - -#include -#include - -#undef G_LOG_DOMAIN -#define G_LOG_DOMAIN "ao" - -/* An ao_sample_format, with all fields set to zero: */ -static const ao_sample_format OUR_AO_FORMAT_INITIALIZER; - -static unsigned ao_output_ref; - -struct ao_data { - struct audio_output base; - - size_t write_size; - int driver; - ao_option *options; - ao_device *device; -} AoData; - -static inline GQuark -ao_output_quark(void) -{ - return g_quark_from_static_string("ao_output"); -} - -static void -ao_output_error(GError **error_r) -{ - const char *error; - - switch (errno) { - case AO_ENODRIVER: - error = "No such libao driver"; - break; - - case AO_ENOTLIVE: - error = "This driver is not a libao live device"; - break; - - case AO_EBADOPTION: - error = "Invalid libao option"; - break; - - case AO_EOPENDEVICE: - error = "Cannot open the libao device"; - break; - - case AO_EFAIL: - error = "Generic libao failure"; - break; - - default: - error = g_strerror(errno); - } - - g_set_error(error_r, ao_output_quark(), errno, - "%s", error); -} - -static struct audio_output * -ao_output_init(const struct config_param *param, - GError **error) -{ - struct ao_data *ad = g_new(struct ao_data, 1); - - if (!ao_base_init(&ad->base, &ao_output_plugin, param, error)) { - g_free(ad); - return NULL; - } - - ao_info *ai; - const char *value; - - ad->options = NULL; - - ad->write_size = config_get_block_unsigned(param, "write_size", 1024); - - if (ao_output_ref == 0) { - ao_initialize(); - } - ao_output_ref++; - - value = config_get_block_string(param, "driver", "default"); - if (0 == strcmp(value, "default")) - ad->driver = ao_default_driver_id(); - else - ad->driver = ao_driver_id(value); - - if (ad->driver < 0) { - g_set_error(error, ao_output_quark(), 0, - "\"%s\" is not a valid ao driver", - value); - ao_base_finish(&ad->base); - g_free(ad); - return NULL; - } - - if ((ai = ao_driver_info(ad->driver)) == NULL) { - g_set_error(error, ao_output_quark(), 0, - "problems getting driver info"); - ao_base_finish(&ad->base); - g_free(ad); - return NULL; - } - - g_debug("using ao driver \"%s\" for \"%s\"\n", ai->short_name, - config_get_block_string(param, "name", NULL)); - - value = config_get_block_string(param, "options", NULL); - if (value != NULL) { - gchar **options = g_strsplit(value, ";", 0); - - for (unsigned i = 0; options[i] != NULL; ++i) { - gchar **key_value = g_strsplit(options[i], "=", 2); - - if (key_value[0] == NULL || key_value[1] == NULL) { - g_set_error(error, ao_output_quark(), 0, - "problems parsing options \"%s\"", - options[i]); - ao_base_finish(&ad->base); - g_free(ad); - return NULL; - } - - ao_append_option(&ad->options, key_value[0], - key_value[1]); - - g_strfreev(key_value); - } - - g_strfreev(options); - } - - return &ad->base; -} - -static void -ao_output_finish(struct audio_output *ao) -{ - struct ao_data *ad = (struct ao_data *)ao; - - ao_free_options(ad->options); - ao_base_finish(&ad->base); - g_free(ad); - - ao_output_ref--; - - if (ao_output_ref == 0) - ao_shutdown(); -} - -static void -ao_output_close(struct audio_output *ao) -{ - struct ao_data *ad = (struct ao_data *)ao; - - ao_close(ad->device); -} - -static bool -ao_output_open(struct audio_output *ao, struct audio_format *audio_format, - GError **error) -{ - ao_sample_format format = OUR_AO_FORMAT_INITIALIZER; - struct ao_data *ad = (struct ao_data *)ao; - - switch (audio_format->format) { - case SAMPLE_FORMAT_S8: - format.bits = 8; - break; - - case SAMPLE_FORMAT_S16: - format.bits = 16; - break; - - default: - /* support for 24 bit samples in libao is currently - dubious, and until we have sorted that out, - convert everything to 16 bit */ - audio_format->format = SAMPLE_FORMAT_S16; - format.bits = 16; - break; - } - - format.rate = audio_format->sample_rate; - format.byte_format = AO_FMT_NATIVE; - format.channels = audio_format->channels; - - ad->device = ao_open_live(ad->driver, &format, ad->options); - - if (ad->device == NULL) { - ao_output_error(error); - return false; - } - - return true; -} - -/** - * For whatever reason, libao wants a non-const pointer. Let's hope - * it does not write to the buffer, and use the union deconst hack to - * work around this API misdesign. - */ -static int ao_play_deconst(ao_device *device, const void *output_samples, - uint_32 num_bytes) -{ - union { - const void *in; - void *out; - } u; - - u.in = output_samples; - return ao_play(device, u.out, num_bytes); -} - -static size_t -ao_output_play(struct audio_output *ao, const void *chunk, size_t size, - GError **error) -{ - struct ao_data *ad = (struct ao_data *)ao; - - if (size > ad->write_size) - size = ad->write_size; - - if (ao_play_deconst(ad->device, chunk, size) == 0) { - ao_output_error(error); - return 0; - } - - return size; -} - -const struct audio_output_plugin ao_output_plugin = { - .name = "ao", - .init = ao_output_init, - .finish = ao_output_finish, - .open = ao_output_open, - .close = ao_output_close, - .play = ao_output_play, -}; diff --git a/src/output/ao_output_plugin.h b/src/output/ao_output_plugin.h deleted file mode 100644 index 9a3a47c05..000000000 --- a/src/output/ao_output_plugin.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2003-2011 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_AO_OUTPUT_PLUGIN_H -#define MPD_AO_OUTPUT_PLUGIN_H - -extern const struct audio_output_plugin ao_output_plugin; - -#endif -- cgit v1.2.3