diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index ea96b37ad..bac7e3200 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -836,7 +836,7 @@ void ATVMod::applyStandard() // what is left in a 64 us line for the image m_nbImageLines = m_nbLines - 15; // lines less the total number of sync lines m_nbImageLines2 = m_nbImageLines / 2; - m_interlaced = true; + m_interleaved = true; m_nbSyncLinesHead = 5; // number of sync lines on the top of a frame m_nbBlankLines = 7; // yields 376 lines (195 - 7) * 2 break; @@ -844,7 +844,7 @@ void ATVMod::applyStandard() // what is left in a 64/1.008 us line for the image m_nbImageLines = m_nbLines - 15; m_nbImageLines2 = m_nbImageLines / 2; - m_interlaced = true; + m_interleaved = true; m_nbSyncLinesHead = 5; m_nbBlankLines = 15; // yields 480 lines (255 - 15) * 2 break; @@ -853,7 +853,7 @@ void ATVMod::applyStandard() // what is left in a 64 us line for the image m_nbImageLines = m_nbLines - 15; m_nbImageLines2 = m_nbImageLines / 2; - m_interlaced = true; + m_interleaved = true; m_nbSyncLinesHead = 5; m_nbBlankLines = 17; // yields 576 lines (305 - 17) * 2 } diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index b88205969..84f0faebf 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -635,7 +635,7 @@ private: uint32_t m_nbBlankLines; //!< number of lines in a frame (full or half) that are blanked (black) at the top of the image float m_hBarIncrement; //!< video level increment at each horizontal bar increment float m_vBarIncrement; //!< video level increment at each vertical bar increment - bool m_interlaced; //!< true if image is interlaced (2 half frames per frame) + 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 @@ -755,7 +755,7 @@ private: { unsigned char pixv; - if (m_interlaced) { + if (m_interleaved) { pixv = m_image.at(2*iLineImage + oddity, pointIndex); // row (y), col (x) } else { pixv = m_image.at(iLineImage, pointIndex); // row (y), col (x) @@ -773,7 +773,7 @@ private: { unsigned char pixv; - if (m_interlaced) { + if (m_interleaved) { pixv = m_videoFrame.at(2*iLineImage + oddity, pointIndex); // row (y), col (x) } else { pixv = m_videoFrame.at(iLineImage, pointIndex); // row (y), col (x) @@ -799,7 +799,7 @@ private: { unsigned char pixv; - if (m_interlaced) { + if (m_interleaved) { pixv = camera.m_videoFrame.at(2*iLineImage + oddity, pointIndex); // row (y), col (x) } else { pixv = camera.m_videoFrame.at(iLineImage, pointIndex); // row (y), col (x)