ATV Demod: refactoring: moved enum and structure inside class

plugins/channelrx/demodatv/atvdemod.h

@@ -34,42 +34,46 @@
 #include "atvscreen.h"
 
 
-enum ATVModulation { ATV_AM, ATV_FM1 , ATV_FM2 };
-
-struct ATVConfig
-{
-    int m_intMsps;
-    int m_intLineDurationUs;
-    int m_intTopDurationUs;
-    int m_intFramePerS;
-    int m_intPercentOfRowsToDisplay;
-    float m_fltVoltLevelSynchroTop;
-    float m_fltVoltLevelSynchroBlack;
-    ATVModulation m_enmModulation;
-    bool m_blnHSync;
-    bool m_blnVSync;
-
-    ATVConfig() :
-        m_intMsps(0),
-        m_intLineDurationUs(0),
-        m_intTopDurationUs(0),
-        m_intFramePerS(0),
-        m_intPercentOfRowsToDisplay(0),
-        m_fltVoltLevelSynchroTop(0),
-        m_fltVoltLevelSynchroBlack(0),
-        m_enmModulation(ATV_FM1),
-        m_blnHSync(false),
-        m_blnVSync(false)
-    {
-    }
-};
-
 class ATVDemod : public BasebandSampleSink
 {
 	Q_OBJECT
 
 public:
 
+	enum ATVModulation {
+	    ATV_AM,
+	    ATV_FM1,
+	    ATV_FM2
+	};
+
+	struct ATVConfig
+	{
+	    int m_intMsps;
+	    int m_intLineDurationUs;
+	    int m_intTopDurationUs;
+	    int m_intFramePerS;
+	    int m_intPercentOfRowsToDisplay;
+	    float m_fltVoltLevelSynchroTop;
+	    float m_fltVoltLevelSynchroBlack;
+	    ATVModulation m_enmModulation;
+	    bool m_blnHSync;
+	    bool m_blnVSync;
+
+	    ATVConfig() :
+	        m_intMsps(0),
+	        m_intLineDurationUs(0),
+	        m_intTopDurationUs(0),
+	        m_intFramePerS(0),
+	        m_intPercentOfRowsToDisplay(0),
+	        m_fltVoltLevelSynchroTop(0),
+	        m_fltVoltLevelSynchroBlack(0),
+	        m_enmModulation(ATV_FM1),
+	        m_blnHSync(false),
+	        m_blnVSync(false)
+	    {
+	    }
+	};
+
     ATVDemod();
 	~ATVDemod();
 

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -265,7 +265,7 @@ void ATVDemodGUI::blockApplySettings(bool blnBlock)
 
 void ATVDemodGUI::applySettings()
 {
-    ATVModulation enmSelectedModulation;
+    ATVDemod::ATVModulation enmSelectedModulation;
 
     if (m_blnDoApplySettings)
     {
@@ -281,19 +281,19 @@ void ATVDemodGUI::applySettings()
         switch (ui->modulation->currentIndex())
         {
         case 0:
-            enmSelectedModulation = ATV_FM1;
+            enmSelectedModulation = ATVDemod::ATV_FM1;
             break;
 
         case 1:
-            enmSelectedModulation = ATV_FM2;
+            enmSelectedModulation = ATVDemod::ATV_FM2;
             break;
 
         case 2:
-            enmSelectedModulation = ATV_AM;
+            enmSelectedModulation = ATVDemod::ATV_AM;
             break;
 
         default:
-            enmSelectedModulation = ATV_FM1;
+            enmSelectedModulation = ATVDemod::ATV_FM1;
             break;
         }