mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Preparing the menu classes for Lua Part #2

Browse Source 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
This commit is contained in:
M. Liebmann
2014-01-16 23:20:04 +01:00
parent 2c9c9debcc
commit b41819190d
35 changed files with 298 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/timerdclient/timerdclient.cpp
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)

4
lib/timerdclient/timerdclient.h
View File

@@ -170,8 +170,8 @@ class CTimerdClient:private CBasicClient
// Convert String of O and X to repeat type and vice versa
//void getWeekdaysFromStr(int *rep, const char* str);
void getWeekdaysFromStr(CTimerd::CTimerEventRepeat *rep, const char* str);
void setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, char* str);
void getWeekdaysFromStr(CTimerd::CTimerEventRepeat *rep, std::string &str);
void setWeekdaysToStr(CTimerd::CTimerEventRepeat rep, std::string &str);
};
#endif