diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-18 10:01:12 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-18 10:01:12 +0200 |
| commit | cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (patch) | |
| tree | 12b50ef5e4cdfa5710b0f4d21b25b19e61e2030f /src/audio_out/audio_pulse_out.c | |
| parent | ecbf41ae10616d6e16befe9e47c3979248776dd9 (diff) | |
| parent | 4d1d566f57c427cd8c009dc68fa9e7fcacc31427 (diff) | |
| download | xine-lib-cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8.tar.gz xine-lib-cb6e4b4ffd49cdef83c6d025f175cf6a79705fc8.tar.bz2 | |
Merge from 1.1
--HG--
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/audio_out/audio_pulse_out.c')
| -rw-r--r-- | src/audio_out/audio_pulse_out.c | 3 |
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); |