summaryrefslogtreecommitdiff
path: root/src/audio_out/audio_pulse_out.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
commit3119dd2de36dbd8bb9af95ab1826c15f3099b597 (patch)
tree76b0324c6e93b86550e63ad02f1154580ce79526 /src/audio_out/audio_pulse_out.c
parent7366cab446742882341e4a5304527e8b1a6965eb (diff)
parentcb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (diff)
downloadxine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.gz
xine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.bz2
Merge.
Diffstat (limited to 'src/audio_out/audio_pulse_out.c')
-rw-r--r--src/audio_out/audio_pulse_out.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c
index bd057501b..5370389c7 100644
--- a/src/audio_out/audio_pulse_out.c
+++ b/src/audio_out/audio_pulse_out.c
@@ -360,7 +360,6 @@ static int ao_pulse_open(ao_driver_t *this_gen,
pulse_driver_t *this = (pulse_driver_t *) this_gen;
pa_sample_spec ss;
pa_channel_map cm;
- int r;
xprintf (this->xine, XINE_VERBOSITY_DEBUG,
"audio_pulse_out: ao_open bits=%d rate=%d, mode=%d\n", bits, rate, mode);
@@ -466,7 +465,7 @@ static int ao_pulse_open(ao_driver_t *this_gen,
pa_stream_set_write_callback(this->stream, __xine_pa_stream_request_callback, this);
pa_stream_set_latency_update_callback(this->stream, __xine_pa_stream_notify_callback, this);
- r = pa_stream_connect_playback(this->stream, this->sink, NULL,
+ pa_stream_connect_playback(this->stream, this->sink, NULL,
PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE,
NULL, NULL);