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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
This commit is contained in:
Stefan Seyfried
2015-02-07 23:12:01 +01:00
parent 8062f3509f f3426c5dc0
commit 30eb1a1ced
26 changed files with 251 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/eitd/sectionsd.cpp
View File

@@ -2650,7 +2650,12 @@ bool CEitManager::getEPGid(const event_id_t epgID, const time_t startzeit, CEPGD
epgdata->info1 = evt.getText();
epgdata->info2 = evt.getExtendedText();
/* FIXME printf("itemDescription: %s\n", evt.itemDescription.c_str()); */
#ifdef FULL_CONTENT_CLASSIFICATION
evt.classifications.get(epgdata->contentClassification, epgdata->userClassification);
#else
epgdata->contentClassification = evt.classifications.content;
epgdata->userClassification = evt.classifications.user;
#endif
epgdata->fsk = evt.getFSK();
epgdata->table_id = evt.table_id;
@@ -2711,7 +2716,13 @@ bool CEitManager::getActualEPGServiceKey(const t_channel_id channel_id, CEPGData
epgdata->info1 = evt.getText();
epgdata->info2 = evt.getExtendedText();
/* FIXME printf("itemDescription: %s\n", evt.itemDescription.c_str());*/
#ifdef FULL_CONTENT_CLASSIFICATION
evt.classifications.get(epgdata->contentClassification, epgdata->userClassification);
#else
epgdata->contentClassification = evt.classifications.content;
epgdata->userClassification = evt.classifications.user;
#endif
epgdata->fsk = evt.getFSK();
epgdata->table_id = evt.table_id;