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

Merge branch 'check/dvbsi++' commit 984435d48e

Browse Source 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
This commit is contained in:
Stefan Seyfried
2013-02-21 17:07:18 +01:00
parent fb54adb26a 984435d48e
commit 2b4f5306dc
42 changed files with 871 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/eitd/sectionsd.cpp
View File

@@ -1379,8 +1379,10 @@ void CTimeThread::run()
if(!scanning)
sleep_time = 0;
real_pause();
#ifndef DEBUG_TIME_THREAD
Sleep();
#else
int rs = Sleep();
#ifdef DEBUG_TIME_THREAD
xprintf("%s: wakeup, running %d scanning %d channel %" PRIx64 " reason %d\n",
name.c_str(), running, scanning, current_service, rs);
#endif
@@ -1572,8 +1574,19 @@ bool CEventsThread::addEvents()
for (SIevents::const_iterator e = eit.events().begin(); e != eit.events().end(); ++e) {
if (!(e->times.empty())) {
#if 0
if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) &&
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) )
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) &&
( e->times.begin()->dauer < 60 ) ) {
char x_startTime[10];
struct tm *x_tmStartTime = localtime(&e->times.begin()->startzeit);
strftime(x_startTime, sizeof(x_startTime)-1, "%H:%M", x_tmStartTime );
printf("####[%s - #%d] - startzeit: %s, dauer: %d, channel_id: 0x%llX\n", __FUNCTION__, __LINE__, x_startTime, e->times.begin()->dauer, e->get_channel_id());
}
#endif
if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) &&
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) &&
( e->times.begin()->dauer > 1 ) )
{
addEvent(*e, wait_for_time ? zeit: 0, e->table_id == 0x4e);
event_count++;