From fb030a977bc2d780ec5c6d473c5ed5f068321611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodn=C3=A1r=20Zsombor?= <bodzsoaa@sch.bme.hu>
Date: Tue, 9 Feb 2021 19:10:03 +0100
Subject: [PATCH] Change emitted QImage to QPixmap
---
include/libmueb/muebreceiver.h | 5 +++--
src/muebreceiver.cc | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/libmueb/muebreceiver.h b/include/libmueb/muebreceiver.h
index b2a63fd..5c2d0df 100644
--- a/include/libmueb/muebreceiver.h
+++ b/include/libmueb/muebreceiver.h
@@ -2,6 +2,7 @@
#define LIBMUEB_MUEBRECEIVER_H_
#include <QObject>
+#include <QPixmap>
#include "libmueb_global.h"
@@ -14,10 +15,10 @@ class LIBMUEB_EXPORT MuebReceiver final : public QObject {
public:
static MuebReceiver& Instance();
- libmueb::Frame frame() const;
+ QPixmap frame() const;
signals:
- void FrameChanged(libmueb::Frame frame);
+ void FrameChanged(QPixmap frame);
private:
MuebReceiverPrivate* d_ptr_;
diff --git a/src/muebreceiver.cc b/src/muebreceiver.cc
index db5b2b7..1794589 100644
--- a/src/muebreceiver.cc
+++ b/src/muebreceiver.cc
@@ -15,10 +15,10 @@ MuebReceiver &MuebReceiver::Instance() {
return instance;
}
-libmueb::Frame MuebReceiver::frame() const {
+QPixmap MuebReceiver::frame() const {
Q_D(const MuebReceiver);
- return d->frame;
+ return QPixmap::fromImage(d->frame);
}
inline void datagram_uncompress_error() {
@@ -66,7 +66,7 @@ void MuebReceiver::ReadPendingDatagrams() {
std::memcpy(frame_begin, data.constData(), data.size());
}
- emit(FrameChanged(d->frame));
+ emit(FrameChanged(QPixmap::fromImage(d->frame)));
}
// Drop invalid packet
else {
--
GitLab