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/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
This commit is contained in:
Stefan Seyfried
2013-10-21 22:58:55 +02:00
parent d4168dd85b a6eefc134f
commit e6cbfe61bc
186 changed files with 12758 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/eitd/sectionsd.cpp
View File

@@ -903,7 +903,7 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
/* assume live demux always 0, other means background scan */
if (cmd->dnum) {
/* dont wakeup EIT, if we have max events allready */
if (max_events && (mySIeventsOrderUniqueKey.size() < max_events)) {
if (max_events == 0 || (mySIeventsOrderUniqueKey.size() < max_events)) {
threadEIT.setDemux(cmd->dnum);
threadEIT.setCurrentService(uniqueServiceKey);
}
@@ -1709,10 +1709,12 @@ void CEitThread::beforeSleep()
writeLockMessaging();
messaging_zap_detected = false;
unlockMessaging();
eventServer->sendEvent(CSectionsdClient::EVT_EIT_COMPLETE,
CEventServer::INITID_SECTIONSD,
&current_service,
sizeof(messaging_current_servicekey));
if (scanning) {
eventServer->sendEvent(CSectionsdClient::EVT_EIT_COMPLETE,
CEventServer::INITID_SECTIONSD,
&current_service,
sizeof(messaging_current_servicekey));
}
if(notify_complete)
system(CONFIGDIR "/epgdone.sh");
}
@@ -2838,3 +2840,11 @@ void CEitManager::setLanguages(const std::vector<std::string>& newLanguages)
SIlanguage::setLanguages(newLanguages);
SIlanguage::saveLanguages();
}
unsigned CEitManager::getEventsCount()
{
readLockEvents();
unsigned anzEvents = mySIeventsOrderUniqueKey.size();
unlockEvents();
return anzEvents;
}