From 7e8d9889cdb51b13d4cce8c87e4299d42a652c27 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Thu, 16 Mar 2017 21:37:41 +0100
Subject: [PATCH] ATV Demod: changed some attribute names

---
 plugins/channelrx/demodatv/atvdemod.cpp | 26 ++++++++++++-------------
 plugins/channelrx/demodatv/atvdemod.h   |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp
index 60c07ee89..a454dd6dc 100644
--- a/plugins/channelrx/demodatv/atvdemod.cpp
+++ b/plugins/channelrx/demodatv/atvdemod.cpp
@@ -37,8 +37,8 @@ ATVDemod::ATVDemod() :
     m_blnSynchroDetected(false),
     m_blnLineSynchronized(false),
     m_blnVerticalSynchroDetected(false),
-    m_fltLevelSynchroTop(0.0),
-    m_fltLevelSynchroBlack(1.0),
+    m_fltVoltLevelSynchroTop(0.0),
+    m_fltVoltLevelSynchroBlack(1.0),
     m_enmModulation(ATV_FM1),
     m_intRowsLimit(0),
     m_blnImageDetecting(false),
@@ -112,8 +112,8 @@ void ATVDemod::InitATVParameters(
         m_intNumberSamplePerTop=0;
         m_intNumberOfLines=0;
 
-        m_fltLevelSynchroTop=0.0;
-        m_fltLevelSynchroBlack=1.0;
+        m_fltVoltLevelSynchroTop=0.0;
+        m_fltVoltLevelSynchroBlack=1.0;
 
         m_blnInitialized=false;
         m_objSettingsMutex.unlock();
@@ -121,8 +121,8 @@ void ATVDemod::InitATVParameters(
         return;
     }
 
-    m_fltLevelSynchroTop = fltVoltLevelSynchroTop;
-    m_fltLevelSynchroBlack = fltVoltLevelSynchroBlack;
+    m_fltVoltLevelSynchroTop = fltVoltLevelSynchroTop;
+    m_fltVoltLevelSynchroBlack = fltVoltLevelSynchroBlack;
 
     intNumberSamplePerLine=(int)((fltLineTimeUs*fltSampling)/fltSecondToUs);
     intNumberOfLines=(int)((fltSecondToUs/fltImagesPerSeconds)/round(fltLineTimeUs));
@@ -153,8 +153,8 @@ void ATVDemod::InitATVParameters(
 
     //Mise à jour de la config
     m_objRunning.m_enmModulation = m_enmModulation;
-    m_objRunning.m_fltVoltLevelSynchroBlack = m_fltLevelSynchroBlack;
-    m_objRunning.m_fltVoltLevelSynchroTop = m_fltLevelSynchroTop;
+    m_objRunning.m_fltVoltLevelSynchroBlack = m_fltVoltLevelSynchroBlack;
+    m_objRunning.m_fltVoltLevelSynchroTop = m_fltVoltLevelSynchroTop;
     m_objRunning.m_intFramePerS = intFramePerS;
     m_objRunning.m_intLineDurationUs = intLineDurationUs;
     m_objRunning.m_intTopDurationUs = intTopDurationUs;
@@ -182,7 +182,7 @@ void ATVDemod::InitATVParameters(
 
 void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
 {
-    float fltDivSynchroBlack=1.0f-m_fltLevelSynchroBlack;
+    float fltDivSynchroBlack=1.0f-m_fltVoltLevelSynchroBlack;
     float fltI;
     float fltQ;
     float fltNormI;
@@ -197,7 +197,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
     bool blnComputeImage=false;
 
     int intSynchroTimeSamples= (3*m_intNumberSamplePerLine)/4;
-    float fltSynchroTrameLevel =  0.5f*((float)intSynchroTimeSamples)*m_fltLevelSynchroBlack;
+    float fltSynchroTrameLevel =  0.5f*((float)intSynchroTimeSamples)*m_fltVoltLevelSynchroBlack;
 
     //********** Let's rock and roll buddy ! **********
 
@@ -335,7 +335,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
 
         //********** gray level **********
         //-0.3 -> 0.7
-        intVal = (int) 255.0*(fltVal-m_fltLevelSynchroBlack)/fltDivSynchroBlack;
+        intVal = (int) 255.0*(fltVal-m_fltVoltLevelSynchroBlack)/fltDivSynchroBlack;
 
         //0 -> 255
         if(intVal<0)
@@ -376,7 +376,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
             if(m_blnImageDetecting==false)
             {
                 //Floor Detection 0
-                if(fltVal<=m_fltLevelSynchroTop)
+                if(fltVal<=m_fltVoltLevelSynchroTop)
                 {
                     m_intSynchroPoints ++;
                 }
@@ -395,7 +395,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
             else
             {
                 //Image detection Sub Black 0.3
-                if(fltVal>=m_fltLevelSynchroBlack)
+                if(fltVal>=m_fltVoltLevelSynchroBlack)
                 {
                     m_intSynchroPoints ++;
                 }
diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h
index c64e55b8a..7b8136e4d 100644
--- a/plugins/channelrx/demodatv/atvdemod.h
+++ b/plugins/channelrx/demodatv/atvdemod.h
@@ -118,8 +118,8 @@ private:
        bool m_blnInitialized;
        int m_intNumberOfRowsToDisplay;
 
-       float m_fltLevelSynchroTop;
-       float m_fltLevelSynchroBlack;
+       float m_fltVoltLevelSynchroTop;
+       float m_fltVoltLevelSynchroBlack;
 
        ATVModulation m_enmModulation;