Updated for VDR 1.7.14

1 files changed, 46 insertions, 46 deletions

diff --git a/vdrtva-1.7.13.diff b/vdrtva-1.7.14.diff
index 2cdd841..16fc74a 100644
--- a/vdrtva-1.7.13.diff
+++ b/vdrtva-1.7.14.diff
@@ -1,5 +1,5 @@
-diff -ur vdr-1.7.13/channels.c vdr-1.7/channels.c
---- vdr-1.7.13/channels.c	2010-02-21 13:36:04.000000000 +0000
+diff -ur vdr-1.7.14/channels.c vdr-1.7/channels.c
+--- vdr-1.7.14/channels.c	2010-02-21 13:36:04.000000000 +0000
 +++ vdr-1.7/channels.c	2010-03-03 17:59:17.000000000 +0000
 @@ -60,6 +60,7 @@
    shortName = strdup("");
@@ -97,9 +97,9 @@ diff -ur vdr-1.7.13/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.13/channels.h vdr-1.7/channels.h
---- vdr-1.7.13/channels.h	2010-02-21 14:05:49.000000000 +0000
-+++ vdr-1.7/channels.h	2010-03-03 17:55:28.000000000 +0000
+diff -ur vdr-1.7.14/channels.h vdr-1.7/channels.h
+--- vdr-1.7.14/channels.h	2010-03-07 13:47:13.000000000 +0000
++++ vdr-1.7/channels.h	2010-03-14 11:18:45.000000000 +0000
 @@ -96,6 +96,7 @@
    char *shortName;
    char *provider;
@@ -116,7 +116,7 @@ diff -ur vdr-1.7.13/channels.h vdr-1.7/channels.h
    int Frequency(void) const { return frequency; } ///< Returns the actual frequency, as given in 'channels.conf'
    int Transponder(void) const;                    ///< Returns the transponder frequency in MHz, plus the polarization in case of sat
    static int Transponder(int Frequency, char Polarization); ///< builds the transponder from the given Frequency and Polarization
-@@ -183,6 +185,7 @@
+@@ -185,6 +187,7 @@
    void SetId(int Nid, int Tid, int Sid, int Rid = 0);
    void SetName(const char *Name, const char *ShortName, const char *Provider);
    void SetPortalName(const char *PortalName);
@@ -124,46 +124,46 @@ diff -ur vdr-1.7.13/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.13/config.c vdr-1.7/config.c
---- vdr-1.7.13/config.c	2010-01-31 12:36:36.000000000 +0000
-+++ vdr-1.7/config.c	2010-01-31 14:54:42.000000000 +0000
+diff -ur vdr-1.7.14/config.c vdr-1.7/config.c
+--- vdr-1.7.14/config.c	2010-03-12 16:41:37.000000000 +0000
++++ vdr-1.7/config.c	2010-03-14 11:18:45.000000000 +0000
 @@ -353,6 +353,7 @@
    UseSubtitle = 1;
    UseVps = 0;
    VpsMargin = 120;
 +  VpsFallback = 0;
    RecordingDirs = 1;
+   FoldersInTimerMenu = 1;
    VideoDisplayFormat = 1;
-   VideoFormat = 0;
-@@ -541,6 +542,7 @@
+@@ -543,6 +544,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);
-+  else if (!strcasecmp(Name, "VpsFallback"))         VpsFallback        = atoi(Value);
++  else if (!strcasecmp(Name, "VpsFallback"))         VpsFallback      = atoi(Value);
    else if (!strcasecmp(Name, "RecordingDirs"))       RecordingDirs      = atoi(Value);
+   else if (!strcasecmp(Name, "FoldersInTimerMenu"))  FoldersInTimerMenu = atoi(Value);
    else if (!strcasecmp(Name, "VideoDisplayFormat"))  VideoDisplayFormat = atoi(Value);
-   else if (!strcasecmp(Name, "VideoFormat"))         VideoFormat        = atoi(Value);
-@@ -634,6 +636,7 @@
+@@ -638,6 +640,7 @@
    Store("UseSubtitle",        UseSubtitle);
    Store("UseVps",             UseVps);
    Store("VpsMargin",          VpsMargin);
 +  Store("VpsFallback",        VpsFallback);
    Store("RecordingDirs",      RecordingDirs);
+   Store("FoldersInTimerMenu", FoldersInTimerMenu);
    Store("VideoDisplayFormat", VideoDisplayFormat);
-   Store("VideoFormat",        VideoFormat);
-diff -ur vdr-1.7.13/config.h vdr-1.7/config.h
---- vdr-1.7.13/config.h	2010-02-05 15:38:32.000000000 +0000
-+++ vdr-1.7/config.h	2010-03-03 17:55:28.000000000 +0000
+diff -ur vdr-1.7.14/config.h vdr-1.7/config.h
+--- vdr-1.7.14/config.h	2010-03-12 16:02:53.000000000 +0000
++++ vdr-1.7/config.h	2010-03-14 11:18:45.000000000 +0000
 @@ -252,6 +252,7 @@
    int UseSubtitle;
    int UseVps;
    int VpsMargin;
 +  int VpsFallback;
    int RecordingDirs;
+   int FoldersInTimerMenu;
    int VideoDisplayFormat;
-   int VideoFormat;
-diff -ur vdr-1.7.13/eit.c vdr-1.7/eit.c
---- vdr-1.7.13/eit.c	2010-01-08 15:17:09.000000000 +0000
+diff -ur vdr-1.7.14/eit.c vdr-1.7/eit.c
+--- vdr-1.7.14/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;
@@ -222,8 +222,8 @@ diff -ur vdr-1.7.13/eit.c vdr-1.7/eit.c
  
        pEvent->SetComponents(Components);
  
-diff -ur vdr-1.7.13/epg.c vdr-1.7/epg.c
---- vdr-1.7.13/epg.c	2010-02-28 14:24:55.000000000 +0000
+diff -ur vdr-1.7.14/epg.c vdr-1.7/epg.c
+--- vdr-1.7.14/epg.c	2010-02-28 14:24:55.000000000 +0000
 +++ vdr-1.7/epg.c	2010-03-03 17:55:28.000000000 +0000
 @@ -117,6 +117,8 @@
    startTime = 0;
@@ -282,8 +282,8 @@ diff -ur vdr-1.7.13/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.13/epg.h vdr-1.7/epg.h
---- vdr-1.7.13/epg.h	2010-01-08 15:20:34.000000000 +0000
+diff -ur vdr-1.7.14/epg.h vdr-1.7/epg.h
+--- vdr-1.7.14/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
@@ -312,8 +312,8 @@ diff -ur vdr-1.7.13/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.13/libsi/descriptor.c vdr-1.7/libsi/descriptor.c
---- vdr-1.7.13/libsi/descriptor.c	2007-02-03 11:45:58.000000000 +0000
+diff -ur vdr-1.7.14/libsi/descriptor.c vdr-1.7/libsi/descriptor.c
+--- vdr-1.7.14/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.13/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.13/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
---- vdr-1.7.13/libsi/descriptor.h	2007-02-03 11:45:58.000000000 +0000
+diff -ur vdr-1.7.14/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
+--- vdr-1.7.14/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.13/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
  //abstract base class
  class MultilingualNameDescriptor : public Descriptor {
  public:
-diff -ur vdr-1.7.13/libsi/headers.h vdr-1.7/libsi/headers.h
---- vdr-1.7.13/libsi/headers.h	2007-02-03 11:45:58.000000000 +0000
+diff -ur vdr-1.7.14/libsi/headers.h vdr-1.7/libsi/headers.h
+--- vdr-1.7.14/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.13/libsi/headers.h vdr-1.7/libsi/headers.h
  };
  
  /* 0x77 time_slice_fec_identifier_descriptor (ETSI EN 301 192) */
-diff -ur vdr-1.7.13/libsi/si.c vdr-1.7/libsi/si.c
---- vdr-1.7.13/libsi/si.c	2010-02-13 10:31:52.000000000 +0000
+diff -ur vdr-1.7.14/libsi/si.c vdr-1.7/libsi/si.c
+--- vdr-1.7.14/libsi/si.c	2010-02-13 10:31:52.000000000 +0000
 +++ vdr-1.7/libsi/si.c	2010-03-03 17:55:28.000000000 +0000
 @@ -606,6 +606,12 @@
           case ExtensionDescriptorTag:
@@ -444,10 +444,10 @@ diff -ur vdr-1.7.13/libsi/si.c vdr-1.7/libsi/si.c
           case TimeSliceFecIdentifierDescriptorTag:
           case ECMRepetitionRateDescriptorTag:
           case EnhancedAC3DescriptorTag:
-diff -ur vdr-1.7.13/menu.c vdr-1.7/menu.c
---- vdr-1.7.13/menu.c	2010-02-21 14:09:19.000000000 +0000
-+++ vdr-1.7/menu.c	2010-03-03 17:55:28.000000000 +0000
-@@ -3037,6 +3037,7 @@
+diff -ur vdr-1.7.14/menu.c vdr-1.7/menu.c
+--- vdr-1.7.14/menu.c	2010-03-12 16:03:07.000000000 +0000
++++ vdr-1.7/menu.c	2010-03-14 11:18:45.000000000 +0000
+@@ -3049,6 +3049,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.13/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.13/sdt.c vdr-1.7/sdt.c
---- vdr-1.7.13/sdt.c	2009-12-23 16:02:47.000000000 +0000
+diff -ur vdr-1.7.14/sdt.c vdr-1.7/sdt.c
+--- vdr-1.7.14/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,8 +471,8 @@ diff -ur vdr-1.7.13/sdt.c vdr-1.7/sdt.c
              default: ;
              }
            delete d;
-diff -ur vdr-1.7.13/timers.c vdr-1.7/timers.c
---- vdr-1.7.13/timers.c	2010-01-16 11:18:53.000000000 +0000
+diff -ur vdr-1.7.14/timers.c vdr-1.7/timers.c
+--- vdr-1.7.14/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.13/timers.c vdr-1.7/timers.c
          if (Margin || !Directly) {
             startTime = event->StartTime();
             stopTime = event->EndTime();
-diff -ur vdr-1.7.13/vdr.5 vdr-1.7/vdr.5
---- vdr-1.7.13/vdr.5	2010-02-21 14:29:06.000000000 +0000
-+++ vdr-1.7/vdr.5	2010-03-03 17:55:28.000000000 +0000
+diff -ur vdr-1.7.14/vdr.5 vdr-1.7/vdr.5
+--- vdr-1.7.14/vdr.5	2010-03-06 14:04:54.000000000 +0000
++++ vdr-1.7/vdr.5	2010-03-14 11:18:45.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.13/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:
-@@ -767,6 +770,8 @@
+@@ -769,6 +772,8 @@
  \fBR\fR@<parental rating>
  \fBX\fR@<stream> <type> <language> <descr>
  \fBV\fR@<vps time>
@@ -505,7 +505,7 @@ diff -ur vdr-1.7.13/vdr.5 vdr-1.7/vdr.5
  \fBe\fR@
  \fBc\fR@
  .TE
-@@ -801,6 +806,8 @@
+@@ -803,6 +808,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