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

[#3649] Update pulseaudio layer with new configuration

parent 91ed7d01
No related branches found
No related tags found
No related merge requests found
...@@ -519,9 +519,9 @@ bool PulseLayer::createStreams (pa_context* c) ...@@ -519,9 +519,9 @@ bool PulseLayer::createStreams (pa_context* c)
// _debug("Device list size %d", getDevicelist()->size()); // _debug("Device list size %d", getDevicelist()->size());
std::string playbackDevice = _manager->getConfigString(AUDIO, PULSE_DEVICE_PLAYBACK); std::string playbackDevice = _manager->audioPreference.getDevicePlayback();
std::string recordDevice = _manager->getConfigString(AUDIO, PULSE_DEVICE_PLAYBACK); std::string recordDevice = _manager->audioPreference.getDeviceRecord();
std::string ringtoneDevice = _manager->getConfigString(AUDIO, PULSE_DEVICE_PLAYBACK); std::string ringtoneDevice = _manager->audioPreference.getDeviceRingtone();
_debug("Audio: Device stored in config for playback: %s", playbackDevice.c_str()); _debug("Audio: Device stored in config for playback: %s", playbackDevice.c_str());
_debug("Audio: Device stored in config for ringtone: %s", recordDevice.c_str()); _debug("Audio: Device stored in config for ringtone: %s", recordDevice.c_str());
...@@ -615,8 +615,8 @@ void PulseLayer::closeCaptureStream (void) ...@@ -615,8 +615,8 @@ void PulseLayer::closeCaptureStream (void)
if (record) { if (record) {
std::string deviceName(pa_stream_get_device_name(record->pulseStream())); std::string deviceName(pa_stream_get_device_name(record->pulseStream()));
_debug("record device to be stored in config: %s", deviceName.c_str()); _debug("Audio: record device to be stored in config: %s", deviceName.c_str());
_manager->setConfig(AUDIO, PULSE_DEVICE_RECORD, deviceName); _manager->audioPreference.setDeviceRecord(deviceName);
delete record; delete record;
record=NULL; record=NULL;
} }
...@@ -627,16 +627,16 @@ void PulseLayer::closePlaybackStream (void) ...@@ -627,16 +627,16 @@ void PulseLayer::closePlaybackStream (void)
{ {
if (playback) { if (playback) {
std::string deviceName(pa_stream_get_device_name(playback->pulseStream())); std::string deviceName(pa_stream_get_device_name(playback->pulseStream()));
_debug("playback device to be stored in config: %s", deviceName.c_str()); _debug("Audio: playback device to be stored in config: %s", deviceName.c_str());
_manager->setConfig(AUDIO, PULSE_DEVICE_PLAYBACK, deviceName); _manager->audioPreference.setDevicePlayback(deviceName);
delete playback; delete playback;
playback=NULL; playback=NULL;
} }
if(ringtone) { if(ringtone) {
std::string deviceName(pa_stream_get_device_name(ringtone->pulseStream())); std::string deviceName(pa_stream_get_device_name(ringtone->pulseStream()));
_debug("ringtone device to be stored in config: %s", deviceName.c_str()); _debug("Audio: ringtone device to be stored in config: %s", deviceName.c_str());
_manager->setConfig(AUDIO, PULSE_DEVICE_RINGTONE, deviceName); _manager->audioPreference.setDeviceRingtone(deviceName);
delete ringtone; delete ringtone;
ringtone = NULL; ringtone = NULL;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment