Commit d96a13c6 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Use OutputInterface instead of raw wl_resource objects

Typically, we don't expose wl_output objects as wl_resource objects in
public API. Instead, we use the OutputInterface class for that purpose.
parent 22038455
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include "screencast_interface.h" #include "screencast_interface.h"
#include "display.h" #include "display.h"
#include "output_interface.h"
#include <QDebug> #include <QDebug>
#include "qwayland-server-zkde-screencast-unstable-v1.h" #include "qwayland-server-zkde-screencast-unstable-v1.h"
...@@ -86,7 +88,7 @@ public: ...@@ -86,7 +88,7 @@ public:
void zkde_screencast_unstable_v1_stream_output(Resource *resource, uint32_t streamid, struct ::wl_resource *output, uint32_t pointer) override void zkde_screencast_unstable_v1_stream_output(Resource *resource, uint32_t streamid, struct ::wl_resource *output, uint32_t pointer) override
{ {
Q_EMIT q->outputScreencastRequested(createStream(resource, streamid), output, ScreencastInterface::CursorMode(pointer)); Q_EMIT q->outputScreencastRequested(createStream(resource, streamid), OutputInterface::get(output), ScreencastInterface::CursorMode(pointer));
} }
void zkde_screencast_unstable_v1_stream_window(Resource *resource, uint32_t streamid, const QString &uuid, uint32_t pointer) override void zkde_screencast_unstable_v1_stream_window(Resource *resource, uint32_t streamid, const QString &uuid, uint32_t pointer) override
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <QObject> #include <QObject>
#include <QScopedPointer> #include <QScopedPointer>
#include <KWaylandServer/kwaylandserver_export.h> #include <KWaylandServer/kwaylandserver_export.h>
#include <wayland-server.h>
struct wl_resource; struct wl_resource;
...@@ -56,7 +55,7 @@ public: ...@@ -56,7 +55,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void outputScreencastRequested(ScreencastStreamInterface* stream, ::wl_resource *output, CursorMode mode); void outputScreencastRequested(ScreencastStreamInterface* stream, OutputInterface *output, CursorMode mode);
void windowScreencastRequested(ScreencastStreamInterface* stream, const QString &winid, CursorMode mode); void windowScreencastRequested(ScreencastStreamInterface* stream, const QString &winid, CursorMode mode);
private: private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment