repaired GetEventById

yavdr · Jan 28, 2015 · c658267 · c658267
1 parent 1858f75
commit c658267
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/timers.cpp b/timers.cpp
@@ -56,7 +56,7 @@ void TimersResponder::createOrUpdateTimer(ostream& out, cxxtools::http::Request&
      int minpre = q.getBodyAsInt("minpre");
      int minpost = q.getBodyAsInt("minpost");
      if (eventid >= 0 && chan != NULL) {
-        cEvent* event = VdrExtension::GetEventById((tEventID)eventid, chan);
+        const cEvent* event = VdrExtension::GetEventById((tEventID)eventid, chan);
 
         if (event == NULL) {
            reply.httpReturn(407, "eventid invalid");

diff --git a/tools.cpp b/tools.cpp
@@ -699,20 +699,18 @@ int VdrExtension::RecordingLengthInSeconds(cRecording* recording)
   return -1;
 }
 
-cEvent* VdrExtension::GetEventById(tEventID eventID, cChannel* channel)
+const cEvent* VdrExtension::GetEventById(tEventID eventID, cChannel* channel)
 {
   cSchedulesLock MutexLock;
   const cSchedules *Schedules = cSchedules::Schedules(MutexLock);
 
-  if ( !Schedules ) return NULL;
+  if (!Schedules)
+     return NULL;
+
+  const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
+  if (Schedule)
+     return Schedule->GetEvent(eventID);
 
-  for (cChannel *channel = Channels.First(); channel; channel = Channels.Next(channel)) {
-    const cSchedule *Schedule = Schedules->GetSchedule(channel->GetChannelID());
-    if (Schedule) {
-       cEvent* event = (cEvent*)Schedule->GetEvent(eventID);
-       if ( event != NULL && (channel == NULL || strcmp(channel->GetChannelID().ToString(), event->ChannelID().ToString()) == 0 ) ) return event;
-    }
-  }
   return NULL;
 }
 

diff --git a/tools.h b/tools.h
@@ -192,7 +192,7 @@ class VdrExtension
     static std::vector< cTimer* > SortedTimers();
     static bool CompareTimers(cTimer* timer1, cTimer* timer2);
     static int RecordingLengthInSeconds(cRecording* recording);
-    static cEvent* GetEventById(tEventID eventID, cChannel* channel = NULL);
+    static const cEvent* GetEventById(tEventID eventID, cChannel* channel);
     static std::string getRelativeVideoPath(cRecording* recording);
     static cEvent* getCurrentEventOnChannel(cChannel* channel);
     static std::string getVideoDiskSpace();