neutrino infobar: add extra timeout setting for radiomode

moved single arrays named "default_timing" and "timing_setting_name" into
struct named "timing_setting"

This is a partial port from original Neutrino,
The default timeout for radiomode is 0 (no timeout), this timeout
has more sense e.g. with radiotext

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1504 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a512a15781
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-06-03 (Fri, 03 Jun 2011)

Origin message was:
------------------
*neutrino infobar: add extra timeout setting for radiomode

moved single arrays named "default_timing" and "timing_setting_name" into
struct named "timing_setting"

This is a partial port from original Neutrino,
The default timeout for radiomode is 0 (no timeout), this timeout
has more sense e.g. with radiotext

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1504 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
2011-06-03 00:14:31 +00:00
parent b4818670e5
commit 916011ce83
10 changed files with 59 additions and 40 deletions

View File

@@ -759,9 +759,24 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
{
bool hideIt = true;
virtual_zap_mode = false;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR]);
bool fadeOut = false;
uint64_t timeoutEnd;
int mode = CNeutrinoApp::getInstance()->getMode();
//define timeouts
switch (mode)
{
case NeutrinoMessages::mode_tv:
timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR]);
break;
case NeutrinoMessages::mode_radio:
timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO]);
break;
default:
timeoutEnd = CRCInput::calcTimeoutEnd(6);
break;
}
int res = messages_return::none;
neutrino_msg_t msg;
neutrino_msg_data_t data;