mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +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.
This commit is contained in:
@@ -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) {
|
||||
|
Reference in New Issue
Block a user