-fix rest of shadow warnings

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@275 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-02-06 16:59:49 +00:00
parent 5e3e99f001
commit 615258c0a3
5 changed files with 25 additions and 24 deletions

View File

@@ -1025,11 +1025,11 @@ void CTimerEvent_Sleeptimer::fireEvent()
//=============================================================
// Standby Event
//=============================================================
CTimerEvent_Standby::CTimerEvent_Standby( time_t announceTime, time_t alarmTime,
CTimerEvent_Standby::CTimerEvent_Standby( time_t announce_Time, time_t alarm_Time,
bool sb_on,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount):
CTimerEvent(CTimerd::TIMER_STANDBY, announceTime, alarmTime, (time_t) 0, evrepeat,repeatcount)
CTimerEvent(CTimerd::TIMER_STANDBY, announceTime, alarm_Time, (time_t) 0, evrepeat,repeatcount)
{
standby_on = sb_on;
}
@@ -1064,13 +1064,13 @@ void CTimerEvent_Standby::saveToConfig(CConfigFile *config)
//=============================================================
// Record Event
//=============================================================
CTimerEvent_Record::CTimerEvent_Record(time_t announceTime, time_t alarmTime, time_t stopTime,
CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time, time_t stop_Time,
t_channel_id channel_id,
event_id_t epgID,
time_t epg_starttime, unsigned char apids,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount, const std::string recDir) :
CTimerEvent(getEventType(), announceTime, alarmTime, stopTime, evrepeat, repeatcount)
CTimerEvent(getEventType(), announce_Time, alarm_Time, stop_Time, evrepeat, repeatcount)
{
eventInfo.epgID = epgID;
eventInfo.epg_starttime = epg_starttime;
@@ -1249,12 +1249,12 @@ void CTimerEvent_Zapto::getEpgId()
//=============================================================
// NextProgram Event
//=============================================================
CTimerEvent_NextProgram::CTimerEvent_NextProgram(time_t announceTime, time_t alarmTime, time_t stopTime,
CTimerEvent_NextProgram::CTimerEvent_NextProgram(time_t announce_Time, time_t alarm_Time, time_t stop_Time,
t_channel_id channel_id,
event_id_t epgID,
time_t epg_starttime, CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) :
CTimerEvent(CTimerd::TIMER_NEXTPROGRAM, announceTime, alarmTime, stopTime, evrepeat,repeatcount)
CTimerEvent(CTimerd::TIMER_NEXTPROGRAM, announce_Time, alarm_Time, stop_Time, evrepeat,repeatcount)
{
eventInfo.epgID = epgID;
eventInfo.epg_starttime = epg_starttime;
@@ -1328,12 +1328,12 @@ void CTimerEvent_NextProgram::Reschedule()
//=============================================================
// Remind Event
//=============================================================
CTimerEvent_Remind::CTimerEvent_Remind(time_t announceTime,
time_t alarmTime,
CTimerEvent_Remind::CTimerEvent_Remind(time_t announce_Time,
time_t alarm_Time,
const char * const msg,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) :
CTimerEvent(CTimerd::TIMER_REMIND, announceTime, alarmTime, (time_t) 0, evrepeat,repeatcount)
CTimerEvent(CTimerd::TIMER_REMIND, announce_Time, alarm_Time, (time_t) 0, evrepeat,repeatcount)
{
memset(message, 0, sizeof(message));
strncpy(message, msg, sizeof(message)-1);
@@ -1371,12 +1371,12 @@ void CTimerEvent_Remind::saveToConfig(CConfigFile *config)
//=============================================================
// ExecPlugin Event
//=============================================================
CTimerEvent_ExecPlugin::CTimerEvent_ExecPlugin(time_t announceTime,
time_t alarmTime,
CTimerEvent_ExecPlugin::CTimerEvent_ExecPlugin(time_t announce_Time,
time_t alarm_Time,
const char * const plugin,
CTimerd::CTimerEventRepeat evrepeat,
uint32_t repeatcount) :
CTimerEvent(CTimerd::TIMER_EXEC_PLUGIN, announceTime, alarmTime, (time_t) 0, evrepeat,repeatcount)
CTimerEvent(CTimerd::TIMER_EXEC_PLUGIN, announce_Time, alarm_Time, (time_t) 0, evrepeat,repeatcount)
{
memset(name, 0, sizeof(name));
strncpy(name, plugin, sizeof(name)-1);