From bc4266bef8b4997332de706be28904d8b8f7d593 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 20 Oct 2009 21:05:11 +0200 Subject: pulse: renamed source files --- Makefile.am | 4 +- src/mixer/pulse_mixer.c | 382 --------------------------------------- src/mixer/pulse_mixer_plugin.c | 382 +++++++++++++++++++++++++++++++++++++++ src/mixer_list.h | 2 +- src/output/pulse_output_plugin.c | 183 +++++++++++++++++++ src/output/pulse_plugin.c | 181 ------------------- src/output_list.c | 4 +- 7 files changed, 570 insertions(+), 568 deletions(-) delete mode 100644 src/mixer/pulse_mixer.c create mode 100644 src/mixer/pulse_mixer_plugin.c create mode 100644 src/output/pulse_output_plugin.c delete mode 100644 src/output/pulse_plugin.c diff --git a/Makefile.am b/Makefile.am index 84261fa64..0282be27c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -622,8 +622,8 @@ OUTPUT_SRC += src/output/osx_plugin.c endif if HAVE_PULSE -OUTPUT_SRC += src/output/pulse_plugin.c -MIXER_SRC += src/mixer/pulse_mixer.c +OUTPUT_SRC += src/output/pulse_output_plugin.c +MIXER_SRC += src/mixer/pulse_mixer_plugin.c endif if HAVE_SHOUT diff --git a/src/mixer/pulse_mixer.c b/src/mixer/pulse_mixer.c deleted file mode 100644 index 5d9ce0475..000000000 --- a/src/mixer/pulse_mixer.c +++ /dev/null @@ -1,382 +0,0 @@ -/* - * Copyright (C) 2003-2009 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 "mixer_api.h" -#include "conf.h" - -#include -#include -#include - -#include - -#undef G_LOG_DOMAIN -#define G_LOG_DOMAIN "pulse_mixer" - -struct pulse_mixer { - struct mixer base; - - const char *server; - const char *sink; - const char *output_name; - - uint32_t index; - bool online; - - struct pa_context *context; - struct pa_threaded_mainloop *mainloop; - struct pa_cvolume volume; - -}; - -/** - * \brief waits for a pulseaudio operation to finish, frees it and - * unlocks the mainloop - * \param operation the operation to wait for - * \return true if operation has finished normally (DONE state), - * false otherwise - */ -static bool -pulse_wait_for_operation(struct pa_threaded_mainloop *mainloop, - struct pa_operation *operation) -{ - pa_operation_state_t state; - - assert(mainloop != NULL); - assert(operation != NULL); - - state = pa_operation_get_state(operation); - while (state == PA_OPERATION_RUNNING) { - pa_threaded_mainloop_wait(mainloop); - state = pa_operation_get_state(operation); - } - - pa_operation_unref(operation); - - return state == PA_OPERATION_DONE; -} - -static void -sink_input_cb(G_GNUC_UNUSED pa_context *context, const pa_sink_input_info *i, - int eol, void *userdata) -{ - - struct pulse_mixer *pm = userdata; - - if (eol) { - g_debug("eol error sink_input_cb"); - return; - } - - if (i == NULL) { - g_debug("Sink input callback failure"); - return; - } - - g_debug("sink input cb %s, index %d ",i->name,i->index); - - if (strcmp(i->name,pm->output_name) == 0) { - pm->index = i->index; - pm->online = true; - pm->volume = i->volume; - } else - g_debug("bad name"); -} - -static void -sink_input_vol(G_GNUC_UNUSED pa_context *context, const pa_sink_input_info *i, - int eol, void *userdata) -{ - - struct pulse_mixer *pm = userdata; - - if (eol) { - g_debug("eol error sink_input_vol"); - return; - } - - if (i == NULL) { - g_debug("Sink input callback failure"); - return; - } - - g_debug("sink input vol %s, index %d ", i->name, i->index); - - pm->volume = i->volume; - - pa_threaded_mainloop_signal(pm->mainloop, 0); -} - -static void -subscribe_cb(pa_context *c, pa_subscription_event_type_t t, - uint32_t idx, void *userdata) -{ - - struct pulse_mixer *pm = userdata; - - g_debug("subscribe call back"); - - switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { - case PA_SUBSCRIPTION_EVENT_SINK_INPUT: - if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == - PA_SUBSCRIPTION_EVENT_REMOVE && - pm->index == idx) - pm->online = false; - else { - pa_operation *o; - - o = pa_context_get_sink_input_info(c, idx, - sink_input_cb, pm); - if (o == NULL) { - g_debug("pa_context_get_sink_input_info() failed"); - return; - } - - pa_operation_unref(o); - } - - break; - } -} - -static void -context_state_cb(pa_context *context, void *userdata) -{ - struct pulse_mixer *pm = userdata; - - switch (pa_context_get_state(context)) { - case PA_CONTEXT_READY: { - pa_operation *o; - - pa_context_set_subscribe_callback(context, subscribe_cb, pm); - - o = pa_context_subscribe(context, - (pa_subscription_mask_t)PA_SUBSCRIPTION_MASK_SINK_INPUT, - NULL, NULL); - if (o == NULL) { - g_debug("pa_context_subscribe() failed"); - return; - } - - pa_operation_unref(o); - - o = pa_context_get_sink_input_info_list(context, - sink_input_cb, pm); - if (o == NULL) { - g_debug("pa_context_get_sink_input_info_list() failed"); - return; - } - - pa_operation_unref(o); - - pa_threaded_mainloop_signal(pm->mainloop, 0); - break; - } - - case PA_CONTEXT_UNCONNECTED: - case PA_CONTEXT_CONNECTING: - case PA_CONTEXT_AUTHORIZING: - case PA_CONTEXT_SETTING_NAME: - break; - case PA_CONTEXT_TERMINATED: - case PA_CONTEXT_FAILED: - pa_threaded_mainloop_signal(pm->mainloop, 0); - break; - } -} - - -static struct mixer * -pulse_mixer_init(const struct config_param *param) -{ - struct pulse_mixer *pm = g_new(struct pulse_mixer,1); - mixer_init(&pm->base, &pulse_mixer); - - pm->online = false; - - pm->server = config_get_block_string(param, "server", NULL); - pm->sink = config_get_block_string(param, "sink", NULL); - pm->output_name = config_get_block_string(param, "name", NULL); - - return &pm->base; -} - -static void -pulse_mixer_finish(struct mixer *data) -{ - struct pulse_mixer *pm = (struct pulse_mixer *) data; - - g_free(pm); -} - -static bool -pulse_mixer_setup(struct pulse_mixer *pm) -{ - pa_context_set_state_callback(pm->context, context_state_cb, pm); - - if (pa_context_connect(pm->context, pm->server, - (pa_context_flags_t)0, NULL) < 0) { - g_debug("context server fail"); - return false; - } - - pa_threaded_mainloop_lock(pm->mainloop); - - if (pa_threaded_mainloop_start(pm->mainloop) < 0) { - pa_threaded_mainloop_unlock(pm->mainloop); - g_debug("error start mainloop"); - return false; - } - - pa_threaded_mainloop_wait(pm->mainloop); - - if (pa_context_get_state(pm->context) != PA_CONTEXT_READY) { - pa_threaded_mainloop_unlock(pm->mainloop); - g_debug("error context not ready"); - return false; - } - - pa_threaded_mainloop_unlock(pm->mainloop); - - return true; -} - -static bool -pulse_mixer_open(struct mixer *data) -{ - struct pulse_mixer *pm = (struct pulse_mixer *) data; - - g_debug("pulse mixer open"); - - pm->index = 0; - pm->online = false; - - pm->mainloop = pa_threaded_mainloop_new(); - if (pm->mainloop == NULL) { - g_debug("failed mainloop"); - return false; - } - - pm->context = pa_context_new(pa_threaded_mainloop_get_api(pm->mainloop), - "Mixer mpd"); - if (pm->context == NULL) { - pa_threaded_mainloop_stop(pm->mainloop); - pa_threaded_mainloop_free(pm->mainloop); - g_debug("failed context"); - return false; - } - - if (!pulse_mixer_setup(pm)) { - pa_threaded_mainloop_stop(pm->mainloop); - pa_context_disconnect(pm->context); - pa_context_unref(pm->context); - pa_threaded_mainloop_free(pm->mainloop); - return false; - } - - return true; -} - -static void -pulse_mixer_close(struct mixer *data) -{ - struct pulse_mixer *pm = (struct pulse_mixer *) data; - - pa_threaded_mainloop_stop(pm->mainloop); - pa_context_disconnect(pm->context); - pa_context_unref(pm->context); - pa_threaded_mainloop_free(pm->mainloop); - - pm->online = false; -} - -static int -pulse_mixer_get_volume(struct mixer *mixer) -{ - struct pulse_mixer *pm = (struct pulse_mixer *) mixer; - int ret; - pa_operation *o; - - pa_threaded_mainloop_lock(pm->mainloop); - - if (!pm->online) { - pa_threaded_mainloop_unlock(pm->mainloop); - return false; - } - - o = pa_context_get_sink_input_info(pm->context, pm->index, - sink_input_vol, pm); - if (o == NULL) { - pa_threaded_mainloop_unlock(pm->mainloop); - g_debug("pa_context_get_sink_input_info() failed"); - return false; - } - - if (!pulse_wait_for_operation(pm->mainloop, o)) { - pa_threaded_mainloop_unlock(pm->mainloop); - return false; - } - - ret = pm->online - ? (int)((100*(pa_cvolume_avg(&pm->volume)+1))/PA_VOLUME_NORM) - : -1; - - pa_threaded_mainloop_unlock(pm->mainloop); - - return ret; -} - -static bool -pulse_mixer_set_volume(struct mixer *mixer, unsigned volume) -{ - struct pulse_mixer *pm = (struct pulse_mixer *) mixer; - struct pa_cvolume cvolume; - pa_operation *o; - - pa_threaded_mainloop_lock(pm->mainloop); - - if (!pm->online) { - pa_threaded_mainloop_unlock(pm->mainloop); - return false; - } - - pa_cvolume_set(&cvolume, pm->volume.channels, - (pa_volume_t)volume * PA_VOLUME_NORM / 100 + 0.5); - - o = pa_context_set_sink_input_volume(pm->context, pm->index, - &cvolume, NULL, NULL); - pa_threaded_mainloop_unlock(pm->mainloop); - if (o == NULL) { - g_debug("pa_context_set_sink_input_volume() failed"); - return false; - } - - pa_operation_unref(o); - - return true; -} - -const struct mixer_plugin pulse_mixer = { - .init = pulse_mixer_init, - .finish = pulse_mixer_finish, - .open = pulse_mixer_open, - .close = pulse_mixer_close, - .get_volume = pulse_mixer_get_volume, - .set_volume = pulse_mixer_set_volume, -}; diff --git a/src/mixer/pulse_mixer_plugin.c b/src/mixer/pulse_mixer_plugin.c new file mode 100644 index 000000000..54b082819 --- /dev/null +++ b/src/mixer/pulse_mixer_plugin.c @@ -0,0 +1,382 @@ +/* + * Copyright (C) 2003-2009 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 "mixer_api.h" +#include "conf.h" + +#include +#include +#include + +#include + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "pulse_mixer" + +struct pulse_mixer { + struct mixer base; + + const char *server; + const char *sink; + const char *output_name; + + uint32_t index; + bool online; + + struct pa_context *context; + struct pa_threaded_mainloop *mainloop; + struct pa_cvolume volume; + +}; + +/** + * \brief waits for a pulseaudio operation to finish, frees it and + * unlocks the mainloop + * \param operation the operation to wait for + * \return true if operation has finished normally (DONE state), + * false otherwise + */ +static bool +pulse_wait_for_operation(struct pa_threaded_mainloop *mainloop, + struct pa_operation *operation) +{ + pa_operation_state_t state; + + assert(mainloop != NULL); + assert(operation != NULL); + + state = pa_operation_get_state(operation); + while (state == PA_OPERATION_RUNNING) { + pa_threaded_mainloop_wait(mainloop); + state = pa_operation_get_state(operation); + } + + pa_operation_unref(operation); + + return state == PA_OPERATION_DONE; +} + +static void +sink_input_cb(G_GNUC_UNUSED pa_context *context, const pa_sink_input_info *i, + int eol, void *userdata) +{ + + struct pulse_mixer *pm = userdata; + + if (eol) { + g_debug("eol error sink_input_cb"); + return; + } + + if (i == NULL) { + g_debug("Sink input callback failure"); + return; + } + + g_debug("sink input cb %s, index %d ",i->name,i->index); + + if (strcmp(i->name,pm->output_name) == 0) { + pm->index = i->index; + pm->online = true; + pm->volume = i->volume; + } else + g_debug("bad name"); +} + +static void +sink_input_vol(G_GNUC_UNUSED pa_context *context, const pa_sink_input_info *i, + int eol, void *userdata) +{ + + struct pulse_mixer *pm = userdata; + + if (eol) { + g_debug("eol error sink_input_vol"); + return; + } + + if (i == NULL) { + g_debug("Sink input callback failure"); + return; + } + + g_debug("sink input vol %s, index %d ", i->name, i->index); + + pm->volume = i->volume; + + pa_threaded_mainloop_signal(pm->mainloop, 0); +} + +static void +subscribe_cb(pa_context *c, pa_subscription_event_type_t t, + uint32_t idx, void *userdata) +{ + + struct pulse_mixer *pm = userdata; + + g_debug("subscribe call back"); + + switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) { + case PA_SUBSCRIPTION_EVENT_SINK_INPUT: + if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == + PA_SUBSCRIPTION_EVENT_REMOVE && + pm->index == idx) + pm->online = false; + else { + pa_operation *o; + + o = pa_context_get_sink_input_info(c, idx, + sink_input_cb, pm); + if (o == NULL) { + g_debug("pa_context_get_sink_input_info() failed"); + return; + } + + pa_operation_unref(o); + } + + break; + } +} + +static void +context_state_cb(pa_context *context, void *userdata) +{ + struct pulse_mixer *pm = userdata; + + switch (pa_context_get_state(context)) { + case PA_CONTEXT_READY: { + pa_operation *o; + + pa_context_set_subscribe_callback(context, subscribe_cb, pm); + + o = pa_context_subscribe(context, + (pa_subscription_mask_t)PA_SUBSCRIPTION_MASK_SINK_INPUT, + NULL, NULL); + if (o == NULL) { + g_debug("pa_context_subscribe() failed"); + return; + } + + pa_operation_unref(o); + + o = pa_context_get_sink_input_info_list(context, + sink_input_cb, pm); + if (o == NULL) { + g_debug("pa_context_get_sink_input_info_list() failed"); + return; + } + + pa_operation_unref(o); + + pa_threaded_mainloop_signal(pm->mainloop, 0); + break; + } + + case PA_CONTEXT_UNCONNECTED: + case PA_CONTEXT_CONNECTING: + case PA_CONTEXT_AUTHORIZING: + case PA_CONTEXT_SETTING_NAME: + break; + case PA_CONTEXT_TERMINATED: + case PA_CONTEXT_FAILED: + pa_threaded_mainloop_signal(pm->mainloop, 0); + break; + } +} + + +static struct mixer * +pulse_mixer_init(const struct config_param *param) +{ + struct pulse_mixer *pm = g_new(struct pulse_mixer,1); + mixer_init(&pm->base, &pulse_mixer_plugin); + + pm->online = false; + + pm->server = config_get_block_string(param, "server", NULL); + pm->sink = config_get_block_string(param, "sink", NULL); + pm->output_name = config_get_block_string(param, "name", NULL); + + return &pm->base; +} + +static void +pulse_mixer_finish(struct mixer *data) +{ + struct pulse_mixer *pm = (struct pulse_mixer *) data; + + g_free(pm); +} + +static bool +pulse_mixer_setup(struct pulse_mixer *pm) +{ + pa_context_set_state_callback(pm->context, context_state_cb, pm); + + if (pa_context_connect(pm->context, pm->server, + (pa_context_flags_t)0, NULL) < 0) { + g_debug("context server fail"); + return false; + } + + pa_threaded_mainloop_lock(pm->mainloop); + + if (pa_threaded_mainloop_start(pm->mainloop) < 0) { + pa_threaded_mainloop_unlock(pm->mainloop); + g_debug("error start mainloop"); + return false; + } + + pa_threaded_mainloop_wait(pm->mainloop); + + if (pa_context_get_state(pm->context) != PA_CONTEXT_READY) { + pa_threaded_mainloop_unlock(pm->mainloop); + g_debug("error context not ready"); + return false; + } + + pa_threaded_mainloop_unlock(pm->mainloop); + + return true; +} + +static bool +pulse_mixer_open(struct mixer *data) +{ + struct pulse_mixer *pm = (struct pulse_mixer *) data; + + g_debug("pulse mixer open"); + + pm->index = 0; + pm->online = false; + + pm->mainloop = pa_threaded_mainloop_new(); + if (pm->mainloop == NULL) { + g_debug("failed mainloop"); + return false; + } + + pm->context = pa_context_new(pa_threaded_mainloop_get_api(pm->mainloop), + "Mixer mpd"); + if (pm->context == NULL) { + pa_threaded_mainloop_stop(pm->mainloop); + pa_threaded_mainloop_free(pm->mainloop); + g_debug("failed context"); + return false; + } + + if (!pulse_mixer_setup(pm)) { + pa_threaded_mainloop_stop(pm->mainloop); + pa_context_disconnect(pm->context); + pa_context_unref(pm->context); + pa_threaded_mainloop_free(pm->mainloop); + return false; + } + + return true; +} + +static void +pulse_mixer_close(struct mixer *data) +{ + struct pulse_mixer *pm = (struct pulse_mixer *) data; + + pa_threaded_mainloop_stop(pm->mainloop); + pa_context_disconnect(pm->context); + pa_context_unref(pm->context); + pa_threaded_mainloop_free(pm->mainloop); + + pm->online = false; +} + +static int +pulse_mixer_get_volume(struct mixer *mixer) +{ + struct pulse_mixer *pm = (struct pulse_mixer *) mixer; + int ret; + pa_operation *o; + + pa_threaded_mainloop_lock(pm->mainloop); + + if (!pm->online) { + pa_threaded_mainloop_unlock(pm->mainloop); + return false; + } + + o = pa_context_get_sink_input_info(pm->context, pm->index, + sink_input_vol, pm); + if (o == NULL) { + pa_threaded_mainloop_unlock(pm->mainloop); + g_debug("pa_context_get_sink_input_info() failed"); + return false; + } + + if (!pulse_wait_for_operation(pm->mainloop, o)) { + pa_threaded_mainloop_unlock(pm->mainloop); + return false; + } + + ret = pm->online + ? (int)((100*(pa_cvolume_avg(&pm->volume)+1))/PA_VOLUME_NORM) + : -1; + + pa_threaded_mainloop_unlock(pm->mainloop); + + return ret; +} + +static bool +pulse_mixer_set_volume(struct mixer *mixer, unsigned volume) +{ + struct pulse_mixer *pm = (struct pulse_mixer *) mixer; + struct pa_cvolume cvolume; + pa_operation *o; + + pa_threaded_mainloop_lock(pm->mainloop); + + if (!pm->online) { + pa_threaded_mainloop_unlock(pm->mainloop); + return false; + } + + pa_cvolume_set(&cvolume, pm->volume.channels, + (pa_volume_t)volume * PA_VOLUME_NORM / 100 + 0.5); + + o = pa_context_set_sink_input_volume(pm->context, pm->index, + &cvolume, NULL, NULL); + pa_threaded_mainloop_unlock(pm->mainloop); + if (o == NULL) { + g_debug("pa_context_set_sink_input_volume() failed"); + return false; + } + + pa_operation_unref(o); + + return true; +} + +const struct mixer_plugin pulse_mixer_plugin = { + .init = pulse_mixer_init, + .finish = pulse_mixer_finish, + .open = pulse_mixer_open, + .close = pulse_mixer_close, + .get_volume = pulse_mixer_get_volume, + .set_volume = pulse_mixer_set_volume, +}; diff --git a/src/mixer_list.h b/src/mixer_list.h index 4e81c57b2..916e3738c 100644 --- a/src/mixer_list.h +++ b/src/mixer_list.h @@ -28,6 +28,6 @@ extern const struct mixer_plugin software_mixer_plugin; extern const struct mixer_plugin alsa_mixer; extern const struct mixer_plugin oss_mixer; -extern const struct mixer_plugin pulse_mixer; +extern const struct mixer_plugin pulse_mixer_plugin; #endif diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c new file mode 100644 index 000000000..2557106f9 --- /dev/null +++ b/src/output/pulse_output_plugin.c @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2003-2009 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 "output_api.h" +#include "mixer_list.h" + +#include +#include +#include + +#define MPD_PULSE_NAME "mpd" + +struct pulse_data { + const char *name; + const char *server; + const char *sink; + + pa_simple *s; +}; + +/** + * The quark used for GError.domain. + */ +static inline GQuark +pulse_output_quark(void) +{ + return g_quark_from_static_string("pulse_output"); +} + +static struct pulse_data *pulse_new_data(void) +{ + struct pulse_data *ret; + + ret = g_new(struct pulse_data, 1); + + ret->server = NULL; + ret->sink = NULL; + + return ret; +} + +static void pulse_free_data(struct pulse_data *pd) +{ + g_free(pd); +} + +static void * +pulse_init(G_GNUC_UNUSED const struct audio_format *audio_format, + const struct config_param *param, G_GNUC_UNUSED GError **error) +{ + struct pulse_data *pd; + + g_setenv("PULSE_PROP_media.role", "music", true); + + pd = pulse_new_data(); + pd->name = config_get_block_string(param, "name", "mpd_pulse"); + pd->server = config_get_block_string(param, "server", NULL); + pd->sink = config_get_block_string(param, "sink", NULL); + + return pd; +} + +static void pulse_finish(void *data) +{ + struct pulse_data *pd = data; + + pulse_free_data(pd); +} + +static bool pulse_test_default_device(void) +{ + pa_simple *s; + pa_sample_spec ss; + int error; + + ss.format = PA_SAMPLE_S16NE; + ss.rate = 44100; + ss.channels = 2; + + s = pa_simple_new(NULL, MPD_PULSE_NAME, PA_STREAM_PLAYBACK, NULL, + MPD_PULSE_NAME, &ss, NULL, NULL, &error); + if (!s) { + g_message("Cannot connect to default PulseAudio server: %s\n", + pa_strerror(error)); + return false; + } + + pa_simple_free(s); + + return true; +} + +static bool +pulse_open(void *data, struct audio_format *audio_format, GError **error_r) +{ + struct pulse_data *pd = data; + pa_sample_spec ss; + int error; + + /* MPD doesn't support the other pulseaudio sample formats, so + we just force MPD to send us everything as 16 bit */ + audio_format->bits = 16; + + ss.format = PA_SAMPLE_S16NE; + ss.rate = audio_format->sample_rate; + ss.channels = audio_format->channels; + + pd->s = pa_simple_new(pd->server, MPD_PULSE_NAME, PA_STREAM_PLAYBACK, + pd->sink, pd->name, + &ss, NULL, NULL, + &error); + if (!pd->s) { + g_set_error(error_r, pulse_output_quark(), error, + "Cannot connect to PulseAudio server: %s", + pa_strerror(error)); + return false; + } + + return true; +} + +static void pulse_cancel(void *data) +{ + struct pulse_data *pd = data; + int error; + + if (pa_simple_flush(pd->s, &error) < 0) + g_warning("Flush failed in PulseAudio output \"%s\": %s\n", + pd->name, pa_strerror(error)); +} + +static void pulse_close(void *data) +{ + struct pulse_data *pd = data; + + pa_simple_drain(pd->s, NULL); + pa_simple_free(pd->s); +} + +static size_t +pulse_play(void *data, const void *chunk, size_t size, GError **error_r) +{ + struct pulse_data *pd = data; + int error; + + if (pa_simple_write(pd->s, chunk, size, &error) < 0) { + g_set_error(error_r, pulse_output_quark(), error, + "%s", pa_strerror(error)); + return 0; + } + + return size; +} + +const struct audio_output_plugin pulse_output_plugin = { + .name = "pulse", + + .test_default_device = pulse_test_default_device, + .init = pulse_init, + .finish = pulse_finish, + .open = pulse_open, + .play = pulse_play, + .cancel = pulse_cancel, + .close = pulse_close, + + .mixer_plugin = &pulse_mixer_plugin, +}; diff --git a/src/output/pulse_plugin.c b/src/output/pulse_plugin.c deleted file mode 100644 index e4780fd45..000000000 --- a/src/output/pulse_plugin.c +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (C) 2003-2009 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 "../output_api.h" -#include "mixer_list.h" - -#include -#include -#include - -#define MPD_PULSE_NAME "mpd" - -struct pulse_data { - const char *name; - const char *server; - const char *sink; - - pa_simple *s; -}; - -/** - * The quark used for GError.domain. - */ -static inline GQuark -pulse_output_quark(void) -{ - return g_quark_from_static_string("pulse_output"); -} - -static struct pulse_data *pulse_new_data(void) -{ - struct pulse_data *ret; - - ret = g_new(struct pulse_data, 1); - - ret->server = NULL; - ret->sink = NULL; - - return ret; -} - -static void pulse_free_data(struct pulse_data *pd) -{ - g_free(pd); -} - -static void * -pulse_init(G_GNUC_UNUSED const struct audio_format *audio_format, - const struct config_param *param, G_GNUC_UNUSED GError **error) -{ - struct pulse_data *pd; - - g_setenv("PULSE_PROP_media.role", "music", true); - - pd = pulse_new_data(); - pd->name = config_get_block_string(param, "name", "mpd_pulse"); - pd->server = config_get_block_string(param, "server", NULL); - pd->sink = config_get_block_string(param, "sink", NULL); - - return pd; -} - -static void pulse_finish(void *data) -{ - struct pulse_data *pd = data; - - pulse_free_data(pd); -} - -static bool pulse_test_default_device(void) -{ - pa_simple *s; - pa_sample_spec ss; - int error; - - ss.format = PA_SAMPLE_S16NE; - ss.rate = 44100; - ss.channels = 2; - - s = pa_simple_new(NULL, MPD_PULSE_NAME, PA_STREAM_PLAYBACK, NULL, - MPD_PULSE_NAME, &ss, NULL, NULL, &error); - if (!s) { - g_message("Cannot connect to default PulseAudio server: %s\n", - pa_strerror(error)); - return false; - } - - pa_simple_free(s); - - return true; -} - -static bool -pulse_open(void *data, struct audio_format *audio_format, GError **error_r) -{ - struct pulse_data *pd = data; - pa_sample_spec ss; - int error; - - /* MPD doesn't support the other pulseaudio sample formats, so - we just force MPD to send us everything as 16 bit */ - audio_format->bits = 16; - - ss.format = PA_SAMPLE_S16NE; - ss.rate = audio_format->sample_rate; - ss.channels = audio_format->channels; - - pd->s = pa_simple_new(pd->server, MPD_PULSE_NAME, PA_STREAM_PLAYBACK, - pd->sink, pd->name, - &ss, NULL, NULL, - &error); - if (!pd->s) { - g_set_error(error_r, pulse_output_quark(), error, - "Cannot connect to PulseAudio server: %s", - pa_strerror(error)); - return false; - } - - return true; -} - -static void pulse_cancel(void *data) -{ - struct pulse_data *pd = data; - int error; - - if (pa_simple_flush(pd->s, &error) < 0) - g_warning("Flush failed in PulseAudio output \"%s\": %s\n", - pd->name, pa_strerror(error)); -} - -static void pulse_close(void *data) -{ - struct pulse_data *pd = data; - - pa_simple_drain(pd->s, NULL); - pa_simple_free(pd->s); -} - -static size_t -pulse_play(void *data, const void *chunk, size_t size, GError **error_r) -{ - struct pulse_data *pd = data; - int error; - - if (pa_simple_write(pd->s, chunk, size, &error) < 0) { - g_set_error(error_r, pulse_output_quark(), error, - "%s", pa_strerror(error)); - return 0; - } - - return size; -} - -const struct audio_output_plugin pulse_plugin = { - .name = "pulse", - .test_default_device = pulse_test_default_device, - .init = pulse_init, - .finish = pulse_finish, - .open = pulse_open, - .play = pulse_play, - .cancel = pulse_cancel, - .close = pulse_close, - .mixer_plugin = &pulse_mixer, -}; diff --git a/src/output_list.c b/src/output_list.c index 476701a1a..d5888e386 100644 --- a/src/output_list.c +++ b/src/output_list.c @@ -31,7 +31,7 @@ extern const struct audio_output_plugin oss_output_plugin; extern const struct audio_output_plugin openal_output_plugin; extern const struct audio_output_plugin osxPlugin; extern const struct audio_output_plugin solaris_output_plugin; -extern const struct audio_output_plugin pulse_plugin; +extern const struct audio_output_plugin pulse_output_plugin; extern const struct audio_output_plugin mvp_output_plugin; extern const struct audio_output_plugin jackPlugin; extern const struct audio_output_plugin httpd_output_plugin; @@ -67,7 +67,7 @@ const struct audio_output_plugin *audio_output_plugins[] = { &solaris_output_plugin, #endif #ifdef HAVE_PULSE - &pulse_plugin, + &pulse_output_plugin, #endif #ifdef HAVE_MVP &mvp_output_plugin, -- cgit v1.2.3