aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2006-07-13 19:03:49 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2006-07-13 19:03:49 +0000
commit09698f917cf8971e50e574d0aa9f2bcf1be8cfb1 (patch)
tree703f1cc9d669fbf900ae03fb83fe5a111768b387 /src
parent93681d914e1c0a0ebe37cafa243a4f2d15fa5c51 (diff)
downloadmpd-09698f917cf8971e50e574d0aa9f2bcf1be8cfb1.tar.gz
mpd-09698f917cf8971e50e574d0aa9f2bcf1be8cfb1.tar.xz
mpd-09698f917cf8971e50e574d0aa9f2bcf1be8cfb1.zip
Add PulseAudio support
git-svn-id: https://svn.musicpd.org/mpd/trunk@4316 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/audio.c2
-rw-r--r--src/audioOutputs/audioOutput_pulse.c193
3 files changed, 196 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9197c3d69..91669ec40 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@ mpd_audioOutputs = \
audioOutputs/audioOutput_ao.c \
audioOutputs/audioOutput_oss.c \
audioOutputs/audioOutput_osx.c \
+ audioOutputs/audioOutput_pulse.c \
audioOutputs/audioOutput_mvp.c \
audioOutputs/audioOutput_shout.c
diff --git a/src/audio.c b/src/audio.c
index 3469a6825..308dcc3e9 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -75,6 +75,7 @@ extern AudioOutputPlugin alsaPlugin;
extern AudioOutputPlugin aoPlugin;
extern AudioOutputPlugin ossPlugin;
extern AudioOutputPlugin osxPlugin;
+extern AudioOutputPlugin pulsePlugin;
extern AudioOutputPlugin mvpPlugin;
extern AudioOutputPlugin shoutPlugin;
@@ -88,6 +89,7 @@ void initAudioDriver() {
loadAudioOutputPlugin(&aoPlugin);
loadAudioOutputPlugin(&ossPlugin);
loadAudioOutputPlugin(&osxPlugin);
+ loadAudioOutputPlugin(&pulsePlugin);
loadAudioOutputPlugin(&mvpPlugin);
loadAudioOutputPlugin(&shoutPlugin);
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c
new file mode 100644
index 000000000..8dcf09f87
--- /dev/null
+++ b/src/audioOutputs/audioOutput_pulse.c
@@ -0,0 +1,193 @@
+#include "../audioOutput.h"
+
+#include <stdlib.h>
+
+#ifdef HAVE_PULSE
+
+#define MPD_PULSE_NAME "mpd"
+#define MPD_PULSE_STREAM_NAME "mpd"
+
+#include "../conf.h"
+#include "../log.h"
+
+#include <pulse/simple.h>
+#include <pulse/error.h>
+
+typedef struct _PulseData {
+ char * server;
+ char * sink;
+ pa_simple * s;
+} PulseData;
+
+static PulseData * newPulseData()
+{
+ PulseData * ret;
+
+ ret = malloc(sizeof(PulseData));
+ ret->server = NULL;
+ ret->sink = NULL;
+ ret->s = NULL;
+ return ret;
+}
+
+static void freePulseData(PulseData * ad)
+{
+ if (ad->server) free(ad->server);
+ if (ad->sink) free(ad->sink);
+ free(ad);
+}
+
+static int pulse_initDriver(AudioOutput * audioOutput, ConfigParam * param)
+{
+ BlockParam * server = NULL;
+ BlockParam * sink = NULL;
+ PulseData * ad;
+
+ if (param) {
+ server = getBlockParam(param, "server");
+ sink = getBlockParam(param, "sink");
+ }
+
+ ad = newPulseData();
+ ad->server = server ? strdup(server->value) : NULL;
+ ad->sink = sink ? strdup(sink->value) : NULL;
+ audioOutput->data = ad;
+
+ return 0;
+}
+
+static void pulse_finishDriver(AudioOutput * audioOutput)
+{
+ freePulseData((PulseData *) audioOutput->data);
+}
+
+static int pulse_testDefault()
+{
+ 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_STREAM_NAME, &ss, NULL, NULL, &error);
+ if (!s) {
+ WARNING("Cannot connect to default PulseAudio server: %s\n",
+ pa_strerror(error));
+ return -1;
+ }
+
+ pa_simple_free(s);
+
+ return 0;
+}
+
+static int pulse_openDevice(AudioOutput * audioOutput)
+{
+ PulseData * ad;
+ AudioFormat * audioFormat;
+ pa_sample_spec ss;
+ int error;
+
+ ad = audioOutput->data;
+ audioFormat = &audioOutput->outAudioFormat;
+
+ if (audioFormat->bits != 16) {
+ ERROR("PulseAudio doesn't support %i bit audio\n",
+ audioFormat->bits);
+ return -1;
+ }
+
+ ss.format = PA_SAMPLE_S16NE;
+ ss.rate = audioFormat->sampleRate;
+ ss.channels = audioFormat->channels;
+
+ ad->s = pa_simple_new(ad->server, MPD_PULSE_NAME, PA_STREAM_PLAYBACK,
+ ad->sink, MPD_PULSE_STREAM_NAME, &ss,
+ NULL, NULL, &error);
+ if (!ad->s) {
+ ERROR("Cannot connect to server in PulseAudio output " \
+ "\"%s\": %s\n", audioOutput->name, pa_strerror(error));
+ return -1;
+ }
+
+ audioOutput->open = 1;
+
+ DEBUG("PulseAudio output \"%s\" connected and playing %i bit, %i " \
+ "channel audio at %i Hz\n", audioOutput->name, audioFormat->bits,
+ audioFormat->channels, audioFormat->sampleRate);
+
+ return 0;
+}
+
+static void pulse_dropBufferedAudio(AudioOutput * audioOutput)
+{
+ PulseData * ad;
+ int error;
+
+ ad = audioOutput->data;
+ if (pa_simple_flush(ad->s, &error) < 0)
+ WARNING("Flush failed in PulseAudio output \"%s\": %s\n",
+ audioOutput->name, pa_strerror(error));
+}
+
+static void pulse_closeDevice(AudioOutput * audioOutput)
+{
+ PulseData * ad;
+
+ ad = audioOutput->data;
+ if (ad->s) {
+ pa_simple_drain(ad->s, NULL);
+ pa_simple_free(ad->s);
+ }
+
+ audioOutput->open = 0;
+}
+
+static int pulse_playAudio(AudioOutput * audioOutput, char * playChunk,
+ int size)
+{
+ PulseData * ad;
+ int error;
+
+ ad = audioOutput->data;
+
+ if (pa_simple_write(ad->s, playChunk, size, &error) < 0) {
+ ERROR("PulseAudio output \"%s\" disconnecting due to write " \
+ "error: %s\n", audioOutput->name, pa_strerror(error));
+ pulse_closeDevice(audioOutput);
+ return -1;
+ }
+
+ return 0;
+}
+
+AudioOutputPlugin pulsePlugin = {
+ "pulse",
+ pulse_testDefault,
+ pulse_initDriver,
+ pulse_finishDriver,
+ pulse_openDevice,
+ pulse_playAudio,
+ pulse_dropBufferedAudio,
+ pulse_closeDevice,
+ NULL, /* sendMetadataFunc */
+};
+
+#else /* HAVE_PULSE */
+
+AudioOutputPlugin pulsePlugin =
+{
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+};
+
+#endif /* HAVE_PULSE */