From 645329b6c68665eb305abef0d0095afee91a32a1 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 5 Apr 2017 05:01:01 +0200
Subject: [PATCH] ATV: implemented 8 FPS

---
 plugins/channelrx/demodatv/atvdemodgui.cpp |  7 ++-
 plugins/channelrx/demodatv/atvdemodgui.ui  | 58 ++++++++++++++++++----
 plugins/channeltx/modatv/atvmodgui.cpp     |  3 ++
 plugins/channeltx/modatv/atvmodgui.ui      |  9 +++-
 4 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp
index bce633d4e..96e3b6754 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.cpp
+++ b/plugins/channelrx/demodatv/atvdemodgui.cpp
@@ -690,7 +690,7 @@ float ATVDemodGUI::getFps(int fpsIndex)
 {
     switch(fpsIndex)
     {
-    case 1:
+    case 0:
         return 30.0f;
         break;
     case 2:
@@ -705,7 +705,10 @@ float ATVDemodGUI::getFps(int fpsIndex)
     case 5:
         return 10.0f;
         break;
-    case 0:
+    case 6:
+        return 8.0f;
+        break;
+    case 1:
     default:
         return 25.0f;
         break;
diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui
index 1475a3166..9a6b9a644 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.ui
+++ b/plugins/channelrx/demodatv/atvdemodgui.ui
@@ -496,6 +496,13 @@
     </property>
     <item>
      <layout class="QHBoxLayout" name="buttonsLayout">
+      <item>
+       <widget class="QLabel" name="mbLinesLabel">
+        <property name="text">
+         <string>L:</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QComboBox" name="nbLines">
         <property name="maximumSize">
@@ -554,56 +561,87 @@
         </item>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="fpsLabel">
+        <property name="text">
+         <string>F:</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QComboBox" name="fps">
+        <property name="maximumSize">
+         <size>
+          <width>45</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="toolTip">
          <string>Frames per second</string>
         </property>
         <item>
          <property name="text">
-          <string comment="25">25 Fps</string>
+          <string comment="25">30</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string comment="30">30 Fps</string>
+          <string comment="30">25</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>20 Fps</string>
+          <string>20</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>16 Fps</string>
+          <string>16</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>12 Fps</string>
+          <string>12</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>10 Fps</string>
+          <string>10</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>8</string>
          </property>
         </item>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="standardLabel">
+        <property name="text">
+         <string>S:</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QComboBox" name="standard">
+        <property name="maximumSize">
+         <size>
+          <width>70</width>
+          <height>16777215</height>
+         </size>
+        </property>
         <property name="toolTip">
          <string>TV standard scheme</string>
         </property>
         <item>
          <property name="text">
-          <string>PAL625L</string>
+          <string>PAL625</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>PAL525L</string>
+          <string>PAL525</string>
          </property>
         </item>
         <item>
@@ -613,12 +651,12 @@
         </item>
         <item>
          <property name="text">
-          <string>SHi</string>
+          <string>ShI</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>SHni</string>
+          <string>ShNI</string>
          </property>
         </item>
         <item>
diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp
index 026333bfb..f31b2cc8b 100644
--- a/plugins/channeltx/modatv/atvmodgui.cpp
+++ b/plugins/channeltx/modatv/atvmodgui.cpp
@@ -320,6 +320,9 @@ int ATVModGUI::getFPS()
     case 5:
         return 10;
         break;
+    case 6:
+        return 8;
+        break;
     case 1:
     default:
         return 25;
diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui
index 601e2d3fb..02d017932 100644
--- a/plugins/channeltx/modatv/atvmodgui.ui
+++ b/plugins/channeltx/modatv/atvmodgui.ui
@@ -634,6 +634,11 @@
           <string>10</string>
          </property>
         </item>
+        <item>
+         <property name="text">
+          <string>8</string>
+         </property>
+        </item>
        </widget>
       </item>
       <item>
@@ -671,12 +676,12 @@
         </item>
         <item>
          <property name="text">
-          <string>SHi</string>
+          <string>ShI</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>SHni</string>
+          <string>ShNI</string>
          </property>
         </item>
         <item>