From 9033235e9da36bfdb10a83f96c713190f0505ca8 Mon Sep 17 00:00:00 2001 From: Joe Donofry Date: Sun, 2 Jan 2022 21:15:10 +0000 Subject: Gstreamer glib event loop for macos and windows - This ensures that gstreamer bus operations work on macOS and windows, such as enumerating devices. --- src/voip/CallManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/voip/CallManager.cpp') 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 &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 devices = CallDevices::instance().names(isVideo, defaultDevice.toStdString()); ret.reserve(devices.size()); -- cgit 1.5.1