Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-01-16 23:20:04 +01:00
parent 917e8aafa4
commit 7b4e3bc03b
35 changed files with 298 additions and 356 deletions

View File

@@ -434,8 +434,10 @@ void CTimerdClient::getRecordingSafety(int &pre, int &post)
//-------------------------------------------------------------------------
//void CTimerdClient::getWeekdaysFromStr(int *rep, const char* str)
void CTimerdClient::getWeekdaysFromStr(CTimerd::CTimerEventRepeat *eventRepeat, const char* str)
void CTimerdClient::getWeekdaysFromStr(CTimerd::CTimerEventRepeat *eventRepeat, std::string &str)
{
if (str.length() < 7)
str.append(7 - str.length(), '-');
int rep = (int) *eventRepeat;
if(rep >= (int)CTimerd::TIMERREPEAT_WEEKDAYS)
{
@@ -454,21 +456,22 @@ void CTimerdClient::getWeekdaysFromStr(CTimerd::CTimerEventRepeat *eventRepeat,
*eventRepeat = (CTimerd::CTimerEventRepeat) rep;
}
//-------------------------------------------------------------------------
void CTimerdClient::setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, char* str)
void CTimerdClient::setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, std::string &str)
{
if (str.length() < 7)
str.append(7 - str.length(), '-');
if(rep >= CTimerd::TIMERREPEAT_WEEKDAYS)
{
for(int n=0;n<7;n++)
{
if(rep & (1 << (n+9)))
str[n]='X';
str.at(n)='X';
else
str[n]='-';
str.at(n)='-';
}
str[7]=0;
}
else
strcpy(str,"-------");
str = "-------";
}
//-------------------------------------------------------------------------
void CTimerdClient::stopTimerEvent( int evId)