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/CallDevices.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/voip/CallDevices.cpp') diff --git a/src/voip/CallDevices.cpp b/src/voip/CallDevices.cpp index 353fc4a5..b0c90d84 100644 --- a/src/voip/CallDevices.cpp +++ b/src/voip/CallDevices.cpp @@ -8,7 +8,6 @@ #include #include "CallDevices.h" -#include "ChatPage.h" #include "Logging.h" #include "UserSettingsPage.h" @@ -70,7 +69,7 @@ addFrameRate(std::vector &rates, const FrameRate &rate) void setDefaultDevice(bool isVideo) { - auto settings = ChatPage::instance()->userSettings(); + auto settings = UserSettings::instance(); if (isVideo && settings->camera().isEmpty()) { const VideoSource &camera = videoSources_.front(); settings->setCamera(QString::fromStdString(camera.name)); @@ -320,7 +319,7 @@ CallDevices::frameRates(const std::string &cameraName, const std::string &resolu GstDevice * CallDevices::audioDevice() const { - std::string name = ChatPage::instance()->userSettings()->microphone().toStdString(); + std::string name = UserSettings::instance()->microphone().toStdString(); if (auto it = std::find_if(audioSources_.cbegin(), audioSources_.cend(), [&name](const auto &s) { return s.name == name; }); @@ -336,7 +335,7 @@ CallDevices::audioDevice() const GstDevice * CallDevices::videoDevice(std::pair &resolution, std::pair &frameRate) const { - auto settings = ChatPage::instance()->userSettings(); + auto settings = UserSettings::instance(); std::string name = settings->camera().toStdString(); if (auto s = getVideoSource(name); s) { nhlog::ui()->debug("WebRTC: camera: {}", name); -- cgit 1.5.1