add ability to select default encoding for dvb texts in many ways.. ( take a look...

[enigma2.git] / lib / service / event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 36446797102ac5930b7a69602479e17e39fcfc4f..cfd2ac5f51fa96615aef3440e25e7b0f85d85e76 100644 (file)
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -1,5 +1,6 @@
 #include <lib/service/event.h>
 #include <lib/base/estring.h>
+#include <lib/base/encoding.h>
 #include <lib/dvb/dvbtime.h>
 #include <dvbsi++/event_information_section.h>
 #include <dvbsi++/short_event_descriptor.h>
@@ -52,7 +53,7 @@ std::string ISOtbl[MAX_LANG][2] =
 };
 
 /* search for the presence of language from given EIT event descriptors*/
-bool eServiceEvent::loadLanguage(Event *evt, std::string lang)
+bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 {
        bool retval=0;
        for (DescriptorConstIterator desc = evt->getDescriptors()->begin(); desc != evt->getDescriptors()->end(); ++desc)
@@ -62,10 +63,12 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang)
                        case SHORT_EVENT_DESCRIPTOR:
                        {
                                const ShortEventDescriptor *sed = (ShortEventDescriptor*)*desc;
-                               if (lang.empty() || sed->getIso639LanguageCode() == lang)
+                               const std::string &cc = sed->getIso639LanguageCode();
+                               int table=encodingHandler.getCountryCodeDefaultMapping(cc);
+                               if (lang.empty() || cc == lang)
                                {
-                                       m_event_name = convertDVBUTF8(sed->getEventName());
-                                       m_short_description = convertDVBUTF8(sed->getText());
+                                       m_event_name = convertDVBUTF8(sed->getEventName(), table, tsidonid);
+                                       m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
                                        retval=1;
                                }
                                break;
@@ -73,11 +76,14 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang)
                        case EXTENDED_EVENT_DESCRIPTOR:
                        {
                                const ExtendedEventDescriptor *eed = (ExtendedEventDescriptor*)*desc;
-                               if (lang.empty() || eed->getIso639LanguageCode() == lang)
+                               const std::string &cc = eed->getIso639LanguageCode();
+                               int table=encodingHandler.getCountryCodeDefaultMapping(cc);
+                               if (lang.empty() || cc == lang)
                                {
-                                       m_extended_description += convertDVBUTF8(eed->getText());
+                                       m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid);
                                        retval=1;
                                }
+#if 0
                                const ExtendedEventList *itemlist = eed->getItems();
                                for (ExtendedEventConstIterator it = itemlist->begin(); it != itemlist->end(); ++it)
                                {
@@ -86,16 +92,19 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang)
                                        m_extended_description += ' ';
                                        m_extended_description += convertDVBUTF8((*it)->getItem());
                                }
+#endif
                                break;
                        }
                        default:
                                break;
                }
        }
+       if ( m_extended_description.find(m_short_description) == 0 )
+               m_short_description="";
        return retval;
 }
 
-RESULT eServiceEvent::parseFrom(Event *evt)
+RESULT eServiceEvent::parseFrom(Event *evt, int tsidonid)
 {
        uint16_t stime_mjd = evt->getStartTimeMjd();
        uint32_t stime_bcd = evt->getStartTimeBcd();
@@ -111,11 +120,11 @@ RESULT eServiceEvent::parseFrom(Event *evt)
        std::string country="de_DE";  // TODO use local data here
        for (int i=0; i < MAX_LANG; i++)
                if (country==ISOtbl[i][0])
-                       if (loadLanguage(evt,ISOtbl[i][1]))
+                       if (loadLanguage(evt, ISOtbl[i][1], tsidonid))
                                return 0;
-       if (loadLanguage(evt,"eng"))
+       if (loadLanguage(evt, "eng", tsidonid))
                return 0;
-       if (loadLanguage(evt,std::string()))
+       if (loadLanguage(evt, std::string(), tsidonid))
                return 0;
        return 0;
 }