mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
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: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user