VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-07 00:02:31 -04:00
Code Issues Projects Releases Wiki Activity

ATV Demod: align modulation enum to GUI combo box order

Browse Source
This commit is contained in:
f4exb 2017-03-16 20:57:00 +01:00
parent 5b4290c3e6
commit 2966e3b18e
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/channelrx/demodatv/atvdemod.cpp
View File

@ -81,7 +81,17 @@ void ATVDemod::configure(MessageQueue* objMessageQueue, int intLineDurationUs, i
objMessageQueue->push(msgCmd); 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 fltSecondToUs = 1000000.0f;
float fltSampling=(float) intMsps; 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() int ATVDemod::GetSampleRate()

4
plugins/channelrx/demodatv/atvdemod.h
View File

@ -41,9 +41,9 @@ class ATVDemod : public BasebandSampleSink
public: public:
enum ATVModulation { enum ATVModulation {
ATV_AM,
ATV_FM1, ATV_FM1,
ATV_FM2 ATV_FM2,
ATV_AM
}; };
struct ATVConfig struct ATVConfig

3
plugins/channelrx/demodatv/atvdemodgui.cpp
View File

@ -304,7 +304,8 @@ void ATVDemodGUI::applySettings()
(ui->halfImage->checkState() == Qt::Checked) ? 50 : 100, (ui->halfImage->checkState() == Qt::Checked) ? 50 : 100,
((float) (ui->synchLevel->value())) / 1000.0f, ((float) (ui->synchLevel->value())) / 1000.0f,
((float) (ui->blackLevel->value())) / 1000.0f, ((float) (ui->blackLevel->value())) / 1000.0f,
enmSelectedModulation, ui->hSync->isChecked(), (ATVDemod::ATVModulation) ui->modulation->currentIndex(),
ui->hSync->isChecked(),
ui->vSync->isChecked()); ui->vSync->isChecked());
qDebug() << "ATVDemodGUI::applySettings:" qDebug() << "ATVDemodGUI::applySettings:"