Updated patch for vdr-1.7.12

2 files changed, 50 insertions, 48 deletions

diff --git a/README - vps b/README - vps
index 252a122..5f4f38a 100644
--- a/README - vps
+++ b/README - vps
@@ -14,3 +14,5 @@ With these conditions met, the sequence of events is:
 - VDR monitors the running status of the programme to be recorded
 - When the running status changes to 'running', VDR starts recording
 - When the running status changes to 'not running', VDR stops recording and deletes the timer.
+
+CAUTION - VPS recordings seem to have a lower priority than live viewing. VDR will not interrupt live viewing to start looking for the start of a recording.
\ No newline at end of file
diff --git a/vdrtva-1.7.11.diff b/vdrtva-1.7.12.diff
index c10da1c..222a4d9 100644
--- a/vdrtva-1.7.11.diff
+++ b/vdrtva-1.7.12.diff
@@ -1,5 +1,5 @@
-diff -ur vdr-1.7.11/channels.c vdr-1.7/channels.c
---- vdr-1.7.11/channels.c	2010-01-02 17:38:40.000000000 +0000
+diff -ur vdr-1.7.12/channels.c vdr-1.7/channels.c
+--- vdr-1.7.12/channels.c	2010-01-02 17:38:40.000000000 +0000
 +++ vdr-1.7/channels.c	2010-01-06 12:54:34.000000000 +0000
 @@ -188,6 +188,7 @@
    shortName = strdup("");
@@ -97,8 +97,8 @@ diff -ur vdr-1.7.11/channels.c vdr-1.7/channels.c
          if (!GetChannelID().Valid()) {
             esyslog("ERROR: channel data results in invalid ID!");
             return false;
-diff -ur vdr-1.7.11/channels.h vdr-1.7/channels.h
---- vdr-1.7.11/channels.h	2009-12-06 12:57:45.000000000 +0000
+diff -ur vdr-1.7.12/channels.h vdr-1.7/channels.h
+--- vdr-1.7.12/channels.h	2009-12-06 12:57:45.000000000 +0000
 +++ vdr-1.7/channels.h	2010-01-06 12:54:34.000000000 +0000
 @@ -116,6 +116,7 @@
    char *shortName;
@@ -124,10 +124,10 @@ diff -ur vdr-1.7.11/channels.h vdr-1.7/channels.h
    void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
    void SetCaIds(const int *CaIds); // list must be zero-terminated
    void SetCaDescriptors(int Level);
-diff -ur vdr-1.7.11/config.c vdr-1.7/config.c
---- vdr-1.7.11/config.c	2009-12-05 15:30:30.000000000 +0000
-+++ vdr-1.7/config.c	2010-01-06 12:54:34.000000000 +0000
-@@ -258,6 +258,7 @@
+diff -ur vdr-1.7.12/config.c vdr-1.7/config.c
+--- vdr-1.7.12/config.c	2010-01-31 12:36:36.000000000 +0000
++++ vdr-1.7/config.c	2010-01-31 14:54:42.000000000 +0000
+@@ -353,6 +353,7 @@
    UseSubtitle = 1;
    UseVps = 0;
    VpsMargin = 120;
@@ -135,7 +135,7 @@ diff -ur vdr-1.7.11/config.c vdr-1.7/config.c
    RecordingDirs = 1;
    VideoDisplayFormat = 1;
    VideoFormat = 0;
-@@ -445,6 +446,7 @@
+@@ -541,6 +542,7 @@
    else if (!strcasecmp(Name, "UseSubtitle"))         UseSubtitle        = atoi(Value);
    else if (!strcasecmp(Name, "UseVps"))              UseVps             = atoi(Value);
    else if (!strcasecmp(Name, "VpsMargin"))           VpsMargin          = atoi(Value);
@@ -143,7 +143,7 @@ diff -ur vdr-1.7.11/config.c vdr-1.7/config.c
    else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
    else if (!strcasecmp(Name, "VideoDisplayFormat"))  VideoDisplayFormat = atoi(Value);
    else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
-@@ -537,6 +539,7 @@
+@@ -634,6 +636,7 @@
    Store("UseSubtitle",        UseSubtitle);
    Store("UseVps",             UseVps);
    Store("VpsMargin",          VpsMargin);
@@ -151,10 +151,10 @@ diff -ur vdr-1.7.11/config.c vdr-1.7/config.c
    Store("RecordingDirs",      RecordingDirs);
    Store("VideoDisplayFormat", VideoDisplayFormat);
    Store("VideoFormat",        VideoFormat);
-diff -ur vdr-1.7.11/config.h vdr-1.7/config.h
---- vdr-1.7.11/config.h	2009-11-22 19:55:04.000000000 +0000
-+++ vdr-1.7/config.h	2010-01-06 12:54:34.000000000 +0000
-@@ -238,6 +238,7 @@
+diff -ur vdr-1.7.12/config.h vdr-1.7/config.h
+--- vdr-1.7.12/config.h	2010-01-31 11:14:02.000000000 +0000
++++ vdr-1.7/config.h	2010-01-31 14:54:42.000000000 +0000
+@@ -252,6 +252,7 @@
    int UseSubtitle;
    int UseVps;
    int VpsMargin;
@@ -162,9 +162,9 @@ diff -ur vdr-1.7.11/config.h vdr-1.7/config.h
    int RecordingDirs;
    int VideoDisplayFormat;
    int VideoFormat;
-diff -ur vdr-1.7.11/eit.c vdr-1.7/eit.c
---- vdr-1.7.11/eit.c	2010-01-03 15:35:21.000000000 +0000
-+++ vdr-1.7/eit.c	2010-01-06 12:54:34.000000000 +0000
+diff -ur vdr-1.7.12/eit.c vdr-1.7/eit.c
+--- vdr-1.7.12/eit.c	2010-01-08 15:17:09.000000000 +0000
++++ vdr-1.7/eit.c	2010-01-31 14:54:42.000000000 +0000
 @@ -121,6 +121,8 @@
        SI::Descriptor *d;
        SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
@@ -222,9 +222,9 @@ diff -ur vdr-1.7.11/eit.c vdr-1.7/eit.c
  
        pEvent->SetComponents(Components);
  
-diff -ur vdr-1.7.11/epg.c vdr-1.7/epg.c
---- vdr-1.7.11/epg.c	2010-01-03 14:10:20.000000000 +0000
-+++ vdr-1.7/epg.c	2010-01-06 13:03:01.000000000 +0000
+diff -ur vdr-1.7.12/epg.c vdr-1.7/epg.c
+--- vdr-1.7.12/epg.c	2010-01-08 15:20:28.000000000 +0000
++++ vdr-1.7/epg.c	2010-01-31 14:54:42.000000000 +0000
 @@ -117,6 +117,8 @@
    startTime = 0;
    duration = 0;
@@ -282,10 +282,10 @@ diff -ur vdr-1.7.11/epg.c vdr-1.7/epg.c
      default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
                return false;
      }
-diff -ur vdr-1.7.11/epg.h vdr-1.7/epg.h
---- vdr-1.7.11/epg.h	2010-01-03 14:39:14.000000000 +0000
-+++ vdr-1.7/epg.h	2010-01-06 12:54:34.000000000 +0000
-@@ -83,6 +83,8 @@
+diff -ur vdr-1.7.12/epg.h vdr-1.7/epg.h
+--- vdr-1.7.12/epg.h	2010-01-08 15:20:34.000000000 +0000
++++ vdr-1.7/epg.h	2010-01-31 14:54:42.000000000 +0000
+@@ -86,6 +86,8 @@
    int duration;            // Duration of this event in seconds
    time_t vps;              // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)
    time_t seen;             // When this event was last seen in the data stream
@@ -294,7 +294,7 @@ diff -ur vdr-1.7.11/epg.h vdr-1.7/epg.h
  public:
    cEvent(tEventID EventID);
    ~cEvent();
-@@ -103,6 +105,8 @@
+@@ -106,6 +108,8 @@
    time_t EndTime(void) const { return startTime + duration; }
    int Duration(void) const { return duration; }
    time_t Vps(void) const { return vps; }
@@ -303,7 +303,7 @@ diff -ur vdr-1.7.11/epg.h vdr-1.7/epg.h
    time_t Seen(void) const { return seen; }
    bool SeenWithin(int Seconds) const { return time(NULL) - seen < Seconds; }
    bool HasTimer(void) const;
-@@ -126,6 +130,8 @@
+@@ -129,6 +133,8 @@
    void SetStartTime(time_t StartTime);
    void SetDuration(int Duration);
    void SetVps(time_t Vps);
@@ -312,8 +312,8 @@ diff -ur vdr-1.7.11/epg.h vdr-1.7/epg.h
    void SetSeen(void);
    cString ToDescr(void) const;
    void Dump(FILE *f, const char *Prefix = "", bool InfoOnly = false) const;
-diff -ur vdr-1.7.11/libsi/descriptor.c vdr-1.7/libsi/descriptor.c
---- vdr-1.7.11/libsi/descriptor.c	2007-02-03 11:45:58.000000000 +0000
+diff -ur vdr-1.7.12/libsi/descriptor.c vdr-1.7/libsi/descriptor.c
+--- vdr-1.7.12/libsi/descriptor.c	2007-02-03 11:45:58.000000000 +0000
 +++ vdr-1.7/libsi/descriptor.c	2009-06-06 09:48:00.000000000 +0100
 @@ -643,6 +643,29 @@
     textualServiceIdentifier.setData(data+sizeof(descr_service_identifier), getLength()-sizeof(descr_service_identifier));
@@ -345,8 +345,8 @@ diff -ur vdr-1.7.11/libsi/descriptor.c vdr-1.7/libsi/descriptor.c
  void MultilingualNameDescriptor::Parse() {
     nameLoop.setData(data+sizeof(descr_multilingual_network_name), getLength()-sizeof(descr_multilingual_network_name));
  }
-diff -ur vdr-1.7.11/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
---- vdr-1.7.11/libsi/descriptor.h	2007-02-03 11:45:58.000000000 +0000
+diff -ur vdr-1.7.12/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
+--- vdr-1.7.12/libsi/descriptor.h	2007-02-03 11:45:58.000000000 +0000
 +++ vdr-1.7/libsi/descriptor.h	2009-06-06 09:48:00.000000000 +0100
 @@ -361,6 +361,25 @@
     virtual void Parse();
@@ -374,8 +374,8 @@ diff -ur vdr-1.7.11/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
  //abstract base class
  class MultilingualNameDescriptor : public Descriptor {
  public:
-diff -ur vdr-1.7.11/libsi/headers.h vdr-1.7/libsi/headers.h
---- vdr-1.7.11/libsi/headers.h	2007-02-03 11:45:58.000000000 +0000
+diff -ur vdr-1.7.12/libsi/headers.h vdr-1.7/libsi/headers.h
+--- vdr-1.7.12/libsi/headers.h	2007-02-03 11:45:58.000000000 +0000
 +++ vdr-1.7/libsi/headers.h	2009-06-06 09:48:00.000000000 +0100
 @@ -1673,11 +1673,39 @@
     u_char descriptor_length                      :8;
@@ -417,8 +417,8 @@ diff -ur vdr-1.7.11/libsi/headers.h vdr-1.7/libsi/headers.h
  };
  
  /* 0x77 time_slice_fec_identifier_descriptor (ETSI EN 301 192) */
-diff -ur vdr-1.7.11/libsi/si.c vdr-1.7/libsi/si.c
---- vdr-1.7.11/libsi/si.c	2009-12-05 16:20:12.000000000 +0000
+diff -ur vdr-1.7.12/libsi/si.c vdr-1.7/libsi/si.c
+--- vdr-1.7.12/libsi/si.c	2009-12-05 16:20:12.000000000 +0000
 +++ vdr-1.7/libsi/si.c	2010-01-06 12:54:34.000000000 +0000
 @@ -605,6 +605,12 @@
           case ExtensionDescriptorTag:
@@ -444,10 +444,10 @@ diff -ur vdr-1.7.11/libsi/si.c vdr-1.7/libsi/si.c
           case TimeSliceFecIdentifierDescriptorTag:
           case ECMRepetitionRateDescriptorTag:
           case EnhancedAC3DescriptorTag:
-diff -ur vdr-1.7.11/menu.c vdr-1.7/menu.c
---- vdr-1.7.11/menu.c	2009-12-06 11:29:05.000000000 +0000
-+++ vdr-1.7/menu.c	2010-01-06 12:54:34.000000000 +0000
-@@ -2698,6 +2698,7 @@
+diff -ur vdr-1.7.12/menu.c vdr-1.7/menu.c
+--- vdr-1.7.12/menu.c	2010-01-31 12:43:24.000000000 +0000
++++ vdr-1.7/menu.c	2010-01-31 14:54:42.000000000 +0000
+@@ -3047,6 +3047,7 @@
    Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"),          &data.UseSubtitle));
    Add(new cMenuEditBoolItem(tr("Setup.Recording$Use VPS"),                   &data.UseVps));
    Add(new cMenuEditIntItem( tr("Setup.Recording$VPS margin (s)"),            &data.VpsMargin, 0));
@@ -455,8 +455,8 @@ diff -ur vdr-1.7.11/menu.c vdr-1.7/menu.c
    Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"),    &data.MarkInstantRecord));
    Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"),     data.NameInstantRecord, sizeof(data.NameInstantRecord)));
    Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"),   &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
-diff -ur vdr-1.7.11/sdt.c vdr-1.7/sdt.c
---- vdr-1.7.11/sdt.c	2009-12-23 16:02:47.000000000 +0000
+diff -ur vdr-1.7.12/sdt.c vdr-1.7/sdt.c
+--- vdr-1.7.12/sdt.c	2009-12-23 16:02:47.000000000 +0000
 +++ vdr-1.7/sdt.c	2010-01-06 12:54:34.000000000 +0000
 @@ -127,6 +127,12 @@
                       }
@@ -471,9 +471,9 @@ diff -ur vdr-1.7.11/sdt.c vdr-1.7/sdt.c
              default: ;
              }
            delete d;
-diff -ur vdr-1.7.11/timers.c vdr-1.7/timers.c
---- vdr-1.7.11/timers.c	2009-08-09 13:43:20.000000000 +0100
-+++ vdr-1.7/timers.c	2009-12-30 09:28:39.000000000 +0000
+diff -ur vdr-1.7.12/timers.c vdr-1.7/timers.c
+--- vdr-1.7.12/timers.c	2010-01-16 11:18:53.000000000 +0000
++++ vdr-1.7/timers.c	2010-01-31 14:54:42.000000000 +0000
 @@ -423,7 +423,7 @@
       }
  
@@ -483,9 +483,9 @@ diff -ur vdr-1.7.11/timers.c vdr-1.7/timers.c
          if (Margin || !Directly) {
             startTime = event->StartTime();
             stopTime = event->EndTime();
-diff -ur vdr-1.7.11/vdr.5 vdr-1.7/vdr.5
---- vdr-1.7.11/vdr.5	2010-01-03 13:37:07.000000000 +0000
-+++ vdr-1.7/vdr.5	2010-01-06 13:04:40.000000000 +0000
+diff -ur vdr-1.7.12/vdr.5 vdr-1.7/vdr.5
+--- vdr-1.7.12/vdr.5	2010-01-31 12:59:50.000000000 +0000
++++ vdr-1.7/vdr.5	2010-01-31 14:54:42.000000000 +0000
 @@ -240,6 +240,9 @@
  .B RID
  The Radio ID of this channel (typically 0, may be used to distinguish channels where
@@ -496,7 +496,7 @@ diff -ur vdr-1.7.11/vdr.5 vdr-1.7/vdr.5
  .PP
  A particular channel can be uniquely identified by its \fBchannel\ ID\fR,
  which is a string that looks like this:
-@@ -699,6 +702,8 @@
+@@ -757,6 +760,8 @@
  \fBR\fR@<parental rating>
  \fBX\fR@<stream> <type> <language> <descr>
  \fBV\fR@<vps time>
@@ -505,7 +505,7 @@ diff -ur vdr-1.7.11/vdr.5 vdr-1.7/vdr.5
  \fBe\fR@
  \fBc\fR@
  .TE
-@@ -733,6 +738,8 @@
+@@ -791,6 +796,8 @@
  <language>     @is the three letter language code (optionally two codes, separated by '+')
  <descr>        @is the description of this stream component
  <vps time>     @is the Video Programming Service time of this event