From 5c7441f5d1a0b31f0eafa5b9a247573123cbfd17 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 30 May 2014 11:55:39 +0200 Subject: [PATCH] COSDFader: rename member functions, adapt implementations Stop() is not exactly attributable if fader class used as inherited and Fade() don't tell really what done and related to return value 'bool'... especially as the fader class members have been not documented. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/69e2debb0291298436a77ed964190ed0323110c5 Author: Thilo Graf Date: 2014-05-30 (Fri, 30 May 2014) ------------------ This commit was generated by Migit --- src/driver/fade.cpp | 6 +++--- src/driver/fade.h | 8 ++++---- src/gui/bouquetlist.cpp | 6 +++--- src/gui/channellist.cpp | 8 ++++---- src/gui/dboxinfo.cpp | 6 +++--- src/gui/epgplus.cpp | 6 +++--- src/gui/epgview.cpp | 6 +++--- src/gui/eventlist.cpp | 6 +++--- src/gui/infoviewer.cpp | 12 ++++++------ src/gui/timerlist.cpp | 6 +++--- src/gui/widget/menue.cpp | 10 +++++----- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/driver/fade.cpp b/src/driver/fade.cpp index 1b96ec95a..92a5fbe40 100644 --- a/src/driver/fade.cpp +++ b/src/driver/fade.cpp @@ -43,7 +43,7 @@ COSDFader::COSDFader(unsigned char & alpha) COSDFader::~COSDFader() { - Stop(); + StopFade(); } void COSDFader::StartFadeIn() @@ -85,7 +85,7 @@ bool COSDFader::StartFadeOut() return ret; } -void COSDFader::Stop() +void COSDFader::StopFade() { if ( fadeIn || fadeOut ) { g_RCInput->killTimer(fadeTimer); @@ -100,7 +100,7 @@ void COSDFader::Stop() } /* return true, if fade out done */ -bool COSDFader::Fade() +bool COSDFader::FadeDone() { bool ret = false; diff --git a/src/driver/fade.h b/src/driver/fade.h index e9d472d28..83c81ef60 100644 --- a/src/driver/fade.h +++ b/src/driver/fade.h @@ -36,12 +36,12 @@ class COSDFader CFrameBuffer *frameBuffer; public: COSDFader(unsigned char &alpha); - ~COSDFader(); + virtual ~COSDFader(); void StartFadeIn(); bool StartFadeOut(); - void Stop(); - bool Fade(); - uint32_t GetTimer() { return fadeTimer; }; + void StopFade(); + bool FadeDone(); + uint32_t GetFadeTimer() { return fadeTimer; }; }; #endif diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index dc5cae9aa..7c5a0a669 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -419,8 +419,8 @@ int CBouquetList::show(bool bShowChannelList) if ( msg <= CRCInput::RC_MaxRC ) timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); - if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) + if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) loop = false; } else if ((msg == CRCInput::RC_timeout ) || @@ -561,7 +561,7 @@ int CBouquetList::show(bool bShowChannelList) } hide(); - fader.Stop(); + fader.StopFade(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); if (save_bouquets) { diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 3e3c8ed77..c02287740 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -672,8 +672,8 @@ int CChannelList::show() if ( msg <= CRCInput::RC_MaxRC ) timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); - if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) { + if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) { loop = false; } } @@ -757,7 +757,7 @@ int CChannelList::show() } else if ( msg == CRCInput::RC_setup) { old_b_id = bouquetList->getActiveBouquetNumber(); - fader.Stop(); + fader.StopFade(); int ret = doChannelMenu(); if (ret != 0) CNeutrinoApp::getInstance()->MarkChannelListChanged(); @@ -980,7 +980,7 @@ int CChannelList::show() new_zap_mode = 0; hide(); - fader.Stop(); + fader.StopFade(); } if (bShowBouquetList) { diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index 70ff43ce2..0821a4b84 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -104,8 +104,8 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) { g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); - if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) + if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) doLoop = false; } else if((msg == NeutrinoMessages::EVT_TIMER) && (data == updateTimer)) { @@ -151,7 +151,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) } hide(); - fader.Stop(); + fader.StopFade(); g_RCInput->killTimer(updateTimer); return res; } diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index ae0ff408d..349946b63 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -817,8 +817,8 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); - if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) + if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) loop = false; } else if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t) g_settings.key_channelList_cancel)) { @@ -1148,7 +1148,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu this->hide(); - fader.Stop(); + fader.StopFade(); #if 0 for (TChannelEntries::iterator It = this->displayedChannelEntries.begin(); It != this->displayedChannelEntries.end(); It++) { diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 5b2df145c..d7ad305cd 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -712,8 +712,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start pb.paint(false); } } - if(data == fader.GetTimer()) { - if(fader.Fade()) + if(data == fader.GetFadeTimer()) { + if(fader.FadeDone()) loop = false; } else @@ -973,7 +973,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start } } hide(); - fader.Stop(); + fader.StopFade(); } return res; } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 247d297ed..e923508bd 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -331,8 +331,8 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c if ( msg <= CRCInput::RC_MaxRC ) timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); - if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) + if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) loop = false; } else if (msg == CRCInput::RC_timeout) @@ -680,7 +680,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c if(!dont_hide){ hide(); - fader.Stop(); + fader.StopFade(); } return res; } diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index bfe37ae22..4d9a7afe7 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -876,8 +876,8 @@ void CInfoViewer::loop(bool show_dot) else if (msg == CRCInput::RC_help || msg == CRCInput::RC_info) { g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0); res = messages_return::cancel_info; - } else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) + } else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) res = messages_return::cancel_info; } else if ((msg == CRCInput::RC_ok) || (msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) { if(fader.StartFadeOut()) @@ -927,7 +927,7 @@ void CInfoViewer::loop(bool show_dot) } else { if (msg == CRCInput::RC_standby) { g_RCInput->killTimer (sec_timer_id); - fader.Stop(); + fader.StopFade(); } res = neutrino->handleMsg (msg, data); if (res & messages_return::unhandled) { @@ -975,7 +975,7 @@ void CInfoViewer::loop(bool show_dot) } g_RCInput->killTimer (sec_timer_id); - fader.Stop(); + fader.StopFade(); if (virtual_zap_mode) { /* if bouquet cycle set, do virtual over current bouquet */ if (/*g_settings.zap_cycle && */ /* (bouquetList != NULL) && */ !(bouquetList->Bouquets.empty())) @@ -1282,9 +1282,9 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) //Set_CA_Status (data); return messages_return::handled; } else if (msg == NeutrinoMessages::EVT_TIMER) { - if (data == fader.GetTimer()) { + if (data == fader.GetFadeTimer()) { // here, the event can only come if there is another window in the foreground! - fader.Stop(); + fader.StopFade(); return messages_return::handled; } else if (data == lcdUpdateTimer) { //printf("CInfoViewer::handleMsg: lcdUpdateTimer\n"); diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 5d6accc03..dbbe7eff6 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -508,8 +508,8 @@ int CTimerList::show() timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings ::TIMING_MENU]); - if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetTimer())) { - if(fader.Fade()) + if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { + if(fader.FadeDone()) loop = false; } else if ( ( msg == CRCInput::RC_timeout ) || @@ -679,7 +679,7 @@ int CTimerList::show() } } hide(); - fader.Stop(); + fader.StopFade(); return(res); } diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index ff94033de..d02ac880a 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -563,7 +563,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) std::map::iterator it = keyActionMap.find(msg); if (it != keyActionMap.end()) { - fader.Stop(); + fader.StopFade(); int rv = it->second.menue->exec(this, it->second.action); switch ( rv ) { case menu_return::RETURN_EXIT_ALL: @@ -611,8 +611,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) switch (msg) { case (NeutrinoMessages::EVT_TIMER): - if(data == fader.GetTimer()) { - if(fader.Fade()) + if(data == fader.GetFadeTimer()) { + if(fader.FadeDone()) msg = CRCInput::RC_timeout; } else { if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) { @@ -699,7 +699,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if (!item->isSelectable()) break; item->msg = msg; - fader.Stop(); + fader.StopFade(); int rv = item->exec( this ); switch ( rv ) { case menu_return::RETURN_EXIT_ALL: @@ -773,7 +773,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) delete[] background; background = NULL; - fader.Stop(); + fader.StopFade(); if(!parent) if(oldLcdMode != CVFD::getInstance()->getMode())