1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-09 09:12:27 -04:00

ATV Demod: refactoring: moved enum and structure inside class

This commit is contained in:
f4exb 2017-03-16 20:45:31 +01:00
parent 72943911d9
commit 5b4290c3e6
2 changed files with 39 additions and 35 deletions

View File

@ -34,10 +34,20 @@
#include "atvscreen.h"
enum ATVModulation { ATV_AM, ATV_FM1 , ATV_FM2 };
struct ATVConfig
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;
@ -62,13 +72,7 @@ struct ATVConfig
m_blnVSync(false)
{
}
};
class ATVDemod : public BasebandSampleSink
{
Q_OBJECT
public:
};
ATVDemod();
~ATVDemod();

View File

@ -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;
}