diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index 377d01579066cf30e24d0f4956650fec58d4b9bc..36aaffefb855b07ec44c3853b3f5c137b418d34d 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -177,7 +177,7 @@ AC_SUBST(UUID_LIBS) AC_SUBST(ALSA_LIBS) dnl Check for pulseaudio development package - name: libpulse-dev - LIBPULSE_MIN_VERSION=0.9.6 + LIBPULSE_MIN_VERSION=0.9.15 PKG_CHECK_MODULES(PULSEAUDIO, libpulse >= ${LIBPULSE_MIN_VERSION}) AC_SUBST(PULSEAUDIO_LIBS) AC_SUBST(PULSEAUDIO_CFLAGS) diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.cpp b/sflphone-common/src/audio/pulseaudio/audiostream.cpp index 0b59c2e968ef5eb70a4d574fed00d6ac61af04e9..7a64544b9a01feec2baf165b09ce7c8f7c1c79de 100644 --- a/sflphone-common/src/audio/pulseaudio/audiostream.cpp +++ b/sflphone-common/src/audio/pulseaudio/audiostream.cpp @@ -237,7 +237,11 @@ AudioStream::createStream (pa_context* c, std::string *deviceName) attributes->minreq = (uint32_t) -1; pa_threaded_mainloop_lock(_mainloop); - pa_stream_connect_playback(s, NULL, attributes, (pa_stream_flags_t) (PA_STREAM_ADJUST_LATENCY|PA_STREAM_AUTO_TIMING_UPDATE), NULL, NULL); + if(deviceName) + pa_stream_connect_playback(s, deviceName->c_str(), attributes, (pa_stream_flags_t) (PA_STREAM_ADJUST_LATENCY|PA_STREAM_AUTO_TIMING_UPDATE), NULL, NULL); + else + pa_stream_connect_playback(s, NULL, attributes, (pa_stream_flags_t) (PA_STREAM_ADJUST_LATENCY|PA_STREAM_AUTO_TIMING_UPDATE), NULL, NULL); + pa_threaded_mainloop_unlock(_mainloop); } else if (_streamType == UPLOAD_STREAM) { diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp index c6ecae78ad178d3354b063b46365b5d8750aee9b..41ace3e3bc4a5f1d74867e4c42c43156d68b601f 100644 --- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp +++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp @@ -517,7 +517,7 @@ bool PulseLayer::createStreams (pa_context* c) // pa_stream_set_suspended_callback(record->pulseStream(), stream_suspended_callback, this); pa_stream_set_moved_callback(record->pulseStream(), stream_moved_callback, this); delete recordParam; - + PulseLayerType * ringtoneParam = new PulseLayerType(); ringtoneParam->context = c; ringtoneParam->type = RINGTONE_STREAM;