From 3fde47ff704f1b33ecbe42f6386de21b1bc633b3 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 1 Dec 2019 19:53:46 +0100
Subject: [PATCH] ATV modulator: removed useless mutex in ATVModSource

---
 plugins/channeltx/modatv/atvmodsource.cpp | 19 -------------------
 plugins/channeltx/modatv/atvmodsource.h   |  1 -
 2 files changed, 20 deletions(-)

diff --git a/plugins/channeltx/modatv/atvmodsource.cpp b/plugins/channeltx/modatv/atvmodsource.cpp
index 49424700d..c95447283 100644
--- a/plugins/channeltx/modatv/atvmodsource.cpp
+++ b/plugins/channeltx/modatv/atvmodsource.cpp
@@ -45,7 +45,6 @@ ATVModSource::ATVModSource() :
 	m_modPhasor(0.0f),
     m_tvSampleRate(1000000),
     m_evenImage(true),
-    m_settingsMutex(QMutex::Recursive),
     m_horizontalCount(0),
     m_lineCount(0),
 	m_imageOK(false),
@@ -121,8 +120,6 @@ void ATVModSource::pullOne(Sample& sample)
 
     Complex ci;
 
-    m_settingsMutex.lock();
-
     if ((m_tvSampleRate == m_channelSampleRate) && (!m_settings.m_forceDecimator)) // no interpolation nor decimation
     {
         modulateSample();
@@ -156,8 +153,6 @@ void ATVModSource::pullFinalize(Complex& ci, Sample& sample)
 {
     ci *= m_carrierNco.nextIQ(); // shift to carrier frequency
 
-    m_settingsMutex.unlock();
-
     double magsq = ci.real() * ci.real() + ci.imag() * ci.imag();
     magsq /= (SDR_TX_SCALED*SDR_TX_SCALED);
     m_movingAverage(magsq);
@@ -776,8 +771,6 @@ void ATVModSource::resizeCamera()
 
 void ATVModSource::seekVideoFileStream(int seekPercentage)
 {
-    QMutexLocker mutexLocker(&m_settingsMutex);
-
     if ((m_videoOK) && m_video.isOpened())
     {
         int seekPoint = ((m_videoLength * seekPercentage) / 100);
@@ -884,17 +877,13 @@ void ATVModSource::applyChannelSettings(int channelSampleRate, int channelFreque
     if ((channelFrequencyOffset != m_channelFrequencyOffset) ||
         (channelSampleRate != m_channelSampleRate) || force)
     {
-        m_settingsMutex.lock();
         m_carrierNco.setFreq(channelFrequencyOffset, channelSampleRate);
-        m_settingsMutex.unlock();
     }
 
     if ((channelSampleRate != m_channelSampleRate) || force)
     {
         getBaseValues(channelSampleRate, m_settings.m_nbLines * m_settings.m_fps, m_tvSampleRate, m_pointsPerLine);
 
-        m_settingsMutex.lock();
-
         if (m_tvSampleRate > 0)
         {
             m_interpolatorDistanceRemain = 0;
@@ -921,7 +910,6 @@ void ATVModSource::applyChannelSettings(int channelSampleRate, int channelFreque
         m_DSBFilterBufferIndex = 0;
 
         applyStandard(m_settings); // set all timings
-        m_settingsMutex.unlock();
 
         if (getMessageQueueToGUI())
         {
@@ -967,8 +955,6 @@ void ATVModSource::applySettings(const ATVModSettings& settings, bool force)
     {
         getBaseValues(m_channelSampleRate, settings.m_nbLines * settings.m_fps, m_tvSampleRate, m_pointsPerLine);
 
-        m_settingsMutex.lock();
-
         if (m_tvSampleRate > 0)
         {
             m_interpolatorDistanceRemain = 0;
@@ -984,7 +970,6 @@ void ATVModSource::applySettings(const ATVModSettings& settings, bool force)
         m_SSBFilterBufferIndex = 0;
 
         applyStandard(settings); // set all timings
-        m_settingsMutex.unlock();
 
         if (getMessageQueueToGUI())
         {
@@ -1000,16 +985,12 @@ void ATVModSource::applySettings(const ATVModSettings& settings, bool force)
         || (settings.m_fps != m_settings.m_fps)         //
         || force)
     {
-        m_settingsMutex.lock();
-
         m_DSBFilter->create_asym_filter(
             settings.m_rfOppBandwidth / (float) m_tvSampleRate,
             settings.m_rfBandwidth / (float) m_tvSampleRate
         );
         std::fill(m_DSBFilterBuffer, m_DSBFilterBuffer + m_ssbFftLen, Complex{0.0, 0.0});
         m_DSBFilterBufferIndex = 0;
-
-        m_settingsMutex.unlock();
     }
 
     if ((settings.m_showOverlayText != m_settings.m_showOverlayText) || force)
diff --git a/plugins/channeltx/modatv/atvmodsource.h b/plugins/channeltx/modatv/atvmodsource.h
index c97eb9fd0..f575ebf1d 100644
--- a/plugins/channeltx/modatv/atvmodsource.h
+++ b/plugins/channeltx/modatv/atvmodsource.h
@@ -166,7 +166,6 @@ private:
     float    m_vBarIncrement;    //!< video level increment at each vertical bar increment
     bool     m_interleaved;      //!< true if image is interlaced (2 half frames per frame)
     bool     m_evenImage;        //!< in interlaced mode true if this is an even image
-    QMutex   m_settingsMutex;
     int      m_horizontalCount;  //!< current point index on line
     int      m_lineCount;        //!< current line index in frame
     float    m_fps;              //!< resulting frames per second