Neutrino: Show audio track descriptions and program length in EPG info, patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49185

Origin commit data
------------------
Branch: ni/coolstream
Commit: 19d47e04a5
Author: rhabarber1848 <rhabarber1848@web.de>
Date: 2010-02-28 (Sun, 28 Feb 2010)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -312,6 +312,10 @@ epgextended.year_of_production Produktionsjahr
 epglist.noevents Keine EPG-Information verfügbar.
 epgviewer.More_Screenings Weitere Termine auf diesem Kanal
 epgviewer.More_Screenings_short Weitere Termine
+epgviewer.age_rating Altersfreigabe
+epgviewer.audio Audio
+epgviewer.genre Genre
+epgviewer.length Spieldauer (Min.)
 epgviewer.nodetailed Keine ausführlichen Informationen verfügbar
 epgviewer.notfound Keine Programminformationen (EPG) gefunden
 eventfinder.head EPG-Suche

data/locale/english.locale

@@ -312,6 +312,10 @@ epgextended.year_of_production Year of Production
 epglist.noevents EPG is not available...
 epgviewer.More_Screenings More Screenings on this Channel
 epgviewer.More_Screenings_short More Screenings
+epgviewer.age_rating Age rating
+epgviewer.audio Audio
+epgviewer.genre Genre
+epgviewer.length Length (min.)
 epgviewer.nodetailed No detailed informations available
 epgviewer.notfound No EPG found
 eventfinder.head Search in EPG

src/gui/epgview.cpp

@@ -548,28 +548,55 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 	else
 		processTextToArray(strEpisode + epgData.info2);
 
+	// Add a blank line
+	processTextToArray("");
+
+
 	// 21.07.2005 - rainerk
 	// Show extended information
 	if ( !epgData.itemDescriptions.empty() && !epgData.items.empty()) {
 		char line[256];
 		std::vector<std::string>::iterator description;
 		std::vector<std::string>::iterator item;
-		processTextToArray(""); // Add a blank line
 		for (description = epgData.itemDescriptions.begin(), item = epgData.items.begin(); description != epgData.itemDescriptions.end(), item != epgData.items.end(); ++description, ++item) {
 			sprintf(line, "%s: %s", (*(description)).c_str(), (*(item)).c_str());
 			processTextToArray(line);
 		}
 	}
 
+	// Show FSK information
 	if (epgData.fsk > 0)
 	{
-		char _tfsk[11];
-		sprintf (_tfsk, "FSK: ab %d", epgData.fsk );
-		processTextToArray( _tfsk ); // UTF-8
+		char fskInfo[4];
+		sprintf(fskInfo, "%d", epgData.fsk);
+		processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_AGE_RATING)) + ": " + fskInfo); // UTF-8
 	}
 
+	// Show length information
+	char lengthInfo[11];
+	sprintf(lengthInfo, "%d", epgData.epg_times.dauer / 60);
+	processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_LENGTH)) + ": " + lengthInfo); // UTF-8
+
+	// Show audio information
+	std::string audioInfo = "";
+	CSectionsdClient::ComponentTagList tags;
+	bool hasComponentTags = CEitManager::getInstance()->getComponentTagsUniqueKey( epgData.eventID, tags);
+	if (hasComponentTags)
+	{
+		for (unsigned int i = 0; i < tags.size(); i++)
+			if (tags[i].streamContent == 2)
+				audioInfo += tags[i].component + ", ";
+
+		if (!audioInfo.empty())
+		{
+			audioInfo.erase(audioInfo.size()-2);
+			processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_AUDIO)) + ": " + ZapitTools::Latin1_to_UTF8(audioInfo)); // UTF-8
+		}
+	}
+
+	// Show genre information
 	if (epgData.contentClassification.length()> 0)
-		processTextToArray(GetGenre(epgData.contentClassification[0])); // UTF-8
+		processTextToArray(std::string(g_Locale->getText(LOCALE_EPGVIEWER_GENRE)) + ": " + GetGenre(epgData.contentClassification[0])); // UTF-8
 //	processTextToArray( epgData.userClassification.c_str() );
 
 
@@ -619,11 +646,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 	showTimerEventBar (true);
 
 	//show Content&Component for Dolby & 16:9
-	CSectionsdClient::ComponentTagList tags;
 	int dummy_h,dummy_w;
 	frameBuffer->getIconSize(NEUTRINO_ICON_16_9_GREY, &dummy_w, &dummy_h);
 	if (dummy_h == 16 && dummy_w == 26){ // show only standard icon size
-		if (CEitManager::getInstance()->getComponentTagsUniqueKey( epgData.eventID, tags))
+		if (hasComponentTags)
 		{
 			for (unsigned int i=0; i< tags.size(); i++)
 			{

src/system/locals.h

@@ -339,6 +339,10 @@ typedef enum
 	LOCALE_EPGLIST_NOEVENTS,
 	LOCALE_EPGVIEWER_MORE_SCREENINGS,
 	LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT,
+	LOCALE_EPGVIEWER_AGE_RATING,
+	LOCALE_EPGVIEWER_AUDIO,
+	LOCALE_EPGVIEWER_GENRE,
+	LOCALE_EPGVIEWER_LENGTH,
 	LOCALE_EPGVIEWER_NODETAILED,
 	LOCALE_EPGVIEWER_NOTFOUND,
 	LOCALE_EVENTFINDER_HEAD,

src/system/locals_intern.h

@@ -339,6 +339,10 @@ const char * locale_real_names[] =
 	"epglist.noevents",
 	"epgviewer.More_Screenings",
 	"epgviewer.More_Screenings_short",
+	"epgviewer.age_rating",
+	"epgviewer.audio",
+	"epgviewer.genre",
+	"epgviewer.length",
 	"epgviewer.nodetailed",
 	"epgviewer.notfound",
 	"eventfinder.head",