diff --git a/src/configuration.cc b/src/configuration.cc index 8e267eb25413d232affa50ca1a5af0d662c1d95b..15f3c60ff0d268c611cd87d806fded61b40c8ef2 100644 --- a/src/configuration.cc +++ b/src/configuration.cc @@ -14,14 +14,12 @@ Configuration::Configuration(QObject *parent) : QObject(parent) { QImage Configuration::frame() const { return frame_; } +const QImage &Configuration::ConstFrame() const { return frame_; } + QHostAddress Configuration::target_address() const { return target_address_; } quint32 Configuration::pixels() const { return pixels_; } -qint32 Configuration::width() const { return frame_.width(); } - -qint32 Configuration::height() const { return frame_.height(); } - quint8 Configuration::protocol_type() const { return kProtocolType; } quint32 Configuration::packet_header_size() const { diff --git a/src/configuration.h b/src/configuration.h index 6cca5cc1bc8234fdb3e72fa1272bf2ffd7808628..dc7b9d2c4b6dbe9e959c38a6ed69d42d39e52079 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -11,18 +11,15 @@ class Configuration : public QObject { Q_OBJECT public: - explicit Configuration(QObject *parent = nullptr); + explicit Configuration(QObject* parent = nullptr); QImage frame() const; + const QImage& ConstFrame() const; QHostAddress target_address() const; quint32 pixels() const; - qint32 width() const; - - qint32 height() const; - quint8 protocol_type() const; quint32 packet_header_size() const; diff --git a/src/muebtransmitter.cc b/src/muebtransmitter.cc index 0f297c73b4ce3a24b68e2ce51da9ddefd7a8af32..c6e7700e10c15a271485385da56e86f9ddbef3ab 100644 --- a/src/muebtransmitter.cc +++ b/src/muebtransmitter.cc @@ -11,8 +11,8 @@ void MuebTransmitter::SendFrame(libmueb::Frame frame) { Q_D(MuebTransmitter); if (frame.isNull() || frame.format() == QImage::Format_Invalid || - frame.width() != d->configuration_.width() || - frame.height() != d->configuration_.height()) { + frame.width() != d->configuration_.ConstFrame().width() || + frame.height() != d->configuration_.ConstFrame().height()) { qWarning() << "[MuebTransmitter] Frame is invalid"; return; } @@ -97,13 +97,13 @@ MuebTransmitter& MuebTransmitter::Instance() { quint32 MuebTransmitter::width() const { Q_D(const MuebTransmitter); - return d->configuration_.width(); + return d->configuration_.ConstFrame().width(); } quint32 MuebTransmitter::height() const { Q_D(const MuebTransmitter); - return d->configuration_.height(); + return d->configuration_.ConstFrame().height(); } libmueb::Frame MuebTransmitter::frame() const {