From 25a4118e16c3418dcd499f588bf7598ed7001d12 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 8 Apr 2021 06:47:33 +0200 Subject: [PATCH] DATV demod. final cleanuo, Implements #833 --- plugins/channelrx/demoddatv/datvideorender.cpp | 9 +++------ sdrbase/webapi/webapiutils.cpp | 2 +- sdrgui/gui/tvscreen.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/channelrx/demoddatv/datvideorender.cpp b/plugins/channelrx/demoddatv/datvideorender.cpp index d25ab0533..bdb5d9758 100644 --- a/plugins/channelrx/demoddatv/datvideorender.cpp +++ b/plugins/channelrx/demoddatv/datvideorender.cpp @@ -717,21 +717,18 @@ int DATVideoRender::newDecode(AVCodecContext *avctx, AVFrame *frame, int *got_fr ret = avcodec_send_packet(avctx, pkt); // In particular, we don't expect AVERROR(EAGAIN), because we read all // decoded frames with avcodec_receive_frame() until done. - if (ret < 0) - { + if (ret < 0) { return ret == AVERROR_EOF ? 0 : ret; } } ret = avcodec_receive_frame(avctx, frame); - if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) - { + if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { return ret; } - if (ret >= 0) - { + if (ret >= 0) { *got_frame = 1; } diff --git a/sdrbase/webapi/webapiutils.cpp b/sdrbase/webapi/webapiutils.cpp index b5b1d5214..4af9d71d8 100644 --- a/sdrbase/webapi/webapiutils.cpp +++ b/sdrbase/webapi/webapiutils.cpp @@ -216,7 +216,7 @@ const QMap WebAPIUtils::m_sourceDeviceHwIdToActionsKey = { }; const QMap WebAPIUtils::m_sinkDeviceHwIdToSettingsKey = { - {"AudioOutput", "AudioOutputSettings"}, + {"AudioOutput", "audioOutputSettings"}, {"BladeRF1", "bladeRF1OutputSettings"}, {"BladeRF2", "bladeRF2OutputSettings"}, {"HackRF", "hackRFOutputSettings"}, diff --git a/sdrgui/gui/tvscreen.h b/sdrgui/gui/tvscreen.h index 29b2950ca..b93d9676b 100644 --- a/sdrgui/gui/tvscreen.h +++ b/sdrgui/gui/tvscreen.h @@ -79,7 +79,6 @@ private: QTimer m_timer; QMutex m_mutex; bool m_dataChanged; - bool m_configChanged; GLShaderTVArray m_glShaderArray;