From 8e954827e27ab495e18b1e8983fcc15cc5a37058 Mon Sep 17 00:00:00 2001
From: Vladimir Stoiakin <VStoiakin@lavabit.com>
Date: Mon, 8 Jul 2019 22:36:08 +0300
Subject: [PATCH] avmodel: translate the string "default" from PulseAudio
Change-Id: I7578719f41d5c8e2c3e03312f6dd8022e3846766
---
src/avmodel.cpp | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/avmodel.cpp b/src/avmodel.cpp
index af1bd33e..00e871e6 100644
--- a/src/avmodel.cpp
+++ b/src/avmodel.cpp
@@ -308,6 +308,15 @@ AVModel::getAudioOutputDevices() const
{
QStringList devices = ConfigurationManager::instance()
.getAudioOutputDeviceList();
+
+ // A fix for ring-daemon#43
+ if (ConfigurationManager::instance().getAudioManager()
+ == QStringLiteral("pulseaudio")) {
+ if (devices.at(0) == QStringLiteral("default")) {
+ devices[0] = QObject::tr("default");
+ }
+ }
+
std::vector<std::string> result;
for (const auto& device : devices) {
result.emplace_back(device.toStdString());
@@ -320,6 +329,15 @@ AVModel::getAudioInputDevices() const
{
QStringList devices = ConfigurationManager::instance()
.getAudioInputDeviceList();
+
+ // A fix for ring-daemon#43
+ if (ConfigurationManager::instance().getAudioManager()
+ == QStringLiteral("pulseaudio")) {
+ if (devices.at(0) == QStringLiteral("default")) {
+ devices[0] = QObject::tr("default");
+ }
+ }
+
std::vector<std::string> result;
for (const auto& device : devices) {
result.emplace_back(device.toStdString());
--
GitLab