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

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

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 01add923d6 6e38f7b956
commit bc33663742
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/scanepg.cpp
View File

@@ -130,7 +130,7 @@ bool CEpgScan::AddFavorites()
CChannelList * clist = TVfavList->Bouquets[j]->channelList;
AddBouquet(clist);
}
INFO("scan map size: %d -> %d\n", old_size, scanmap.size());
INFO("scan map size: %d -> %zd\n", old_size, scanmap.size());
return (old_size != scanmap.size());
}
@@ -154,7 +154,7 @@ bool CEpgScan::AddSelected()
AddBouquet(clist);
}
}
INFO("scan map size: %d -> %d\n", old_size, scanmap.size());
INFO("scan map size: %d -> %zd\n", old_size, scanmap.size());
return (old_size != scanmap.size());
}
@@ -198,7 +198,7 @@ void CEpgScan::AddTransponders()
scanmap.clear();
current_bnum = bouquetList->getActiveBouquetNumber();
AddBouquet(bouquetList->Bouquets[current_bnum]->channelList);
INFO("Added bouquet #%d, scan map size: %d", current_bnum, scanmap.size());
INFO("Added bouquet #%d, scan map size: %zd", current_bnum, scanmap.size());
}
} else if (g_settings.epg_scan == SCAN_FAV) {
AddFavorites();
@@ -223,7 +223,7 @@ void CEpgScan::Start(bool instandby)
standby = instandby;
live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
AddTransponders();
INFO("starting %s scan, scanning %d, scan map size: %d", standby ? "standby" : "live", scan_in_progress, scanmap.size());
INFO("starting %s scan, scanning %d, scan map size: %zd", standby ? "standby" : "live", scan_in_progress, scanmap.size());
if (standby || !scan_in_progress)
Next();
}
@@ -272,7 +272,7 @@ int CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
/* live channel changed, block scan channel change by timer */
scan_in_progress = true;
AddTransponders();
INFO("EVT_ZAP_COMPLETE, scan map size: %d\n", scanmap.size());
INFO("EVT_ZAP_COMPLETE, scan map size: %zd\n", scanmap.size());
#if 0
t_channel_id chid = *(t_channel_id *)data;
if (IS_WEBTV(chid))
@@ -288,7 +288,7 @@ int CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
scanned.insert(newchan->getTransponderId());
scanmap.erase(newchan->getTransponderId());
}
INFO("EIT read complete [" PRINTF_CHANNEL_ID_TYPE "], scan map size: %d", chid, scanmap.size());
INFO("EIT read complete [" PRINTF_CHANNEL_ID_TYPE "], scan map size: %zd", chid, scanmap.size());
Next();
return messages_return::handled;