kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an option to allow PulseAudio to move streams

Browse Source 
This could be made the default, if there's a safe way to update the AL device
specifier.
This commit is contained in:
Chris Robinson 2012-06-16 22:32:19 -07:00
parent ad2643d8af
commit 0db9730a50
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Alc/backends/pulseaudio.c
View File

@ -546,6 +546,19 @@ static void source_name_callback(pa_context *context, const pa_source_info *info
}
static void stream_moved_callback(pa_stream *stream, void *pdata)
{
ALCdevice *device = pdata;
pulse_data *data = device->ExtraData;
(void)stream;
free(data->device_name);
data->device_name = strdup(pa_stream_get_device_name(data->stream));
TRACE("Stream moved to %s\n", data->device_name);
}
static pa_context *connect_context(pa_threaded_mainloop *loop, ALboolean silent)
{
const char *name = "OpenAL Soft";
@ -887,6 +900,7 @@ static void pulse_close(ALCdevice *device)
if(data->stream)
{
pa_stream_set_moved_callback(data->stream, NULL, NULL);
#if PA_CHECK_VERSION(0,9,15)
if(pa_stream_set_buffer_attr_callback)
pa_stream_set_buffer_attr_callback(data->stream, NULL, NULL);
@ -944,7 +958,9 @@ static ALCenum pulse_open_playback(ALCdevice *device, const ALCchar *device_name
pa_threaded_mainloop_lock(data->loop);
flags = PA_STREAM_FIX_FORMAT | PA_STREAM_FIX_RATE |
PA_STREAM_FIX_CHANNELS | PA_STREAM_DONT_MOVE;
PA_STREAM_FIX_CHANNELS;
if(!GetConfigValueBool("pulse", "allow-moves", 0))
flags |= PA_STREAM_DONT_MOVE;
spec.format = PA_SAMPLE_S16NE;
spec.rate = 44100;
@ -964,6 +980,8 @@ static ALCenum pulse_open_playback(ALCdevice *device, const ALCchar *device_name
sink_name_callback, device);
WAIT_FOR_OPERATION(o, data->loop);
pa_stream_set_moved_callback(data->stream, stream_moved_callback, device);
pa_threaded_mainloop_unlock(data->loop);
return ALC_NO_ERROR;
@ -984,6 +1002,7 @@ static ALCboolean pulse_reset_playback(ALCdevice *device)
if(data->stream)
{
pa_stream_set_moved_callback(data->stream, NULL, NULL);
#if PA_CHECK_VERSION(0,9,15)
if(pa_stream_set_buffer_attr_callback)
pa_stream_set_buffer_attr_callback(data->stream, NULL, NULL);
@ -1005,7 +1024,8 @@ static ALCboolean pulse_reset_playback(ALCdevice *device)
flags |= PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE;
flags |= PA_STREAM_ADJUST_LATENCY;
flags |= PA_STREAM_START_CORKED;
flags |= PA_STREAM_DONT_MOVE;
if(!GetConfigValueBool("pulse", "allow-moves", 0))
flags |= PA_STREAM_DONT_MOVE;
switch(device->FmtType)
{
@ -1084,6 +1104,7 @@ static ALCboolean pulse_reset_playback(ALCdevice *device)
device->Frequency = data->spec.rate;
}
pa_stream_set_moved_callback(data->stream, stream_moved_callback, device);
#if PA_CHECK_VERSION(0,9,15)
if(pa_stream_set_buffer_attr_callback)
pa_stream_set_buffer_attr_callback(data->stream, stream_buffer_attr_callback, device);
@ -1218,8 +1239,10 @@ static ALCenum pulse_open_capture(ALCdevice *device, const ALCchar *device_name)
data->attr.fragsize = minu(samples, 50*device->Frequency/1000) *
pa_frame_size(&data->spec);
flags |= PA_STREAM_DONT_MOVE;
flags |= PA_STREAM_START_CORKED|PA_STREAM_ADJUST_LATENCY;
if(!GetConfigValueBool("pulse", "allow-moves", 0))
flags |= PA_STREAM_DONT_MOVE;
data->stream = connect_record_stream(pulse_name, data->loop, data->context,
flags, &data->attr, &data->spec,
&chanmap);
@ -1235,6 +1258,8 @@ static ALCenum pulse_open_capture(ALCdevice *device, const ALCchar *device_name)
source_name_callback, device);
WAIT_FOR_OPERATION(o, data->loop);
pa_stream_set_moved_callback(data->stream, stream_moved_callback, device);
pa_threaded_mainloop_unlock(data->loop);
return ALC_NO_ERROR;

6
alsoftrc.sample
View File

@ -291,6 +291,12 @@
# still prevent autospawning even if this is set to true.
#spawn-server = false
## allow-moves:
# Allows PulseAudio to move active streams to different devices. Note that the
# device specifier seen by applications will not be updated when this occurs,
# and neither will the AL device configuration (sample rate, format, etc).
#allow-moves = false
##
## Wave File Writer stuff
##