summary refs log tree commit diff
path: root/src/voip/CallManager.cpp
diff options
context:
space:
mode:
authorJoe Donofry <rubberduckie3554@gmail.com>2022-01-02 21:15:10 +0000
committerJoe Donofry <rubberduckie3554@gmail.com>2022-01-02 21:15:10 +0000
commit9033235e9da36bfdb10a83f96c713190f0505ca8 (patch)
treea61d2ff66e591fce9d6e9296dcd01f54eb2b8785 /src/voip/CallManager.cpp
parentSimplify Ripple effect and make it easier to use everywhere (diff)
downloadnheko-9033235e9da36bfdb10a83f96c713190f0505ca8.tar.xz
Gstreamer glib event loop for macos and windows
- This ensures that gstreamer bus operations work
on macOS and windows, such as enumerating devices.
Diffstat (limited to 'src/voip/CallManager.cpp')
-rw-r--r--src/voip/CallManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/voip/CallManager.cpp b/src/voip/CallManager.cpp

index f184b622..54d86620 100644 --- a/src/voip/CallManager.cpp +++ b/src/voip/CallManager.cpp
@@ -292,7 +292,7 @@ CallManager::handleEvent(const RoomEvent<CallInvite> &callInviteEvent) return; } - const QString &ringtone = ChatPage::instance()->userSettings()->ringtone(); + const QString &ringtone = UserSettings::instance()->ringtone(); if (ringtone != QLatin1String("Mute")) playRingtone(ringtone == QLatin1String("Default") ? QUrl(QStringLiteral("qrc:/media/media/ring.ogg")) @@ -431,8 +431,8 @@ QStringList CallManager::devices(bool isVideo) const { QStringList ret; - const QString &defaultDevice = isVideo ? ChatPage::instance()->userSettings()->camera() - : ChatPage::instance()->userSettings()->microphone(); + const QString &defaultDevice = + isVideo ? UserSettings::instance()->camera() : UserSettings::instance()->microphone(); std::vector<std::string> devices = CallDevices::instance().names(isVideo, defaultDevice.toStdString()); ret.reserve(devices.size());