From 98ca4a1be5577f76fac32f72a08a6b2e90a4f276 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@alexandresavard-desktop.(none)>
Date: Fri, 21 May 2010 17:24:00 -0400
Subject: [PATCH] [#3388] Open ringtone stream using device name in pulseaudio
---
sflphone-common/src/audio/pulseaudio/audiostream.cpp | 6 +++++-
sflphone-common/src/audio/pulseaudio/pulselayer.cpp | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/sflphone-common/src/audio/pulseaudio/audiostream.cpp b/sflphone-common/src/audio/pulseaudio/audiostream.cpp
index 0ff3956bb1..b701889de8 100644
--- a/sflphone-common/src/audio/pulseaudio/audiostream.cpp
+++ b/sflphone-common/src/audio/pulseaudio/audiostream.cpp
@@ -226,7 +226,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 e6b3c905be..c739b55c3f 100644
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -506,7 +506,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;
--
GitLab