Skip to content

Commit

Permalink
Add a PulseAudio output driver.
Browse files Browse the repository at this point in the history
It uses libpulse's synchronous API, to output to PulseAudio
without using libao.
  • Loading branch information
plietar committed Jun 10, 2013
1 parent 38799dc commit a69c5f2
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
109 changes: 109 additions & 0 deletions audio_pulse.c
Original file line number Diff line number Diff line change
@@ -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 <stdio.h>
#include <unistd.h>
#include <memory.h>
#include <pulse/simple.h>
#include <pulse/error.h>
#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
};
10 changes: 10 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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`"
Expand Down

0 comments on commit a69c5f2

Please sign in to comment.