fixed tChannelIDCompare which fixes the event map.

try to change the activation of the thread. should be workged some more
fix the Original Air Date for NA epg

3 files changed, 41 insertions, 32 deletions

diff --git a/eit2.c b/eit2.c
index 8d04486..87064c5 100644
--- a/eit2.c
+++ b/eit2.c
@@ -398,8 +398,8 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source,
       time_t orgAirDate = DishEventDescriptor->getOriginalAirDate();
       char datestr [80];
       bool dateok = false;
-      if (orgAirDate == 0) {
-        dateok = strftime (datestr,80," Original Air Date: %a %b %d %Y",gmtime(&orgAirDate)) > 0;
+      if (orgAirDate != 0) {
+        dateok = strftime (datestr,80," \nOriginal Air Date: %a %b %d %Y",gmtime(&orgAirDate)) > 0;
       }
 
       Asprintf (&tmp, fmt.c_str(), description
diff --git a/epghandler.c b/epghandler.c
index 924b4df..a1b92c3 100644
--- a/epghandler.c
+++ b/epghandler.c
@@ -28,7 +28,6 @@ bool cEEpgHandler::HandleEitEvent(cSchedule* Schedule,
                                   const SI::EIT::Event* EitEvent, uchar TableID, uchar Version) {
   //LogD(1, prep("HandleEitEvent"));
   //DISH NID 0x1001 to 0x100B BEV 0x100 and 0x101
-  //TODO move the eit handling code at least for NA providers here instead of discarding.
   int nid = Schedule->ChannelID().Nid();
   if ((nid >= 0x1001 && nid <= 0x100B) || nid == 0x101 || nid == 0x100) {
     SI::cEIT2 eit2(Schedule);
@@ -164,7 +163,7 @@ bool cEEpgHandler::HandleEvent(cEvent* Event) {
   if (equivHandler->getEquiChanMap().count(*Event->ChannelID().ToString()) <= 0)
     return true;
 
-  if (modified)
+  //if (modified)
     equivHandler->updateEquivalent(Event->ChannelID(), Event);
 
   //TODO just to see the difference
diff --git a/util.c b/util.c
index 3d65f04..88de2b6 100644
--- a/util.c
+++ b/util.c
@@ -136,17 +136,28 @@ struct tChannelIDCompare
 {
    bool operator() (const tChannelID& lhs, const tChannelID& rhs) const
    {
-       return *lhs.ToString() < *rhs.ToString();
+     if (lhs.Source() < rhs.Source()) return true;
+     bool eq = lhs.Source() == rhs.Source();
+     if (eq && lhs.Nid() < rhs.Nid()) return true;
+     eq &= lhs.Nid() == rhs.Nid();
+     if (eq && lhs.Tid() < rhs.Tid()) return true;
+     eq &= lhs.Tid() == rhs.Tid();
+     if (eq && lhs.Sid() < rhs.Sid()) return true;
+     eq &= lhs.Sid() == rhs.Sid();
+     if (eq && lhs.Rid() < rhs.Rid()) return true;
+     return false;
    }
 };
 
+cTimeMs LastAddEventThread;
+enum { INSERT_TIMEOUT_IN_MS = 10000 };
 
 class cAddEventThread : public cThread
 {
 private:
   cTimeMs LastHandleEvent;
   std::map<tChannelID,cList<cEvent>*,tChannelIDCompare> *map_list;
-  enum { INSERT_TIMEOUT_IN_MS = 10000 };
+//  enum { INSERT_TIMEOUT_IN_MS = 10000 };
 protected:
   virtual void Action(void);
 public:
@@ -163,11 +174,11 @@ cAddEventThread::cAddEventThread(void)
 
 cAddEventThread::~cAddEventThread(void)
 {
-  LOCK_THREAD;
+//  LOCK_THREAD;
+  Cancel(3);
   std::map<tChannelID,cList<cEvent>*,tChannelIDCompare>::iterator it;
   for ( it=map_list->begin() ; it != map_list->end(); it++ )
     (*it).second->cList::Clear();
-  Cancel(3);
 }
 
 void cAddEventThread::Action(void)
@@ -175,18 +186,12 @@ void cAddEventThread::Action(void)
   //LogD (0, prep("Action"));
   SetPriority(19);
   while (Running() && !LastHandleEvent.TimedOut()) {
+    std::map<tChannelID, cList<cEvent>*, tChannelIDCompare>::iterator it;
 
     cSchedulesLock SchedulesLock(true, 10);
     cSchedules *schedules = (cSchedules *) cSchedules::Schedules(SchedulesLock);
     Lock();
-//     while (schedules && (e = list->First()) != NULL) {
-//           cSchedule *schedule = (cSchedule *)schedules->GetSchedule(Channels.GetByChannelID(e->GetChannelID()), true);
-//           schedule->AddEvent(e->GetEvent());
-//           EpgHandlers.SortSchedule(schedule);
-//           EpgHandlers.DropOutdated(schedule, e->GetEvent()->StartTime(), e->GetEvent()->EndTime(), e->GetEvent()->TableID(), e->GetEvent()->Version());
-//           list->Del(e);
-//           }
-    std::map<tChannelID, cList<cEvent>*, tChannelIDCompare>::iterator it;
+
     it = map_list->begin();
     while (schedules && it != map_list->end()) {
       cSchedule *schedule = (cSchedule *) schedules->GetSchedule(
@@ -194,17 +199,18 @@ void cAddEventThread::Action(void)
       while (((*it).second->First()) != NULL) {
         cEvent* event = (*it).second->First();
 
-/*         cEvent *pEqvEvent = (cEvent *) schedule->GetEvent (event->EventID(), event->StartTime());
+         cEvent *pEqvEvent = (cEvent *) schedule->GetEvent (event->EventID(), event->StartTime());
          if (pEqvEvent){
-	   LogD (0, prep("schedule->DelEvent(event)"));
-           schedule->DelEvent(pEqvEvent);
-         }
-*/
-         //cCondWait::SleepMs(10);
-        (*it).second->Del(event, false);
-        EpgHandlers.DropOutdated(schedule, event->StartTime(), event->EndTime(), event->TableID(),
-          event->Version());
-        schedule->AddEvent(event);
+//	   LogD (0, prep("schedule->DelEvent(event) size:%d"), (*it).second->Count());
+    	   (*it).second->Del(event);
+//           schedule->DelEvent(pEqvEvent);
+         } else {
+
+          (*it).second->Del(event, false);
+          EpgHandlers.DropOutdated(schedule, event->StartTime(), event->EndTime(), event->TableID(),
+            event->Version());
+          schedule->AddEvent(event);
+        }
       }
       EpgHandlers.SortSchedule(schedule);
        //sortSchedules(schedules, (*it).first);
@@ -222,14 +228,14 @@ void cAddEventThread::Action(void)
 void cAddEventThread::AddEvent(cEvent *Event, tChannelID ChannelID)
 {
   LOCK_THREAD;
-  if (map_list->empty() || map_list->count(ChannelID) == 0) {
+  if (map_list->count(ChannelID) == 0) {
       cList<cEvent>* list = new cList<cEvent>;
       list->Add(Event);
       map_list->insert(std::make_pair(ChannelID, list));
   } else {
-      (*map_list->find(ChannelID)).second->Add(Event);
+      map_list->find(ChannelID)->second->Add(Event);
   }
-//  LogD (0, prep("AddEventT %s channel: <%s>"), Event->Title(), *ChannelID.ToString());
+//  LogD (0, prep("AddEventT %s channel: <%s> map size:%d"), Event->Title(), *ChannelID.ToString(), map_list->size());
   LastHandleEvent.Set(INSERT_TIMEOUT_IN_MS);
 }
 
@@ -241,8 +247,13 @@ void AddEvent(cEvent *Event, tChannelID ChannelID)
 {
 //  LogD (0, prep("AddEvent %s channel: <%s>"), Event->Title(), *ChannelID.ToString());
   AddEventThread.AddEvent(Event, ChannelID);
-  if (!AddEventThread.Active())
-     AddEventThread.Start();
+//  if (!AddEventThread.Active())
+//     AddEventThread.Start();
+  if (!AddEventThread.Active() && LastAddEventThread.TimedOut()){
+    LastAddEventThread.Set(INSERT_TIMEOUT_IN_MS * 2);
+    AddEventThread.Start();
+  }
+
 }
 
 /** \brief Decode an EPG string as necessary
@@ -256,7 +267,6 @@ void AddEvent(cEvent *Event, tChannelID ChannelID)
 char *freesat_huffman_decode (const unsigned char *src, size_t size)
 {
   int tableid;
-//  freesat_decode_error = 0;
 
   if (src[0] == 0x1f && (src[1] == 1 || src[1] == 2)) {
     int uncompressed_len = 30;