diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index f02bad186..630e148ff 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -68,7 +68,7 @@ ATVDemod::~ATVDemod() { } -bool ATVDemod::SetATVScreen(ATVScreen *objScreen) +bool ATVDemod::setATVScreen(ATVScreen *objScreen) { m_objRegisteredATVScreen = objScreen; } @@ -473,7 +473,7 @@ bool ATVDemod::handleMessage(const Message& cmd) qDebug() << "ATVDemod::handleMessage: MsgChannelizerNotification:" << " m_intMsps: " << m_objConfig.m_intSampleRate; - ApplySettings(); + applySettings(); return true; } @@ -502,7 +502,7 @@ bool ATVDemod::handleMessage(const Message& cmd) << " m_blnHSync" << m_objConfig.m_blnHSync << " m_blnVSync" << m_objConfig.m_blnVSync; - ApplySettings(); + applySettings(); return true; } @@ -512,7 +512,7 @@ bool ATVDemod::handleMessage(const Message& cmd) } } -void ATVDemod::ApplySettings() +void ATVDemod::applySettings() { if (m_objConfig.m_intSampleRate == 0) @@ -555,7 +555,7 @@ void ATVDemod::ApplySettings() m_objRunning.m_blnVSync = m_objConfig.m_blnVSync; } -int ATVDemod::GetSampleRate() +int ATVDemod::getSampleRate() { return m_objRunning.m_intSampleRate; } diff --git a/plugins/channelrx/demodatv/atvdemod.h b/plugins/channelrx/demodatv/atvdemod.h index 97c922659..921f2dc6f 100644 --- a/plugins/channelrx/demodatv/atvdemod.h +++ b/plugins/channelrx/demodatv/atvdemod.h @@ -93,8 +93,8 @@ public: virtual void stop(); virtual bool handleMessage(const Message& cmd); - bool SetATVScreen(ATVScreen *objScreen); - int GetSampleRate(); + bool setATVScreen(ATVScreen *objScreen); + int getSampleRate(); double getMagSq() const { return m_objMagSqAverage.average(); } //!< Beware this is scaled to 2^30 private: @@ -199,7 +199,7 @@ private: static const float m_fltSecondToUs; - void ApplySettings(); + void applySettings(); }; diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index a837f2551..86a83aece 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -217,7 +217,7 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI, connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked())); m_objATVDemod = new ATVDemod(); - m_objATVDemod->SetATVScreen(ui->screenTV); + m_objATVDemod->setATVScreen(ui->screenTV); m_objChannelizer = new DownChannelizer(m_objATVDemod); m_objThreadedChannelizer = new ThreadedBasebandSampleSink(m_objChannelizer, this); @@ -289,7 +289,7 @@ void ATVDemodGUI::applySettings() qDebug() << "ATVDemodGUI::applySettings:" << " m_objChannelizer.inputSampleRate: " << m_objChannelizer->getInputSampleRate() - << " m_objATVDemod.sampleRate: " << m_objATVDemod->GetSampleRate(); + << " m_objATVDemod.sampleRate: " << m_objATVDemod->getSampleRate(); //m_objChannelMarker.setBandwidth(m_objATVDemod->GetSampleRate()); it is unreliable at this moment m_blnDoApplySettings = false; // avoid infinite recursion