code clenaup

3 files changed, 44 insertions, 58 deletions

diff --git a/eepg.c b/eepg.c
index f8ebb30..ebcd745 100644
--- a/eepg.c
+++ b/eepg.c
@@ -2917,36 +2917,8 @@ void cFilterEEPG::ProccessContinuous(u_short Pid, u_char Tid, int Length, const
 {
   //0x39 Viasat, 0x0300 Dish Network EEPG, 0x0441 Bell ExpressVU EEPG
   LogD(4, prep("Pid: 0x%02x Tid: %d Length: %d"), Pid, Tid, Length);
-/*#if APIVERSNUM >= 20300
-  LOCK_CHANNELS_WRITE;
-  LOCK_SCHEDULES_WRITE;
-//  cStateKey SchedulesStateKey;
-//  cSchedules *Schedules = cSchedules::GetSchedulesWrite(SchedulesStateKey, 10);
-#else
-  cSchedulesLock SchedulesLock(true, 10);
-  cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
-#endif*/
   //Look for other satelite positions only if Dish/Bell ExpressVU for the moment hardcoded pid check
-  //if(Channels && Schedules)
-    SI::cEIT2 EIT(/*Channels, Schedules,*/ Source(), Tid, Data, Format, Pid == EIT_PID);
-
-#if APIVERSNUM < 20300 //TODO
-  else//cEIT EIT (Schedules, Source (), Tid, Data);
-  {
-    // If we don't get a write lock, let's at least get a read lock, so
-    // that we can set the running status and 'seen' timestamp (well, actually
-    // with a read lock we shouldn't be doing that, but it's only integers that
-    // get changed, so it should be ok)
-    cChannelsLock ChannelsLock;
-    cChannels *Channels = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
-    cSchedulesLock SchedulesLock;
-    cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
-    if(Channels && Schedules)
-      SI::cEIT2 EIT(Channels, Schedules, Source(), Tid, Data, Format, Pid == EIT_PID, true);
-
-    //cEIT EIT (Schedules, Source (), Tid, Data, true);
-  }
-#endif
+  SI::cEIT2 EIT(Source(), Tid, Data, Format, Pid == EIT_PID);
 }
 
 void cFilterEEPG::Process (u_short Pid, u_char Tid, const u_char * Data, int Length)
diff --git a/eit2.c b/eit2.c
index cb5f9fc..5aeb60d 100644
--- a/eit2.c
+++ b/eit2.c
@@ -18,7 +18,7 @@ using namespace util;
 namespace SI
 {
 
-cEvent* cEIT2::ProcessEitEvent(/*cChannels* Channels, cSchedules * Schedules,*/cSchedule* pSchedule,const SI::EIT::Event* EitEvent,
+cEvent* cEIT2::ProcessEitEvent(cSchedule* pSchedule,const SI::EIT::Event* EitEvent,
                                uchar Tid, uchar versionNumber)
 {
   bool ExternalData = false;
@@ -90,15 +90,14 @@ cEvent* cEIT2::ProcessEitEvent(/*cChannels* Channels, cSchedules * Schedules,*/c
   pEvent->SetVersion (versionNumber);
 
   ProcessEventDescriptors(ExternalData, channel->Source(), Tid, EitEvent,
-                          pEvent, /*Schedules,*/ channel->GetChannelID());
+                          pEvent, channel->GetChannelID());
 
   Modified = true;
   return pEvent;
 }
 
-void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source,
-                                    u_char Tid, const SI::EIT::Event* SiEitEvent, cEvent* pEvent,
-                                    /*cChannels* Channels, cSchedules* Schedules,*/ const tChannelID& channelId)
+void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid, 
+		const SI::EIT::Event* SiEitEvent, cEvent* pEvent, const tChannelID& channelId)
 {
 
   const cEvent *rEvent = NULL;
@@ -235,7 +234,8 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source,
 #if APIVERSNUM >= 20300
       LOCK_SCHEDULES_READ;
 #else
-  //TODO
+      cSchedulesLock SchedulesLock;
+      cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
 #endif
       if (Schedules) {
         SI::TimeShiftedEventDescriptor * tsed = (SI::TimeShiftedEventDescriptor *) d;
@@ -465,11 +465,9 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source,
     //channel->SetLinkChannels (LinkChannels);
 }
 
-cEIT2::cEIT2 (/*cChannels* Channels, cSchedules * Schedules,*/ int Source, u_char Tid, const u_char * Data, EFormat format, bool isEITPid, bool OnlyRunningStatus)
+cEIT2::cEIT2 (int Source, u_char Tid, const u_char * Data, EFormat format, bool isEITPid)
 :  SI::EIT (Data, false)
-, OnlyRunningStatus(OnlyRunningStatus)
-//, Channels(Channels)
-//, Schedules(Schedules)
+, OnlyRunningStatus(false)
 , Format(format)
 {
 
@@ -493,18 +491,39 @@ cEIT2::cEIT2 (/*cChannels* Channels, cSchedules * Schedules,*/ int Source, u_cha
   //LogD(5, prep("channelID: %s format:%d"), *channel->GetChannelID().ToString(), Format);
 
 #if APIVERSNUM >= 20300
-    LOCK_CHANNELS_WRITE;
-    if (!Channels) {
-      LogD(3, prep("Error obtaining channels lock"));
-      return;
-    }
-    LOCK_SCHEDULES_WRITE;
-    if (!Schedules) {
-      LogD(3, prep("Error obtaining schedules lock"));
-      return;
-    }
+  LOCK_CHANNELS_WRITE;
+  if (!Channels) {
+     LogD(3, prep("Error obtaining channels lock"));
+     return;
+  }
+  LOCK_SCHEDULES_WRITE;
+  if (!Schedules) {
+     LogD(3, prep("Error obtaining schedules lock"));
+     return;
+  }
 #else
-  //TODO
+  cChannelsLock ChannelsLock(true, 10), ChannelsLockR;
+  cChannels *Channels = (cChannels*)(cChannels::Channels(ChannelsLock));
+  cSchedulesLock SchedulesLock(true, 10), SchedulesLockR;
+  cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLock));
+  if (!Channels) {
+     LogD(3, prep("Error obtaining channels lock"));
+     OnlyRunningStatus = true;
+     cChannels *Channels = (cChannels*)(cChannels::Channels(ChannelsLockR));
+  }
+  if (!Schedules) {
+    // If we don't get a write lock, let's at least get a read lock, so
+    // that we can set the running status and 'seen' timestamp (well, actually
+    // with a read lock we shouldn't be doing that, but it's only integers that
+    // get changed, so it should be ok)
+     LogD(3, prep("Error obtaining schedules lock"));
+     OnlyRunningStatus = true;
+     cSchedules *Schedules = (cSchedules*)(cSchedules::Schedules(SchedulesLockR));
+  }
+  if (!Schedules || !Channels) {
+     LogD(3, prep("Error obtaining read lock"));
+     return;
+  }
 #endif
   cSchedule *pSchedule = (cSchedule *) Schedules->GetSchedule (channel, true);
 
@@ -622,7 +641,6 @@ cEIT2::cEIT2 (cSchedule * Schedule, EFormat format)
 , OnlyRunningStatus(false)
 , SegmentStart(0)
 , SegmentEnd(0)
-//, Schedules(NULL)
 , Format(format)
 {
   //LogD(2, prep("cEIT2::cEIT2"));
diff --git a/eit2.h b/eit2.h
index 2e086d6..9a46e7c 100644
--- a/eit2.h
+++ b/eit2.h
@@ -51,18 +51,16 @@ extern bool SystemCharacterTableIsSingleByte;*/
 class cEIT2:public SI::EIT
 {
 public:
-  cEIT2(/*cChannels* Channels, cSchedules * Schedules,*/ int Source, u_char Tid, const u_char * Data,
-        EFormat format, bool isEITPid = false,
-        bool OnlyRunningStatus = false);
+  cEIT2 (int Source, u_char Tid, const u_char * Data, EFormat format, bool isEITPid = false);
   cEIT2 (cSchedule * Schedule, EFormat format);
   //protected:
   //  void updateEquivalent(cSchedules * Schedules, tChannelID channelID, cEvent *pEvent);
-  cEvent* ProcessEitEvent(/*cChannels* Channels, cSchedules * Schedules,*/cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version);
+  cEvent* ProcessEitEvent(cSchedule *Schedule, const SI::EIT::Event *EitEvent, uchar TableID, uchar Version);
 
 private:
   void ProcessEventDescriptors(bool ExternalData, int Source, u_char Tid,
                                const SI::EIT::Event* SiEitEvent, cEvent* pEvent,
-                               /*cChannels* Channels,cSchedules* Schedules,*/ const tChannelID& channelID);
+                               const tChannelID& channelID);
 
 private:
   bool Empty;
@@ -71,8 +69,6 @@ private:
   bool OnlyRunningStatus;
   time_t SegmentStart;
   time_t SegmentEnd;
-//  cChannels* Channels;
-//  cSchedules* Schedules;
   EFormat Format;
   const cChannel* channel;
 };