DATV demod. final cleanuo, Implements #833

f4exb · Apr 8, 2021 · 25a4118 · 25a4118
1 parent 64316e5
commit 25a4118
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -216,7 +216,7 @@ const QMap<QString, QString> WebAPIUtils::m_sourceDeviceHwIdToActionsKey = {
 };
 
 const QMap<QString, QString> 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
@@ -79,7 +79,6 @@ class SDRGUI_API TVScreen: public QGLWidget
     QTimer m_timer;
     QMutex m_mutex;
     bool m_dataChanged;
-    bool m_configChanged;
 
     GLShaderTVArray m_glShaderArray;