mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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/gui/epgview.cpp
View File

@@ -612,9 +612,14 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
}
// Show genre information
#ifdef FULL_CONTENT_CLASSIFICATION
if (!epgData.contentClassification.empty())
processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_GENRE)) + ": " + GetGenre(epgData.contentClassification[0])); // UTF-8
// processTextToArray( epgData.userClassification.c_str() );
#else
if (epgData.contentClassification)
processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_GENRE)) + ": " + GetGenre(epgData.contentClassification)); // UTF-8
#endif
// -- display more screenings on the same channel
// -- 2002-05-03 rasc