Skip to content
Snippets Groups Projects
Commit 98ca4a1b authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#3388] Open ringtone stream using device name in pulseaudio

parent 2345dd70
Branches
Tags
No related merge requests found
...@@ -226,7 +226,11 @@ AudioStream::createStream (pa_context* c, std::string *deviceName) ...@@ -226,7 +226,11 @@ AudioStream::createStream (pa_context* c, std::string *deviceName)
attributes->minreq = (uint32_t) -1; attributes->minreq = (uint32_t) -1;
pa_threaded_mainloop_lock(_mainloop); 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); pa_threaded_mainloop_unlock(_mainloop);
} else if (_streamType == UPLOAD_STREAM) { } else if (_streamType == UPLOAD_STREAM) {
......
...@@ -506,7 +506,7 @@ bool PulseLayer::createStreams (pa_context* c) ...@@ -506,7 +506,7 @@ bool PulseLayer::createStreams (pa_context* c)
// pa_stream_set_suspended_callback(record->pulseStream(), stream_suspended_callback, this); // pa_stream_set_suspended_callback(record->pulseStream(), stream_suspended_callback, this);
pa_stream_set_moved_callback(record->pulseStream(), stream_moved_callback, this); pa_stream_set_moved_callback(record->pulseStream(), stream_moved_callback, this);
delete recordParam; delete recordParam;
PulseLayerType * ringtoneParam = new PulseLayerType(); PulseLayerType * ringtoneParam = new PulseLayerType();
ringtoneParam->context = c; ringtoneParam->context = c;
ringtoneParam->type = RINGTONE_STREAM; ringtoneParam->type = RINGTONE_STREAM;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment