From b3f3248543bcf43c562f99c8745144d9c1715fce Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 2 Sep 2020 17:38:56 +0300 Subject: [PATCH] screencast: Switch to new outputScreencastRequested() signal --- screencast/screencastmanager.cpp | 10 ++-------- screencast/screencastmanager.h | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/screencast/screencastmanager.cpp b/screencast/screencastmanager.cpp index 4b8b34ce1c..eb97094f39 100644 --- a/screencast/screencastmanager.cpp +++ b/screencast/screencastmanager.cpp @@ -128,16 +128,10 @@ void ScreencastManager::streamWindow(KWaylandServer::ScreencastStreamInterface * } void ScreencastManager::streamOutput(KWaylandServer::ScreencastStreamInterface *waylandStream, - ::wl_resource *outputResource, + KWaylandServer::OutputInterface *output, KWaylandServer::ScreencastInterface::CursorMode mode) { - auto outputIface = KWaylandServer::OutputInterface::get(outputResource); - if (!outputIface) { - waylandStream->sendFailed(i18n("Invalid output")); - return; - } - - AbstractWaylandOutput *streamOutput = waylandServer()->findOutput(outputIface); + AbstractWaylandOutput *streamOutput = waylandServer()->findOutput(output); if (!streamOutput) { waylandStream->sendFailed(i18n("Could not find output")); diff --git a/screencast/screencastmanager.h b/screencast/screencastmanager.h index 1cbe281957..2a33538c1f 100644 --- a/screencast/screencastmanager.h +++ b/screencast/screencastmanager.h @@ -24,7 +24,7 @@ public: void streamWindow(KWaylandServer::ScreencastStreamInterface *stream, const QString &winid); void streamOutput(KWaylandServer::ScreencastStreamInterface *stream, - ::wl_resource *outputResource, + KWaylandServer::OutputInterface *output, KWaylandServer::ScreencastInterface::CursorMode mode); private: