Implemented 'Schedules' menu

1 files changed, 82 insertions, 7 deletions

diff --git a/config.c b/config.c
index 1714651f..18234f53 100644
--- a/config.c
+++ b/config.c
@@ -4,18 +4,15 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.26 2000/10/08 16:10:40 kls Exp $
+ * $Id: config.c 1.27 2000/10/29 13:04:37 kls Exp $
  */
 
 #include "config.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include "dvbapi.h"
-#include "eit.h"
 #include "interface.h"
 
-extern cEIT EIT;
-
 // -- cKeys ------------------------------------------------------------------
 
 tKey keyTable[] = { // "Up" and "Down" must be the first two keys!
@@ -267,10 +264,8 @@ bool cChannel::Switch(cDvbApi *DvbApi)
      isyslog(LOG_INFO, "switching to channel %d", number);
      CurrentChannel = number;
      for (int i = 3; i--;) {
-         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr)) {
-            EIT.SetProgramNumber(pnr);
+         if (DvbApi->SetChannel(frequency, polarization, diseqc, srate, vpid, apid, ca, pnr))
             return true;
-            }
          esyslog(LOG_ERR, "retrying");
          }
      return false;
@@ -306,6 +301,47 @@ cTimer::cTimer(bool Instant)
      snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", ch->name);
 }
 
+cTimer::cTimer(const cEventInfo *EventInfo)
+{
+  startTime = stopTime = 0;
+  recording = false;
+  active = true;
+  cChannel *ch = Channels.GetByServiceID(EventInfo->GetServiceID());
+  channel = ch ? ch->number : 0;
+  time_t tstart = EventInfo->GetTime();
+  time_t tstop = tstart + EventInfo->GetDuration() + Setup.MarginStop * 60;
+  tstart -= Setup.MarginStart * 60;
+  struct tm *time = localtime(&tstart);
+  day = time->tm_mday;
+  start = time->tm_hour * 100 + time->tm_min;
+  time = localtime(&tstop);
+  stop = time->tm_hour * 100 + time->tm_min;
+  if (stop >= 2400)
+     stop -= 2400;
+  priority = 99;
+  lifetime = 99;
+  *file = 0;
+  const char *Title = EventInfo->GetTitle();
+  if (!isempty(Title))
+     strn0cpy(file, EventInfo->GetTitle(), sizeof(file));
+  summary = NULL;
+  const char *Subtitle = EventInfo->GetSubtitle();
+  if (isempty(Subtitle))
+     Subtitle = "";
+  const char *Summary = EventInfo->GetExtendedDescription();
+  if (isempty(Summary))
+     Summary = "";
+  if (*Subtitle || *Summary) {
+     asprintf(&summary, "%s%s%s", Subtitle, (*Subtitle && *Summary) ? "\n\n" : "", Summary);
+     char *p = summary;
+     while (*p) {
+           if (*p == '\n')
+              *p = '|';
+           p++;
+           }
+     }
+}
+
 cTimer::~cTimer()
 {
   delete summary;
@@ -388,14 +424,33 @@ bool cTimer::Parse(const char *s)
   char *buffer2 = NULL;
   delete summary;
   summary = NULL;
+  //XXX Apparently sscanf() doesn't work correctly if the last %a argument
+  //XXX results in an empty string (this firt occured when the EIT gathering
+  //XXX was put into a separate thread - don't know why this happens...
+  //XXX As a cure we copy the original string and add a blank.
+  //XXX If anybody can shed some light on why sscanf() failes here, I'd love
+  //XXX to hear about that!
+  char *s2 = NULL;
+  int l2 = strlen(s);
+  if (s[l2 - 2] == ':') { // note that 's' has a trailing '\n'
+     s2 = (char *)malloc(l2 + 2);
+     strcat(strn0cpy(s2, s, l2), " \n");
+     s = s2;
+     }
   if (8 <= sscanf(s, "%d:%d:%a[^:]:%d:%d:%d:%d:%a[^:\n]:%a[^\n]", &active, &channel, &buffer1, &start, &stop, &priority, &lifetime, &buffer2, &summary)) {
+     if (summary && !*skipspace(summary)) {
+        delete summary;
+        summary = NULL;
+        }
      //TODO add more plausibility checks
      day = ParseDay(buffer1);
      strn0cpy(file, buffer2, MaxFileName);
      delete buffer1;
      delete buffer2;
+     delete s2;
      return day != 0;
      }
+  delete s2;
   return false;
 }
 
@@ -550,6 +605,17 @@ cChannel *cChannels::GetByNumber(int Number)
   return NULL;
 }
 
+cChannel *cChannels::GetByServiceID(unsigned short ServiceId)
+{
+  cChannel *channel = (cChannel *)First();
+  while (channel) {
+        if (channel->pnr == ServiceId)
+           return channel;
+        channel = (cChannel *)channel->Next();
+        }
+  return NULL;
+}
+
 bool cChannels::SwitchTo(int Number, cDvbApi *DvbApi)
 {
   cChannel *channel = GetByNumber(Number);
@@ -599,6 +665,9 @@ cSetup::cSetup(void)
   MarkInstantRecord = 1;
   LnbFrequLo =  9750;
   LnbFrequHi = 10600;
+  SetSystemTime = 0;
+  MarginStart = 2;
+  MarginStop = 10;
 }
 
 bool cSetup::Parse(char *s)
@@ -613,6 +682,9 @@ bool cSetup::Parse(char *s)
      else if (!strcasecmp(Name, "MarkInstantRecord"))   MarkInstantRecord  = atoi(Value);
      else if (!strcasecmp(Name, "LnbFrequLo"))          LnbFrequLo         = atoi(Value);
      else if (!strcasecmp(Name, "LnbFrequHi"))          LnbFrequHi         = atoi(Value);
+     else if (!strcasecmp(Name, "SetSystemTime"))       SetSystemTime      = atoi(Value);
+     else if (!strcasecmp(Name, "MarginStart"))         MarginStart        = atoi(Value);
+     else if (!strcasecmp(Name, "MarginStop"))          MarginStop         = atoi(Value);
      else
         return false;
      return true;
@@ -660,6 +732,9 @@ bool cSetup::Save(const char *FileName)
         fprintf(f, "MarkInstantRecord  = %d\n", MarkInstantRecord);
         fprintf(f, "LnbFrequLo         = %d\n", LnbFrequLo);
         fprintf(f, "LnbFrequHi         = %d\n", LnbFrequHi);
+        fprintf(f, "SetSystemTime      = %d\n", SetSystemTime);
+        fprintf(f, "MarginStart        = %d\n", MarginStart);
+        fprintf(f, "MarginStop         = %d\n", MarginStop);
         fclose(f);
         isyslog(LOG_INFO, "saved setup to %s", FileName);
         return true;