From 3b11291dc23a2734c5e14fb8f2ca1d1b80c304df Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 11 Mar 2017 23:45:21 +0100
Subject: [PATCH] ATV Modulator: generic line type determination

---
 plugins/channeltx/modatv/atvmod.cpp | 63 +++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp
index 4724d5cf8..2489b9c63 100644
--- a/plugins/channeltx/modatv/atvmod.cpp
+++ b/plugins/channeltx/modatv/atvmod.cpp
@@ -177,13 +177,68 @@ void ATVMod::modulateSample()
 
 void ATVMod::pullVideo(Real& sample)
 {
-    if ((m_lineCount < 5 + m_nbBlankLines) || (m_lineCount > 621) || ((m_lineCount > 309) && (m_lineCount < 317 + m_nbBlankLines)))
+    if (m_interlaced)
     {
-        pullVSyncLine(sample);
+        int iLine = m_lineCount % m_nbLines2;
+
+        if (m_lineCount < m_nbLines2) // even image
+        {
+            if (iLine < m_nbSyncLinesHead)
+            {
+                pullVSyncLine(sample);
+            }
+            else if (iLine < m_nbSyncLinesHead + m_nbBlankLines)
+            {
+                pullVSyncLine(sample); // pull black line
+            }
+            else if (iLine < m_nbLines2 - 3)
+            {
+                pullImageLine(sample);
+            }
+            else
+            {
+                pullVSyncLine(sample);
+            }
+        }
+        else // odd image
+        {
+            if (iLine < m_nbSyncLinesHead - 1)
+            {
+                pullVSyncLine(sample);
+            }
+            else if (iLine < m_nbSyncLinesHead + m_nbBlankLines - 1)
+            {
+                pullVSyncLine(sample); // pull black line
+            }
+            else if (iLine < m_nbLines2 - 4)
+            {
+                pullImageLine(sample);
+            }
+            else
+            {
+                pullVSyncLine(sample);
+            }
+        }
     }
-    else
+    else // non interlaced
     {
-        pullImageLine(sample);
+        if (m_lineCount < m_nbSyncLinesHead)
+        {
+            pullVSyncLine(sample);
+        }
+        else if (m_lineCount < m_nbSyncLinesHead + m_nbBlankLines)
+        {
+            pullVSyncLine(sample); // pull black line
+        }
+        else if (m_lineCount < m_nbLines - 3)
+        {
+            pullImageLine(sample);
+        }
+        else
+        {
+            pullVSyncLine(sample);
+        }
+
     }
 
     if (m_horizontalCount < m_nbHorizPoints - 1)