VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

ATV Demod: removed modulation type from config

Browse Source
This commit is contained in:
f4exb 2017-03-17 10:13:00 +01:00
parent 1c032d2c97
commit 542c74f1f5
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,6 @@ void ATVDemod::configure(
float fltRatioOfRowsToDisplay, float fltRatioOfRowsToDisplay,
float fltVoltLevelSynchroTop, float fltVoltLevelSynchroTop,
float fltVoltLevelSynchroBlack, float fltVoltLevelSynchroBlack,
ATVModulation enmModulation,
bool blnHSync, bool blnHSync,
bool blnVSync) bool blnVSync)
{ {
@ -93,7 +92,6 @@ void ATVDemod::configure(
fltRatioOfRowsToDisplay, fltRatioOfRowsToDisplay,
fltVoltLevelSynchroTop, fltVoltLevelSynchroTop,
fltVoltLevelSynchroBlack, fltVoltLevelSynchroBlack,
enmModulation,
blnHSync, blnHSync,
blnVSync); blnVSync);
objMessageQueue->push(msgCmd); objMessageQueue->push(msgCmd);
@ -500,7 +498,6 @@ bool ATVDemod::handleMessage(const Message& cmd)
m_objConfig = objCfg.m_objMsgConfig; m_objConfig = objCfg.m_objMsgConfig;
qDebug() << "ATVDemod::handleMessage: MsgConfigureATVDemod:" qDebug() << "ATVDemod::handleMessage: MsgConfigureATVDemod:"
<< " m_enmModulation" << m_objConfig.m_enmModulation
<< " m_fltVoltLevelSynchroBlack" << m_objConfig.m_fltVoltLevelSynchroBlack << " m_fltVoltLevelSynchroBlack" << m_objConfig.m_fltVoltLevelSynchroBlack
<< " m_fltVoltLevelSynchroTop" << m_objConfig.m_fltVoltLevelSynchroTop << " m_fltVoltLevelSynchroTop" << m_objConfig.m_fltVoltLevelSynchroTop
<< " m_fltFramePerS" << m_objConfig.m_fltFramePerS << " m_fltFramePerS" << m_objConfig.m_fltFramePerS

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

@ -57,7 +57,6 @@ public:
float m_fltRatioOfRowsToDisplay; float m_fltRatioOfRowsToDisplay;
float m_fltVoltLevelSynchroTop; float m_fltVoltLevelSynchroTop;
float m_fltVoltLevelSynchroBlack; float m_fltVoltLevelSynchroBlack;
ATVModulation m_enmModulation;
bool m_blnHSync; bool m_blnHSync;
bool m_blnVSync; bool m_blnVSync;
@ -69,7 +68,6 @@ public:
m_fltRatioOfRowsToDisplay(0.0f), m_fltRatioOfRowsToDisplay(0.0f),
m_fltVoltLevelSynchroTop(0.0f), m_fltVoltLevelSynchroTop(0.0f),
m_fltVoltLevelSynchroBlack(1.0f), m_fltVoltLevelSynchroBlack(1.0f),
m_enmModulation(ATV_FM1),
m_blnHSync(false), m_blnHSync(false),
m_blnVSync(false) m_blnVSync(false)
{ {
@ -102,7 +100,6 @@ public:
float fltRatioOfRowsToDisplay, float fltRatioOfRowsToDisplay,
float fltVoltLevelSynchroTop, float fltVoltLevelSynchroTop,
float fltVoltLevelSynchroBlack, float fltVoltLevelSynchroBlack,
ATVModulation enmModulation,
bool blnHSync, bool blnHSync,
bool blnVSync); bool blnVSync);
@ -135,7 +132,6 @@ private:
float fltRatioOfRowsToDisplay, float fltRatioOfRowsToDisplay,
float fltVoltLevelSynchroTop, float fltVoltLevelSynchroTop,
float fltVoltLevelSynchroBlack, float fltVoltLevelSynchroBlack,
ATVModulation enmModulation,
bool blnHSync, bool blnHSync,
bool blnVSync) bool blnVSync)
{ {
@ -146,7 +142,6 @@ private:
fltRatioOfRowsToDisplay, fltRatioOfRowsToDisplay,
fltVoltLevelSynchroTop, fltVoltLevelSynchroTop,
fltVoltLevelSynchroBlack, fltVoltLevelSynchroBlack,
enmModulation,
blnHSync, blnHSync,
blnVSync); blnVSync);
} }
@ -161,12 +156,10 @@ private:
float flatRatioOfRowsToDisplay, float flatRatioOfRowsToDisplay,
float fltVoltLevelSynchroTop, float fltVoltLevelSynchroTop,
float fltVoltLevelSynchroBlack, float fltVoltLevelSynchroBlack,
ATVModulation enmModulation,
bool blnHSync, bool blnHSync,
bool blnVSync) : bool blnVSync) :
Message() Message()
{ {
m_objMsgConfig.m_enmModulation = enmModulation;
m_objMsgConfig.m_fltVoltLevelSynchroBlack = fltVoltLevelSynchroBlack; m_objMsgConfig.m_fltVoltLevelSynchroBlack = fltVoltLevelSynchroBlack;
m_objMsgConfig.m_fltVoltLevelSynchroTop = fltVoltLevelSynchroTop; m_objMsgConfig.m_fltVoltLevelSynchroTop = fltVoltLevelSynchroTop;
m_objMsgConfig.m_fltFramePerS = fltFramePerS; m_objMsgConfig.m_fltFramePerS = fltFramePerS;

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

@ -283,7 +283,6 @@ void ATVDemodGUI::applySettings()
(ui->halfImage->checkState() == Qt::Checked) ? 0.5f : 1.0f, (ui->halfImage->checkState() == Qt::Checked) ? 0.5f : 1.0f,
ui->synchLevel->value() / 1000.0f, ui->synchLevel->value() / 1000.0f,
ui->blackLevel->value() / 1000.0f, ui->blackLevel->value() / 1000.0f,
(ATVDemod::ATVModulation) ui->modulation->currentIndex(),
ui->hSync->isChecked(), ui->hSync->isChecked(),
ui->vSync->isChecked()); ui->vSync->isChecked());