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

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

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1208 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-02-26 06:09:50 +00:00
parent 8ba48560c8
commit 31982a5ac4
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/timerd/timermanager.cpp
View File

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

4
src/timerd/timermanager.h
View File

@@ -132,7 +132,7 @@ class CTimerEvent_Record : public CTimerEvent
virtual void stopEvent(); virtual void stopEvent();
virtual void saveToConfig(CConfigFile *config); virtual void saveToConfig(CConfigFile *config);
virtual void Reschedule(); virtual void Reschedule();
void getEpgId(); virtual void getEpgId();
virtual void Refresh(); virtual void Refresh();
}; };
@@ -154,7 +154,7 @@ class CTimerEvent_Zapto : public CTimerEvent_Record
virtual void fireEvent(); virtual void fireEvent();
virtual void announceEvent(); virtual void announceEvent();
virtual void stopEvent(){}; virtual void stopEvent(){};
void getEpgId(); virtual void getEpgId();
}; };
class CTimerEvent_NextProgram : public CTimerEvent class CTimerEvent_NextProgram : public CTimerEvent