From a69c5f20f5aae45dd31fc5e7b7bbc7533488e9cf Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Sun, 9 Jun 2013 20:23:03 +0200 Subject: [PATCH 1/4] Add a PulseAudio output driver. It uses libpulse's synchronous API, to output to PulseAudio without using libao. --- Makefile | 4 ++ audio.c | 6 +++ audio_pulse.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 10 +++++ 4 files changed, 129 insertions(+) create mode 100644 audio_pulse.c diff --git a/Makefile b/Makefile index c8afce5d..ac98328f 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,10 @@ ifdef CONFIG_AO SRCS += audio_ao.c endif +ifdef CONFIG_PULSE + SRCS += audio_pulse.c +endif + ifdef CONFIG_AVAHI SRCS += avahi.c endif diff --git a/audio.c b/audio.c index d0bcf988..4db8cb0d 100644 --- a/audio.c +++ b/audio.c @@ -32,9 +32,15 @@ #ifdef CONFIG_AO extern audio_output audio_ao; #endif +#ifdef CONFIG_PULSE +extern audio_output audio_pulse; +#endif extern audio_output audio_dummy, audio_pipe; static audio_output *outputs[] = { +#ifdef CONFIG_PULSE + &audio_pulse, +#endif #ifdef CONFIG_AO &audio_ao, #endif diff --git a/audio_pulse.c b/audio_pulse.c new file mode 100644 index 00000000..5332e375 --- /dev/null +++ b/audio_pulse.c @@ -0,0 +1,109 @@ +/* + * PulseAudio output driver. This file is part of Shairport. + * Copyright (c) Paul Lietar 2013 + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + + +#include +#include +#include +#include +#include +#include "common.h" +#include "audio.h" + +pa_simple *pa_dev = NULL; +int pa_error; + +static void help(void) { + printf(" -a server set the server name\n" + " -s sink set the output sink\n" + ); +} + +static int init(int argc, char **argv) { + const char *server = NULL; + const char *sink = NULL; + + optind = 0; + // some platforms apparently require optreset = 1; - which? + int opt; + char *mid; + while ((opt = getopt(argc, argv, "a:s:")) > 0) { + switch (opt) { + case 'a': + server = optarg; + break; + case 's': + sink = optarg; + break; + default: + help(); + die("Invalid audio option -%c specified", opt); + } + } + + static const pa_sample_spec ss = { + .format = PA_SAMPLE_S16LE, + .rate = 44100, + .channels = 2 + }; + + + pa_dev = pa_simple_new(server, "shairport", PA_STREAM_PLAYBACK, sink, "shairport", &ss, NULL, NULL, &pa_error); + + return pa_dev ? 0 : 1; +} + +static void deinit(void) { + if (pa_dev) + pa_simple_free(pa_dev); + pa_dev = NULL; +} + +static void start(int sample_rate) { + if (sample_rate != 44100) + die("unexpected sample rate!"); +} + +static void play(short buf[], int samples) { + if( pa_simple_write(pa_dev, (char *)buf, (size_t)samples * 4, &pa_error) < 0 ) + fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(pa_error)); +} + +static void stop(void) { + if (pa_simple_drain(pa_dev, &pa_error) < 0) + fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(pa_error)); +} + +audio_output audio_pulse = { + .name = "pulse", + .help = &help, + .init = &init, + .deinit = &deinit, + .start = &start, + .stop = &stop, + .play = &play, + .volume = NULL +}; diff --git a/configure b/configure index 471ecb14..0745b237 100755 --- a/configure +++ b/configure @@ -25,6 +25,16 @@ else echo libao or its dev package not found fi +if pkg-config libpulse-simple 2>/dev/null; then + CFLAGS="${CFLAGS} `pkg-config --cflags libpulse-simple`" + LDFLAGS="${LDFLAGS} `pkg-config --libs libpulse-simple`" + echo "#define CONFIG_PULSE" >> config.h + echo "CONFIG_PULSE=yes" >> config.mk + echo libpulse found +else + echo libpulse or its dev package not found +fi + if pkg-config avahi-client 2>/dev/null; then CFLAGS="${CFLAGS} `pkg-config --cflags avahi-client`" LDFLAGS="${LDFLAGS} `pkg-config --libs avahi-client`" From 8045e00d4f3d694cff99c30e3a5cd63eca3b4e5c Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Tue, 11 Jun 2013 16:47:41 +0200 Subject: [PATCH 2/4] Fix pulse audio output driver in daemon mode. libpulse was initialized before the fork. This caused calls to libpulse made after the fork fail. Now initialize lib pulse when we need it, after the fork. --- audio_pulse.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/audio_pulse.c b/audio_pulse.c index 5332e375..bb90c727 100644 --- a/audio_pulse.c +++ b/audio_pulse.c @@ -33,8 +33,10 @@ #include "common.h" #include "audio.h" -pa_simple *pa_dev = NULL; -int pa_error; +static pa_simple *pa_dev = NULL; +static int pa_error; +static const char *pa_server = NULL; +static const char *pa_sink = NULL; static void help(void) { printf(" -a server set the server name\n" @@ -43,8 +45,6 @@ static void help(void) { } static int init(int argc, char **argv) { - const char *server = NULL; - const char *sink = NULL; optind = 0; // some platforms apparently require optreset = 1; - which? @@ -53,10 +53,10 @@ static int init(int argc, char **argv) { while ((opt = getopt(argc, argv, "a:s:")) > 0) { switch (opt) { case 'a': - server = optarg; + pa_server = optarg; break; case 's': - sink = optarg; + pa_sink = optarg; break; default: help(); @@ -64,37 +64,36 @@ static int init(int argc, char **argv) { } } - static const pa_sample_spec ss = { - .format = PA_SAMPLE_S16LE, - .rate = 44100, - .channels = 2 - }; - - - pa_dev = pa_simple_new(server, "shairport", PA_STREAM_PLAYBACK, sink, "shairport", &ss, NULL, NULL, &pa_error); - - return pa_dev ? 0 : 1; + return 0; } static void deinit(void) { - if (pa_dev) - pa_simple_free(pa_dev); - pa_dev = NULL; } static void start(int sample_rate) { - if (sample_rate != 44100) - die("unexpected sample rate!"); + const pa_sample_spec ss = { + .format = PA_SAMPLE_S16LE, + .rate = sample_rate, + .channels = 2 + }; + + pa_dev = pa_simple_new(pa_server, "shairport", PA_STREAM_PLAYBACK, pa_sink, "shairport", &ss, NULL, NULL, &pa_error); + if (!pa_dev) + die("Could not connect to pulseaudio server: %s", pa_strerror(pa_error)); } static void play(short buf[], int samples) { if( pa_simple_write(pa_dev, (char *)buf, (size_t)samples * 4, &pa_error) < 0 ) - fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(pa_error)); + warn("pa_simple_write() failed: %s\n", pa_strerror(pa_error)); } static void stop(void) { if (pa_simple_drain(pa_dev, &pa_error) < 0) - fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(pa_error)); + warn("pa_simple_drain() failed: %s\n", pa_strerror(pa_error)); + + if (pa_dev) + pa_simple_free(pa_dev); + pa_dev = NULL; } audio_output audio_pulse = { From f1ee022fd07e7ffebb29158c296b7e15f46e30d3 Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Wed, 19 Jun 2013 10:22:51 +0200 Subject: [PATCH 3/4] pulseaudio: fix option parsing --- audio_pulse.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/audio_pulse.c b/audio_pulse.c index bb90c727..e6e797fd 100644 --- a/audio_pulse.c +++ b/audio_pulse.c @@ -46,7 +46,10 @@ static void help(void) { static int init(int argc, char **argv) { - optind = 0; + optind = 1; // optind=0 is equivalent to optind=1 plus special behaviour + argv--; // so we shift the arguments to satisfy getopt() + argc++; + // some platforms apparently require optreset = 1; - which? int opt; char *mid; @@ -64,6 +67,9 @@ static int init(int argc, char **argv) { } } + if (optind < argc) + die("Invalid audio argument: %s", argv[optind]); + return 0; } @@ -77,7 +83,14 @@ static void start(int sample_rate) { .channels = 2 }; - pa_dev = pa_simple_new(pa_server, "shairport", PA_STREAM_PLAYBACK, pa_sink, "shairport", &ss, NULL, NULL, &pa_error); + pa_dev = pa_simple_new(pa_server, + "shairport", + PA_STREAM_PLAYBACK, + pa_sink, + "shairport", + &ss, NULL, NULL, + &pa_error); + if (!pa_dev) die("Could not connect to pulseaudio server: %s", pa_strerror(pa_error)); } From 64b6f47e84fefd595e1972d41fe77ae62939b5d2 Mon Sep 17 00:00:00 2001 From: Paul Lietar Date: Wed, 19 Jun 2013 10:48:04 +0200 Subject: [PATCH 4/4] pulseaudio: Make the application name configurable If no name is specified, use the AirPlay access point name. --- audio_pulse.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/audio_pulse.c b/audio_pulse.c index e6e797fd..0fb06248 100644 --- a/audio_pulse.c +++ b/audio_pulse.c @@ -37,14 +37,18 @@ static pa_simple *pa_dev = NULL; static int pa_error; static const char *pa_server = NULL; static const char *pa_sink = NULL; +static const char *pa_appname = NULL; static void help(void) { printf(" -a server set the server name\n" " -s sink set the output sink\n" + " -n name set the application name, as seen by PulseAudio\n" + " defaults to the access point name\n" ); } static int init(int argc, char **argv) { + pa_appname = config.apname; optind = 1; // optind=0 is equivalent to optind=1 plus special behaviour argv--; // so we shift the arguments to satisfy getopt() @@ -53,7 +57,7 @@ static int init(int argc, char **argv) { // some platforms apparently require optreset = 1; - which? int opt; char *mid; - while ((opt = getopt(argc, argv, "a:s:")) > 0) { + while ((opt = getopt(argc, argv, "a:s:n:")) > 0) { switch (opt) { case 'a': pa_server = optarg; @@ -61,6 +65,9 @@ static int init(int argc, char **argv) { case 's': pa_sink = optarg; break; + case 'n': + pa_appname = optarg; + break; default: help(); die("Invalid audio option -%c specified", opt); @@ -84,10 +91,10 @@ static void start(int sample_rate) { }; pa_dev = pa_simple_new(pa_server, - "shairport", + pa_appname, PA_STREAM_PLAYBACK, pa_sink, - "shairport", + "Shairport Stream", &ss, NULL, NULL, &pa_error);