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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad25cf2933
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-29 08:11:23 +02:00
parent 1669a70c6f 7cc0ff4e16
commit 8e065cda4b
6 changed files with 103 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/gui/channellist.cpp
View File

@@ -63,6 +63,7 @@
#include <gui/movieplayer.h>
#include <gui/infoclock.h>
#include <system/settings.h>
#include <system/set_threadname.h>
#include <gui/customcolor.h>
#include <gui/bouquetlist.h>
@@ -130,6 +131,8 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
move_state = beDefault;
edit_state = false;
channelsChanged = false;
paint_events_index = -2;
}
CChannelList::~CChannelList()
@@ -161,6 +164,8 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
return;
size_t chanlist_size = to - from;
if (chanlist_size <= 0) // WTF???
return;
CChannelEventList events;
if (displayNext) {
@@ -188,16 +193,18 @@ void CChannelList::updateEvents(unsigned int from, unsigned int to)
for (uint32_t count = 0; count < chanlist_size; count++)
p_requested_channels[count] = (*chanlist)[count + from]->getEpgID();
CEitManager::getInstance()->getChannelEvents(events, p_requested_channels, chanlist_size);
CChannelEventList levents;
CEitManager::getInstance()->getChannelEvents(levents, p_requested_channels, chanlist_size);
for (uint32_t count=0; count < chanlist_size; count++) {
(*chanlist)[count + from]->currentEvent = CChannelEvent();
for (CChannelEventList::iterator e = events.begin(); e != events.end(); ++e) {
for (CChannelEventList::iterator e = levents.begin(); e != levents.end(); ++e) {
if (((*chanlist)[count + from]->getEpgID()&0xFFFFFFFFFFFFULL) == e->get_channel_id()) {
(*chanlist)[count + from]->currentEvent = *e;
break;
}
}
}
levents.clear();
delete[] p_requested_channels;
}
}
@@ -934,6 +941,8 @@ int CChannelList::show()
}
}
paint_events(-2); // cancel paint_events thread
if (move_state == beMoving)
cancelMoveChannel();
if (edit_state)
@@ -2315,9 +2324,70 @@ void CChannelList::paintPig (int _x, int _y, int w, int h)
}
void CChannelList::paint_events(int index)
{
if (index == -2 && paint_events_index > -2) {
pthread_mutex_lock(&paint_events_mutex);
paint_events_index = index;
sem_post(&paint_events_sem);
pthread_join(paint_events_thr, NULL);
sem_destroy(&paint_events_sem);
pthread_mutex_unlock(&paint_events_mutex);
} else if (paint_events_index == -2) {
if (index == -2)
return;
// First paint_event. No need to lock.
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
pthread_mutex_init(&paint_events_mutex, &attr);
sem_init(&paint_events_sem, 0, 0);
paint_events_index = index;
if (!pthread_create(&paint_events_thr, NULL, paint_events, (void *) this))
sem_post(&paint_events_sem);
else
paint_events_index = -2;
} else {
pthread_mutex_lock(&paint_events_mutex);
paint_events_index = index;
pthread_mutex_unlock(&paint_events_mutex);
sem_post(&paint_events_sem);
}
}
void *CChannelList::paint_events(void *arg)
{
CChannelList *me = (CChannelList *) arg;
me->paint_events();
pthread_exit(NULL);
}
void CChannelList::paint_events()
{
set_threadname(__func__);
while (paint_events_index != -2) {
sem_wait(&paint_events_sem);
if (paint_events_index < 0)
continue;
while(!sem_trywait(&paint_events_sem));
int current_index = paint_events_index;
CChannelEventList evtlist;
readEvents((*chanlist)[current_index]->getChannelID(), evtlist);
if (current_index == paint_events_index) {
pthread_mutex_lock(&paint_events_mutex);
if (current_index == paint_events_index)
paint_events_index = -1;
pthread_mutex_unlock(&paint_events_mutex);
paint_events(evtlist);
}
}
}
void CChannelList::paint_events(CChannelEventList &evtlist)
{
ffheight = g_Font[eventFont]->getHeight();
readEvents((*chanlist)[index]->getEpgID());
frameBuffer->paintBoxRel(x+ width,y+ theight+pig_height, infozone_width, infozone_height,COL_MENUCONTENT_PLUS_0);
char startTime[10];
@@ -2379,8 +2449,6 @@ void CChannelList::paint_events(int index)
}
i++;
}
if ( !evtlist.empty() )
evtlist.clear();
}
static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
@@ -2388,7 +2456,7 @@ static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
return a.startTime < b.startTime;
}
void CChannelList::readEvents(const t_channel_id channel_id)
void CChannelList::readEvents(const t_channel_id channel_id, CChannelEventList &evtlist)
{
CEitManager::getInstance()->getEventsServiceKey(channel_id , evtlist);