From d240d1ae57fd58f2075b9bbbf777b9a8471a8d4a Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 21 Jul 2020 23:54:06 +0200
Subject: [PATCH] ATV mod: corrected m_interleaved to m_interlaced

---
 plugins/channeltx/modatv/atvmodsource.cpp | 12 ++++++------
 plugins/channeltx/modatv/atvmodsource.h   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/channeltx/modatv/atvmodsource.cpp b/plugins/channeltx/modatv/atvmodsource.cpp
index c956133cc..69ae3ff89 100644
--- a/plugins/channeltx/modatv/atvmodsource.cpp
+++ b/plugins/channeltx/modatv/atvmodsource.cpp
@@ -545,7 +545,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     case ATVModSettings::ATVStdHSkip:
         m_nbImageLines     = m_nbLines; // lines less the total number of sync lines
         m_nbImageLines2    = m_nbImageLines; // force non interleaved for vbars
-        m_interleaved       = false;
+        m_interlaced       = false;
         m_nbSyncLinesHeadE = 0; // number of sync lines on the top of a frame even
         m_nbSyncLinesHeadO = 0; // number of sync lines on the top of a frame odd
         m_nbSyncLinesBottom = -1; // force no vsync in even block
@@ -560,7 +560,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     case ATVModSettings::ATVStdShort:
         m_nbImageLines     = m_nbLines - 2; // lines less the total number of sync lines
         m_nbImageLines2    = m_nbImageLines; // force non interleaved for vbars
-        m_interleaved       = false;
+        m_interlaced       = false;
         m_nbSyncLinesHeadE = 1; // number of sync lines on the top of a frame even
         m_nbSyncLinesHeadO = 1; // number of sync lines on the top of a frame odd
         m_nbSyncLinesBottom = 0;
@@ -575,7 +575,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     case ATVModSettings::ATVStdShortInterleaved:
         m_nbImageLines     = m_nbLines - 2; // lines less the total number of sync lines
         m_nbImageLines2    = m_nbImageLines / 2;
-        m_interleaved       = true;
+        m_interlaced       = true;
         m_nbSyncLinesHeadE = 1; // number of sync lines on the top of a frame even
         m_nbSyncLinesHeadO = 1; // number of sync lines on the top of a frame odd
         m_nbSyncLinesBottom = 0;
@@ -589,7 +589,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     case ATVModSettings::ATVStd405: // Follows loosely the 405 lines standard
         m_nbImageLines     = m_nbLines - 15; // lines less the total number of sync lines
         m_nbImageLines2    = m_nbImageLines / 2;
-        m_interleaved       = true;
+        m_interlaced       = true;
         m_nbSyncLinesHeadE = 5; // number of sync lines on the top of a frame even
         m_nbSyncLinesHeadO = 4; // number of sync lines on the top of a frame odd
         m_nbSyncLinesBottom = 3;
@@ -603,7 +603,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     case ATVModSettings::ATVStdPAL525: // Follows PAL-M standard
         m_nbImageLines     = m_nbLines - 15;
         m_nbImageLines2    = m_nbImageLines / 2;
-        m_interleaved       = true;
+        m_interlaced       = true;
         m_nbSyncLinesHeadE = 5;
         m_nbSyncLinesHeadO = 4; // number of sync lines on the top of a frame odd
         m_nbSyncLinesBottom = 3;
@@ -618,7 +618,7 @@ void ATVModSource::applyStandard(const ATVModSettings& settings)
     default:
         m_nbImageLines     = m_nbLines - 15;
         m_nbImageLines2    = m_nbImageLines / 2;
-        m_interleaved       = true;
+        m_interlaced       = true;
         m_nbSyncLinesHeadE = 5;
         m_nbSyncLinesHeadO = 4; // number of sync lines on the top of a frame odd
         m_nbSyncLinesBottom = 3;
diff --git a/plugins/channeltx/modatv/atvmodsource.h b/plugins/channeltx/modatv/atvmodsource.h
index 27f732ae1..e0cce2864 100644
--- a/plugins/channeltx/modatv/atvmodsource.h
+++ b/plugins/channeltx/modatv/atvmodsource.h
@@ -164,7 +164,7 @@ private:
     float    m_blankLineLvel;    //!< video level of blank lines
     float    m_hBarIncrement;    //!< video level increment at each horizontal bar increment
     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_interlaced;      //!< true if image is interlaced (2 half frames per frame)
     bool     m_evenImage;        //!< in interlaced mode true if this is an even image
     int      m_horizontalCount;  //!< current point index on line
     int      m_lineCount;        //!< current line index in frame
@@ -288,7 +288,7 @@ private:
                 {
                 	unsigned char pixv;
 
-                	if (m_interleaved) {
+                	if (m_interlaced) {
                         pixv = m_image.at<unsigned char>(2*iLineImage + oddity, pointIndex); // row (y), col (x)
                 	} else {
                         pixv = m_image.at<unsigned char>(iLineImage, pointIndex); // row (y), col (x)
@@ -306,7 +306,7 @@ private:
                 {
                 	unsigned char pixv;
 
-                	if (m_interleaved) {
+                	if (m_interlaced) {
                         pixv = m_videoFrame.at<unsigned char>(2*iLineImage + oddity, pointIndex); // row (y), col (x)
                 	} else {
                         pixv = m_videoFrame.at<unsigned char>(iLineImage, pointIndex); // row (y), col (x)
@@ -332,7 +332,7 @@ private:
                     {
                         unsigned char pixv;
 
-                        if (m_interleaved) {
+                        if (m_interlaced) {
                             pixv = camera.m_videoFrame.at<unsigned char>(2*iLineImage + oddity, pointIndex); // row (y), col (x)
                         } else {
                             pixv = camera.m_videoFrame.at<unsigned char>(iLineImage, pointIndex); // row (y), col (x)