summaryrefslogtreecommitdiffstats
path: root/src/soundio/soundmanagerconfig.cpp
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2016-12-16 23:56:31 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2016-12-16 23:56:31 +0100
commit8884499481732a32e9f891a4c1083efc67430b7e (patch)
tree6069709b98da16a4fa5e908be8f0eacfde86088e /src/soundio/soundmanagerconfig.cpp
parentf8944120aa6f952a5942dfeb16f903df865fa205 (diff)
Track sound devices not found.
Diffstat (limited to 'src/soundio/soundmanagerconfig.cpp')
-rw-r--r--src/soundio/soundmanagerconfig.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/soundio/soundmanagerconfig.cpp b/src/soundio/soundmanagerconfig.cpp
index feb4f36b33..bc852b7436 100644
--- a/src/soundio/soundmanagerconfig.cpp
+++ b/src/soundio/soundmanagerconfig.cpp
@@ -129,7 +129,7 @@ bool SoundManagerConfig::writeToDisk() const {
docElement.setAttribute("deck_count", m_deckCount);
doc.appendChild(docElement);
- foreach (QString device, m_outputs.keys().toSet().unite(m_inputs.keys().toSet())) {
+ for (const auto& device: getDevices()) {
QDomElement devElement(doc.createElement("SoundDevice"));
devElement.setAttribute("name", device);
foreach (AudioInput in, m_inputs.values(device)) {
@@ -220,7 +220,7 @@ void SoundManagerConfig::setDeckCount(unsigned int deckCount) {
void SoundManagerConfig::setCorrectDeckCount(int configuredDeckCount) {
int minimum_deck_count = 0;
- foreach (QString device, m_outputs.keys().toSet().unite(m_inputs.keys().toSet())) {
+ for (const auto& device: getDevices()) {
foreach (AudioInput in, m_inputs.values(device)) {
if ((in.getType() == AudioInput::DECK ||
in.getType() == AudioInput::VINYLCONTROL ||
@@ -377,3 +377,10 @@ void SoundManagerConfig::loadDefaults(SoundManager *soundManager, unsigned int f
m_syncBuffers = kDefaultSyncBuffers;
}
+
+QSet<QString> SoundManagerConfig::getDevices() const {
+ QSet<QString> devices;
+ devices = m_outputs.keys().toSet().unite(m_inputs.keys().toSet());
+ return devices;
+}
+