diff --git a/src/dialogs/AcceptCall.cpp b/src/dialogs/AcceptCall.cpp
index 8323e9ff..3d25ad82 100644
--- a/src/dialogs/AcceptCall.cpp
+++ b/src/dialogs/AcceptCall.cpp
@@ -18,7 +18,6 @@ AcceptCall::AcceptCall(const QString &caller,
const QString &displayName,
const QString &roomName,
const QString &avatarUrl,
- QSharedPointer<UserSettings> settings,
bool isVideo,
QWidget *parent)
: QWidget(parent)
@@ -35,8 +34,10 @@ AcceptCall::AcceptCall(const QString &caller,
emit close();
return;
}
+
session->refreshDevices();
- microphones_ = session->getDeviceNames(false, settings->microphone().toStdString());
+ microphones_ = session->getDeviceNames(
+ false, ChatPage::instance()->userSettings()->microphone().toStdString());
if (microphones_.empty()) {
emit ChatPage::instance()->showNotification(
tr("Incoming call: No microphone found."));
@@ -44,7 +45,8 @@ AcceptCall::AcceptCall(const QString &caller,
return;
}
if (isVideo)
- cameras_ = session->getDeviceNames(true, settings->camera().toStdString());
+ cameras_ = session->getDeviceNames(
+ true, ChatPage::instance()->userSettings()->camera().toStdString());
setAutoFillBackground(true);
setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
@@ -131,11 +133,11 @@ AcceptCall::AcceptCall(const QString &caller,
if (cameraCombo_)
layout->addWidget(cameraCombo_);
- connect(acceptBtn_, &QPushButton::clicked, this, [this, settings, session]() {
- settings->setMicrophone(
+ connect(acceptBtn_, &QPushButton::clicked, this, [this]() {
+ ChatPage::instance()->userSettings()->setMicrophone(
QString::fromStdString(microphones_[microphoneCombo_->currentIndex()]));
if (cameraCombo_) {
- settings->setCamera(
+ ChatPage::instance()->userSettings()->setCamera(
QString::fromStdString(cameras_[cameraCombo_->currentIndex()]));
}
emit accept();
diff --git a/src/dialogs/AcceptCall.h b/src/dialogs/AcceptCall.h
index 00616c53..76ca7ae1 100644
--- a/src/dialogs/AcceptCall.h
+++ b/src/dialogs/AcceptCall.h
@@ -3,13 +3,11 @@
#include <string>
#include <vector>
-#include <QSharedPointer>
#include <QWidget>
class QComboBox;
class QPushButton;
class QString;
-class UserSettings;
namespace dialogs {
@@ -22,7 +20,6 @@ public:
const QString &displayName,
const QString &roomName,
const QString &avatarUrl,
- QSharedPointer<UserSettings> settings,
bool isVideo,
QWidget *parent = nullptr);
|
