mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +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
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-07 23:12:01 +01:00
parent 1b7d3b8e8d b6fde11b07
commit 31c7317205
26 changed files with 251 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/record.cpp
View File

@@ -580,8 +580,13 @@ void CRecordInstance::FillMovieInfo(CZapitChannel * channel, APIDList & apid_lis
info2 = epgdata.info2;
recMovieInfo->parentalLockAge = epgdata.fsk;
#ifdef FULL_CONTENT_CLASSIFICATION
if( !epgdata.contentClassification.empty() )
recMovieInfo->genreMajor = epgdata.contentClassification[0];
#else
if(epgdata.contentClassification)
recMovieInfo->genreMajor = epgdata.contentClassification;
#endif
recMovieInfo->length = epgdata.epg_times.dauer / 60;