From 29064f088d4517ede7e32dc8b4abeae67a2eb5ba Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 27 Jul 2020 14:07:57 +0300 Subject: [PATCH] screencast: Address minor issues --- screencast/screencastmanager.cpp | 25 ++++++++++++++----------- screencast/screencastmanager.h | 16 +++++----------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/screencast/screencastmanager.cpp b/screencast/screencastmanager.cpp index d5dc42a995..627634d13e 100644 --- a/screencast/screencastmanager.cpp +++ b/screencast/screencastmanager.cpp @@ -19,20 +19,22 @@ */ #include "screencastmanager.h" -#include "scene.h" -#include "workspace.h" -#include "composite.h" -#include "platform.h" +#include "abstract_client.h" #include "abstract_wayland_output.h" -#include "plugins/scenes/opengl/scene_opengl.h" +#include "composite.h" +#include "deleted.h" +#include "effects.h" +#include "kwingltexture.h" #include "pipewirestream.h" +#include "platform.h" +#include "scene.h" +#include "wayland_server.h" +#include "workspace.h" + +#include #include #include -#include -#include -#include -#include using namespace KWin; @@ -45,6 +47,7 @@ ScreencastManager::ScreencastManager(QObject *parent) connect(m_screencast, &KWaylandServer::ScreencastInterface::outputScreencastRequested, this, &ScreencastManager::streamOutput); } + class EGLFence : public QObject { public: @@ -136,8 +139,8 @@ void ScreencastManager::streamWindow(KWaylandServer::ScreencastStreamInterface * } void ScreencastManager::streamOutput(KWaylandServer::ScreencastStreamInterface *waylandStream, - ::wl_resource *outputResource, - KWaylandServer::ScreencastInterface::CursorMode mode) + ::wl_resource *outputResource, + KWaylandServer::ScreencastInterface::CursorMode mode) { auto outputIface = KWaylandServer::OutputInterface::get(outputResource); if (!outputIface) { diff --git a/screencast/screencastmanager.h b/screencast/screencastmanager.h index 35ddb0407f..d4de04f545 100644 --- a/screencast/screencastmanager.h +++ b/screencast/screencastmanager.h @@ -21,27 +21,21 @@ #pragma once -#include "wayland_server.h" #include class PipeWireStream; -namespace KWin -{ -class AbstractEglBackend; -} - -class ScreencastManager - : public QObject +class ScreencastManager : public QObject { Q_OBJECT + public: - ScreencastManager(QObject *parent); + explicit ScreencastManager(QObject *parent = nullptr); void streamWindow(KWaylandServer::ScreencastStreamInterface *stream, const QString &winid); void streamOutput(KWaylandServer::ScreencastStreamInterface *stream, - ::wl_resource *outputResource, - KWaylandServer::ScreencastInterface::CursorMode mode); + ::wl_resource *outputResource, + KWaylandServer::ScreencastInterface::CursorMode mode); private: void integrateStreams(KWaylandServer::ScreencastStreamInterface *waylandStream, PipeWireStream *pipewireStream);