X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/26b93e5ee373462211802fe859bd6a6d9dc083a5..5c27251fa08566a00d124aaf2c02249995dac9cf:/lib/service/event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 45a27879..2704ff0f 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -52,7 +52,7 @@ std::string ISOtbl[MAX_LANG][2] =
 };
 
 /* search for the presence of language from given EIT event descriptors*/
-bool eServiceEvent::language_exists(Event *evt, std::string lang)
+bool eServiceEvent::loadLanguage(Event *evt, std::string lang)
 {
 	bool retval=0;
 	for (DescriptorConstIterator desc = evt->getDescriptors()->begin(); desc != evt->getDescriptors()->end(); ++desc)
@@ -78,7 +78,13 @@ bool eServiceEvent::language_exists(Event *evt, std::string lang)
 					m_extended_description += convertDVBUTF8(eed->getText());
 					retval=1;
 				}
-				// TODO handling for extended event items? ( producer... )
+				const ExtendedEventList *itemlist = eed->getItems();
+				for (ExtendedEventConstIterator it = itemlist->begin(); it != itemlist->end(); ++it)
+				{
+					m_extended_description += convertDVBUTF8((*it)->getItemDescription());
+					m_extended_description += ' ';
+					m_extended_description += convertDVBUTF8((*it)->getItem());
+				}
 				break;
 			}
 			default:
@@ -92,7 +98,7 @@ RESULT eServiceEvent::parseFrom(Event *evt)
 {
 	uint16_t stime_mjd = evt->getStartTimeMjd();
 	uint32_t stime_bcd = evt->getStartTimeBcd();
-	uint16_t duration = evt->getDuration();
+	uint32_t duration = evt->getDuration();
 	m_begin = parseDVBtime(
 		stime_mjd >> 8,
 		stime_mjd&0xFF,
@@ -100,17 +106,28 @@ RESULT eServiceEvent::parseFrom(Event *evt)
 		(stime_bcd >> 8)&0xFF,
 		stime_bcd & 0xFF
 	);
-	m_duration = ((duration & 0xFF) + (duration >> 8) & 0xFF) * 24 * 60;
+	m_duration = fromBCD(duration>>16)*3600+fromBCD(duration>>8)*60+fromBCD(duration);
 	std::string country="de_DE";  // TODO use local data here
 	for (int i=0; i < MAX_LANG; i++)
 		if (country==ISOtbl[i][0])
-			if (language_exists(evt,ISOtbl[i][1]))
+			if (loadLanguage(evt,ISOtbl[i][1]))
 				return 0;
-	if (language_exists(evt,"eng"))
+	if (loadLanguage(evt,"eng"))
 		return 0;
-	if (language_exists(evt,std::string()))
+	if (loadLanguage(evt,std::string()))
 		return 0;
 	return 0;
 }
 
+std::string eServiceEvent::getBeginTimeString()
+{
+	tm t;
+	localtime_r(&m_begin, &t);
+	char tmp[13];
+	snprintf(tmp, 13, "%02d.%02d, %02d:%02d",
+		t.tm_mday, t.tm_mon+1,
+		t.tm_hour, t.tm_min);
+	return std::string(tmp, 12);
+}
+
 DEFINE_REF(eDebugClass);