mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 17:31:20 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
This commit is contained in:
@@ -2159,9 +2159,11 @@ void CEitManager::getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEve
|
||||
{
|
||||
dprintf("sendAllEvents for " PRINTF_CHANNEL_ID_TYPE "\n", serviceUniqueKey);
|
||||
|
||||
eList.clear();
|
||||
serviceUniqueKey &= 0xFFFFFFFFFFFFULL; //0xFFFFFFFFFFFFULL for CREATE_CHANNEL_ID64
|
||||
if(serviceUniqueKey == 0)
|
||||
if(!eList.empty() && search == 0)//skip on search mode
|
||||
eList.clear();
|
||||
|
||||
t_channel_id serviceUniqueKey64 = serviceUniqueKey& 0xFFFFFFFFFFFFULL; //0xFFFFFFFFFFFFULL for CREATE_CHANNEL_ID64
|
||||
if(serviceUniqueKey64 == 0)
|
||||
return;
|
||||
|
||||
// service Found
|
||||
@@ -2173,7 +2175,7 @@ void CEitManager::getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEve
|
||||
|
||||
for (MySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey::iterator e = mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.begin(); e != mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.end(); ++e)
|
||||
{
|
||||
if ((*e)->get_channel_id() == serviceUniqueKey) {
|
||||
if ((*e)->get_channel_id() == serviceUniqueKey64) {
|
||||
serviceIDfound = 1;
|
||||
|
||||
bool copy = true;
|
||||
|
@@ -1014,6 +1014,8 @@ bool CNeutrinoEventList::findEvents(void)
|
||||
{
|
||||
res = true;
|
||||
m_showChannel = true; // force the event list to paint the channel name
|
||||
if(!evtlist.empty())
|
||||
evtlist.clear();
|
||||
if(m_search_list == SEARCH_LIST_CHANNEL)
|
||||
{
|
||||
CEitManager::getInstance()->getEventsServiceKey(m_search_channel_id, evtlist, m_search_epg_item,m_search_keyword);
|
||||
|
Reference in New Issue
Block a user