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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 31982a5ac4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-02-26 (Sat, 26 Feb 2011)

Origin message was:
------------------
-add Gaucho316 patch -> ( http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49585 )

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


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2011-02-26 06:09:50 +00:00
parent 15592fc388
commit ab893c7b5e
2 changed files with 15 additions and 4 deletions

View File

@@ -355,7 +355,6 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi
{
case CTimerd::TIMER_SHUTDOWN:
case CTimerd::TIMER_NEXTPROGRAM:
case CTimerd::TIMER_ZAPTO:
case CTimerd::TIMER_STANDBY:
case CTimerd::TIMER_REMIND:
case CTimerd::TIMER_SLEEPTIMER:
@@ -368,6 +367,11 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi
(static_cast<CTimerEvent_Record*>(event))->getEpgId();
break;
}
case CTimerd::TIMER_ZAPTO:
{
(static_cast<CTimerEvent_Zapto*>(event))->getEpgId();
break;
}
default:
break;
}
@@ -970,8 +974,9 @@ void CTimerEvent::printEvent(void)
case CTimerd::TIMER_ZAPTO :
dprintf(" Zapto: "
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
" epg: %llx\n",
" epg: %s (%llx)\n",
static_cast<CTimerEvent_Zapto*>(this)->eventInfo.channel_id,
static_cast<CTimerEvent_Zapto*>(this)->epgTitle.c_str(),
static_cast<CTimerEvent_Zapto*>(this)->eventInfo.epgID);
break;
@@ -1296,6 +1301,12 @@ void CTimerEvent_Zapto::getEpgId()
break;
}
}
if(eventInfo.epgID != 0)
{
CShortEPGData epgdata;
if (sdc.getEPGidShort(eventInfo.epgID, &epgdata))
epgTitle=epgdata.title;
}
}
//=============================================================
// NextProgram Event