From de3706624ae6ecbbdc4270cd73e4cdb5ccc8c7e7 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Mon, 12 Jul 2010 08:48:54 -0400
Subject: [PATCH] [#3649] Update pulseaudio layer with new configuration
---
.../src/audio/pulseaudio/pulselayer.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
mode change 100644 => 100755 sflphone-common/src/audio/pulseaudio/pulselayer.cpp
diff --git a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
old mode 100644
new mode 100755
index 56c2ab8c7b..d86f159bf3
--- a/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
+++ b/sflphone-common/src/audio/pulseaudio/pulselayer.cpp
@@ -519,9 +519,9 @@ bool PulseLayer::createStreams (pa_context* c)
// _debug("Device list size %d", getDevicelist()->size());
- std::string playbackDevice = _manager->getConfigString(AUDIO, PULSE_DEVICE_PLAYBACK);
- std::string recordDevice = _manager->getConfigString(AUDIO, PULSE_DEVICE_PLAYBACK);
- std::string ringtoneDevice = _manager->getConfigString(AUDIO, PULSE_DEVICE_PLAYBACK);
+ std::string playbackDevice = _manager->audioPreference.getDevicePlayback();
+ std::string recordDevice = _manager->audioPreference.getDeviceRecord();
+ 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 ringtone: %s", recordDevice.c_str());
@@ -615,8 +615,8 @@ void PulseLayer::closeCaptureStream (void)
if (record) {
std::string deviceName(pa_stream_get_device_name(record->pulseStream()));
- _debug("record device to be stored in config: %s", deviceName.c_str());
- _manager->setConfig(AUDIO, PULSE_DEVICE_RECORD, deviceName);
+ _debug("Audio: record device to be stored in config: %s", deviceName.c_str());
+ _manager->audioPreference.setDeviceRecord(deviceName);
delete record;
record=NULL;
}
@@ -627,16 +627,16 @@ void PulseLayer::closePlaybackStream (void)
{
if (playback) {
std::string deviceName(pa_stream_get_device_name(playback->pulseStream()));
- _debug("playback device to be stored in config: %s", deviceName.c_str());
- _manager->setConfig(AUDIO, PULSE_DEVICE_PLAYBACK, deviceName);
+ _debug("Audio: playback device to be stored in config: %s", deviceName.c_str());
+ _manager->audioPreference.setDevicePlayback(deviceName);
delete playback;
playback=NULL;
}
if(ringtone) {
std::string deviceName(pa_stream_get_device_name(ringtone->pulseStream()));
- _debug("ringtone device to be stored in config: %s", deviceName.c_str());
- _manager->setConfig(AUDIO, PULSE_DEVICE_RINGTONE, deviceName);
+ _debug("Audio: ringtone device to be stored in config: %s", deviceName.c_str());
+ _manager->audioPreference.setDeviceRingtone(deviceName);
delete ringtone;
ringtone = NULL;
}
--
GitLab