diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index d276762aa..0cd0524b8 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -81,7 +81,17 @@ void ATVDemod::configure(MessageQueue* objMessageQueue, int intLineDurationUs, i objMessageQueue->push(msgCmd); } -void ATVDemod::InitATVParameters(int intMsps, int intLineDurationUs, int intTopDurationUs, int intFramePerS, int intPercentOfRowsToDisplay, float fltVoltLevelSynchroTop, float fltVoltLevelSynchroBlack, ATVModulation enmModulation, bool blnHSync, bool blnVSync) +void ATVDemod::InitATVParameters( + int intMsps, + int intLineDurationUs, + int intTopDurationUs, + int intFramePerS, + int intPercentOfRowsToDisplay, + float fltVoltLevelSynchroTop, + float fltVoltLevelSynchroBlack, + ATVModulation enmModulation, + bool blnHSync, + bool blnVSync) { float fltSecondToUs = 1000000.0f; float fltSampling=(float) intMsps; @@ -600,7 +610,17 @@ void ATVDemod::ApplySettings() } - InitATVParameters(m_objRunning.m_intMsps,m_objRunning.m_intLineDurationUs,m_objRunning.m_intTopDurationUs,m_objRunning.m_intFramePerS,m_objRunning.m_intPercentOfRowsToDisplay,m_objRunning.m_fltVoltLevelSynchroTop,m_objRunning.m_fltVoltLevelSynchroBlack,m_objRunning.m_enmModulation,m_objRunning.m_blnHSync, m_objRunning.m_blnVSync); + InitATVParameters( + m_objRunning.m_intMsps, + m_objRunning.m_intLineDurationUs, + m_objRunning.m_intTopDurationUs, + m_objRunning.m_intFramePerS, + m_objRunning.m_intPercentOfRowsToDisplay, + m_objRunning.m_fltVoltLevelSynchroTop, + m_objRunning.m_fltVoltLevelSynchroBlack, + m_objRunning.m_enmModulation, + m_objRunning.m_blnHSync, + m_objRunning.m_blnVSync); } int ATVDemod::GetSampleRate() diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index f5d97d11f..656aa7786 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -41,9 +41,9 @@ class ATVDemod : public BasebandSampleSink public: enum ATVModulation { - ATV_AM, ATV_FM1, - ATV_FM2 + ATV_FM2, + ATV_AM }; struct ATVConfig diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index a091b3232..a87b6a965 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -304,7 +304,8 @@ void ATVDemodGUI::applySettings() (ui->halfImage->checkState() == Qt::Checked) ? 50 : 100, ((float) (ui->synchLevel->value())) / 1000.0f, ((float) (ui->blackLevel->value())) / 1000.0f, - enmSelectedModulation, ui->hSync->isChecked(), + (ATVDemod::ATVModulation) ui->modulation->currentIndex(), + ui->hSync->isChecked(), ui->vSync->isChecked()); qDebug() << "ATVDemodGUI::applySettings:"