jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

* #26839: preferences: fix formatting with astyle

Browse Source
This commit is contained in:
Tristan Matthews
2013-07-15 16:06:44 -04:00
parent 2c0fd6101b
commit 6e4cf7d904
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/src/preferences.cpp
View File

@ -313,6 +313,7 @@ void checkSoundCard(int &card, AudioLayer::PCMType stream)
WARN(" Card with index %d doesn't exist or is unusable.", card);
card = ALSA_DFT_CARD_ID;
}
card = ALSA_DFT_CARD_ID;
}
#endif
@ -325,12 +326,14 @@ AudioLayer* AudioPreference::createAudioLayer()
#endif
#if HAVE_PULSE
if (audioApi_ == PULSEAUDIO_API_STR) {
if (system("pactl info > /dev/null") == 0)
return new PulseLayer(*this);
else
WARN("pulseaudio daemon not running, falling back to ALSA");
}
#endif
#if HAVE_ALSA
@ -440,6 +443,7 @@ void AudioPreference::unserialize(const Conf::YamlNode &map)
map.getValue(AUDIO_API_KEY, &audioApi_);
std::string tmpRecordPath;
map.getValue(RECORDPATH_KEY, &tmpRecordPath);
if (not setRecordPath(tmpRecordPath))
setRecordPath(fileutils::get_home_dir());
@ -467,6 +471,7 @@ void AudioPreference::unserialize(const Conf::YamlNode &map)
pulsemap->getValue(DEVICE_RECORD_KEY, &pulseDeviceRecord_);
pulsemap->getValue(DEVICE_RINGTONE_KEY, &pulseDeviceRingtone_);
}
#endif
}