From bfc013e18a3aa98af1abad836f25e0988df30fa0 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 12 Apr 2021 11:41:21 +0200 Subject: [PATCH] DATV demod: fixed compilation issue for Qt < 5.14 --- plugins/channelrx/demoddatv/datvvideoplayer.h | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/plugins/channelrx/demoddatv/datvvideoplayer.h b/plugins/channelrx/demoddatv/datvvideoplayer.h index dc5f54b1e..67551c077 100644 --- a/plugins/channelrx/demoddatv/datvvideoplayer.h +++ b/plugins/channelrx/demoddatv/datvvideoplayer.h @@ -52,8 +52,11 @@ template struct datvvideoplayer: runnable int nw; m_udpStream->pushData((const char *) in.rd(), in.readable()); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) m_atomicUDPRunning.storeRelaxed(m_udpStream->isActive() && (size > 0) ? 1 : 0); - +#else + m_atomicUDPRunning.store(m_udpStream->isActive() && (size > 0) ? 1 : 0); +#endif if (m_videoStream) { nw = m_videoStream->pushData((const char *) in.rd(), size); @@ -88,8 +91,23 @@ template struct datvvideoplayer: runnable in.read(nw / sizeof(T)); } - bool isUDPRunning() const { return m_atomicUDPRunning.loadRelaxed() == 1; } - void resetUDPRunning() { m_atomicUDPRunning.storeRelaxed(0); } + bool isUDPRunning() const + { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + return m_atomicUDPRunning.loadRelaxed() == 1; +#else + return m_atomicUDPRunning.load() == 1; +#endif + } + + void resetUDPRunning() + { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + m_atomicUDPRunning.storeRelaxed(0); +#else + m_atomicUDPRunning.store(0); +#endif + } private: pipereader in;