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 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
This commit is contained in:
Stefan Seyfried
2013-06-16 21:22:14 +02:00
parent 4a7bff9498 15bb1b1312
commit fce4dbbe72
160 changed files with 6251 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/eitd/sectionsd.cpp
View File

@@ -486,7 +486,7 @@ xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_chann
#else
time_t now = time(NULL);
bool back = false;
if ((*lastEvent)->times.size() == 1)
if (*lastEvent!=NULL && (*lastEvent)->times.size() == 1)
{
if ((*lastEvent)->times.begin()->startzeit + (long)(*lastEvent)->times.begin()->dauer >= now - oldEventsAre)
back = true;
@@ -508,7 +508,8 @@ xprintf("addEvent: ch %012" PRIx64 " running %d (%s) got_CN %d\n", evt.get_chann
unlockMessaging();
}
// else fprintf(stderr, ">");
deleteEvent((*lastEvent)->uniqueKey());
if(*lastEvent!=NULL)
deleteEvent((*lastEvent)->uniqueKey());
}
// Pruefen ob es ein Meta-Event ist
MySIeventUniqueKeysMetaOrderServiceUniqueKey::iterator i = mySIeventUniqueKeysMetaOrderServiceUniqueKey.find(e->get_channel_id());
@@ -899,9 +900,19 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
if (dataLength != sizeof(sectionsd::commandSetServiceChanged))
return;
t_channel_id uniqueServiceKey = (((sectionsd::commandSetServiceChanged *)data)->channel_id);
sectionsd::commandSetServiceChanged * cmd = (sectionsd::commandSetServiceChanged *)data;
t_channel_id uniqueServiceKey = cmd->channel_id;
xprintf("[sectionsd] commandserviceChanged: Service change to " PRINTF_CHANNEL_ID_TYPE "\n", uniqueServiceKey);
xprintf("[sectionsd] commandserviceChanged: Service change to " PRINTF_CHANNEL_ID_TYPE " demux #%d\n", uniqueServiceKey, cmd->dnum);
/* 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)) {
threadEIT.setDemux(cmd->dnum);
threadEIT.setCurrentService(uniqueServiceKey);
}
return;
}
static t_channel_id time_trigger_last = 0;
@@ -929,7 +940,8 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
unlockMessaging();
threadCN.setCurrentService(messaging_current_servicekey);
threadEIT.setCurrentService(messaging_current_servicekey);
threadEIT.setDemux(cmd->dnum);
threadEIT.setCurrentService(uniqueServiceKey /*messaging_current_servicekey*/);
#ifdef ENABLE_FREESATEPG
threadFSEIT.setCurrentService(messaging_current_servicekey);
#endif
@@ -1701,6 +1713,10 @@ 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(notify_complete)
system(CONFIGDIR "/epgdone.sh");
}
@@ -2273,27 +2289,23 @@ void CEitManager::getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEve
bool copy = true;
if(search){
if((search == 1) || (search == 5)) {//SEARCH_EPG_TITLE == 1 SEARCH_EPG_ALL == 5 defined in eventlist.h
if ((search == 1 /*EventList::SEARCH_EPG_TITLE*/) || (search == 5 /*EventList::SEARCH_EPG_ALL*/))
{
std::string eName = (*e)->getName();
std::transform(eName.begin(), eName.end(), eName.begin(), tolower);
if(eName.find(search_text) == std::string::npos)
copy = false;
copy = (eName.find(search_text) != std::string::npos);
}
if((search == 2) || (!copy && search == 5)) {//SEARCH_EPG_INFO1 == 2
if ((search == 2 /*EventList::SEARCH_EPG_INFO1*/) || (!copy && (search == 5 /*EventList::SEARCH_EPG_ALL*/)))
{
std::string eText = (*e)->getText();
std::transform(eText.begin(), eText.end(), eText.begin(), tolower);
if(eText.find(search_text) == std::string::npos)
copy = false;
else if(search == 5)
copy = true;
copy = (eText.find(search_text) != std::string::npos);
}
if((search == 3) || (!copy && search == 5)) {//SEARCH_EPG_INFO2 == 3
if ((search == 3 /*EventList::SEARCH_EPG_INFO2*/) || (!copy && (search == 5 /*EventList::SEARCH_EPG_ALL*/)))
{
std::string eExtendedText = (*e)->getExtendedText();
std::transform(eExtendedText.begin(), eExtendedText.end(), eExtendedText.begin(), tolower);
if(eExtendedText.find(search_text) == std::string::npos)
copy = false;
else if(search == 5)
copy = true;
copy = (eExtendedText.find(search_text) != std::string::npos);
}
}
if(copy) {