Update for vdr 1.7.17.

1 files changed, 59 insertions, 60 deletions

diff --git a/vdrtva-1.7.16.diff b/vdrtva-1.7.17.diff
index 68bb7d0..df0fc71 100644
--- a/vdrtva-1.7.16.diff
+++ b/vdrtva-1.7.17.diff
@@ -1,6 +1,6 @@
-diff -ur vdr-1.7.16/channels.c vdr-test/channels.c
---- vdr-1.7.16/channels.c	2010-06-05 14:33:57.000000000 +0100
-+++ vdr-test/channels.c	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/channels.c vdr-1.7/channels.c
+--- vdr-1.7.17/channels.c	2010-11-07 12:24:59.000000000 +0000
++++ vdr-1.7/channels.c	2011-03-13 11:57:00.000000000 +0000
 @@ -61,6 +61,7 @@
    shortName = strdup("");
    provider = strdup("");
@@ -47,7 +47,7 @@ diff -ur vdr-1.7.16/channels.c vdr-test/channels.c
  #define STRDIFF 0x01
  #define VALDIFF 0x02
  
-@@ -504,11 +515,11 @@
+@@ -506,11 +517,11 @@
          q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
          }
       *q = 0;
@@ -61,7 +61,7 @@ diff -ur vdr-1.7.16/channels.c vdr-test/channels.c
       }
    return buffer;
  }
-@@ -543,13 +554,16 @@
+@@ -545,13 +556,16 @@
       char *vpidbuf = NULL;
       char *apidbuf = NULL;
       char *caidbuf = NULL;
@@ -79,7 +79,7 @@ diff -ur vdr-1.7.16/channels.c vdr-test/channels.c
             caids[0] = tpid;
             caids[1] = 0;
             tpid = 0;
-@@ -675,12 +689,17 @@
+@@ -677,12 +691,17 @@
             }
          name = strcpyrealloc(name, namebuf);
  
@@ -97,9 +97,9 @@ diff -ur vdr-1.7.16/channels.c vdr-test/channels.c
          if (!GetChannelID().Valid()) {
             esyslog("ERROR: channel data results in invalid ID!");
             return false;
-diff -ur vdr-1.7.16/channels.h vdr-test/channels.h
---- vdr-1.7.16/channels.h	2010-06-05 14:12:54.000000000 +0100
-+++ vdr-test/channels.h	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/channels.h vdr-1.7/channels.h
+--- vdr-1.7.17/channels.h	2010-06-05 14:12:54.000000000 +0100
++++ vdr-1.7/channels.h	2011-03-13 11:57:00.000000000 +0000
 @@ -96,6 +96,7 @@
    char *shortName;
    char *provider;
@@ -124,9 +124,9 @@ diff -ur vdr-1.7.16/channels.h vdr-test/channels.h
    void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, 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.16/config.c vdr-test/config.c
---- vdr-1.7.16/config.c	2010-06-06 11:06:43.000000000 +0100
-+++ vdr-test/config.c	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/config.c vdr-1.7/config.c
+--- vdr-1.7.17/config.c	2010-06-06 11:06:43.000000000 +0100
++++ vdr-1.7/config.c	2011-03-13 11:57:00.000000000 +0000
 @@ -353,6 +353,7 @@
    UseSubtitle = 1;
    UseVps = 0;
@@ -151,9 +151,9 @@ diff -ur vdr-1.7.16/config.c vdr-test/config.c
    Store("RecordingDirs",      RecordingDirs);
    Store("FoldersInTimerMenu", FoldersInTimerMenu);
    Store("NumberKeysForChars", NumberKeysForChars);
-diff -ur vdr-1.7.16/config.h vdr-test/config.h
---- vdr-1.7.16/config.h	2010-09-12 12:31:21.000000000 +0100
-+++ vdr-test/config.h	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/config.h vdr-1.7/config.h
+--- vdr-1.7.17/config.h	2010-10-24 12:22:35.000000000 +0100
++++ vdr-1.7/config.h	2011-03-13 11:57:00.000000000 +0000
 @@ -252,6 +252,7 @@
    int UseSubtitle;
    int UseVps;
@@ -162,9 +162,9 @@ diff -ur vdr-1.7.16/config.h vdr-test/config.h
    int RecordingDirs;
    int FoldersInTimerMenu;
    int NumberKeysForChars;
-diff -ur vdr-1.7.16/eit.c vdr-test/eit.c
---- vdr-1.7.16/eit.c	2010-05-14 15:08:35.000000000 +0100
-+++ vdr-test/eit.c	2010-09-25 14:49:53.000000000 +0100
+diff -ur vdr-1.7.17/eit.c vdr-1.7/eit.c
+--- vdr-1.7.17/eit.c	2010-05-14 15:08:35.000000000 +0100
++++ vdr-1.7/eit.c	2011-03-13 11:57:00.000000000 +0000
 @@ -265,6 +265,27 @@
                      }
                   }
@@ -193,11 +193,10 @@ diff -ur vdr-1.7.16/eit.c vdr-test/eit.c
              default: ;
              }
            delete d;
- 
-diff -ur vdr-1.7.16/epg.c vdr-test/epg.c
---- vdr-1.7.16/epg.c	2010-02-28 14:24:55.000000000 +0000
-+++ vdr-test/epg.c	2010-09-23 18:01:18.000000000 +0100
-@@ -117,6 +117,8 @@
+diff -ur vdr-1.7.17/epg.c vdr-1.7/epg.c
+--- vdr-1.7.17/epg.c	2011-02-25 15:16:05.000000000 +0000
++++ vdr-1.7/epg.c	2011-03-13 11:57:00.000000000 +0000
+@@ -126,6 +126,8 @@
    startTime = 0;
    duration = 0;
    vps = 0;
@@ -206,7 +205,7 @@ diff -ur vdr-1.7.16/epg.c vdr-test/epg.c
    SetSeen();
  }
  
-@@ -125,6 +127,8 @@
+@@ -134,6 +136,8 @@
    free(title);
    free(shortText);
    free(description);
@@ -215,7 +214,7 @@ diff -ur vdr-1.7.16/epg.c vdr-test/epg.c
    delete components;
  }
  
-@@ -220,6 +224,16 @@
+@@ -229,6 +233,16 @@
    vps = Vps;
  }
  
@@ -232,7 +231,7 @@ diff -ur vdr-1.7.16/epg.c vdr-test/epg.c
  void cEvent::SetSeen(void)
  {
    seen = time(NULL);
-@@ -448,6 +462,10 @@
+@@ -457,6 +471,10 @@
          }
       if (vps)
          fprintf(f, "%sV %ld\n", Prefix, vps);
@@ -243,7 +242,7 @@ diff -ur vdr-1.7.16/epg.c vdr-test/epg.c
       if (!InfoOnly)
          fprintf(f, "%se\n", Prefix);
       }
-@@ -486,6 +504,10 @@
+@@ -495,6 +513,10 @@
                break;
      case 'V': SetVps(atoi(t));
                break;
@@ -254,9 +253,9 @@ diff -ur vdr-1.7.16/epg.c vdr-test/epg.c
      default:  esyslog("ERROR: unexpected tag while reading EPG data: %s", s);
                return false;
      }
-diff -ur vdr-1.7.16/epg.h vdr-test/epg.h
---- vdr-1.7.16/epg.h	2010-01-08 15:20:34.000000000 +0000
-+++ vdr-test/epg.h	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/epg.h vdr-1.7/epg.h
+--- vdr-1.7.17/epg.h	2011-02-25 14:14:38.000000000 +0000
++++ vdr-1.7/epg.h	2011-03-13 11:57:00.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)
@@ -284,9 +283,9 @@ diff -ur vdr-1.7.16/epg.h vdr-test/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.16/libsi/descriptor.c vdr-test/libsi/descriptor.c
---- vdr-1.7.16/libsi/descriptor.c	2007-02-03 11:45:58.000000000 +0000
-+++ vdr-test/libsi/descriptor.c	2010-09-25 15:04:17.000000000 +0100
+diff -ur vdr-1.7.17/libsi/descriptor.c vdr-1.7/libsi/descriptor.c
+--- vdr-1.7.17/libsi/descriptor.c	2010-11-01 15:24:31.000000000 +0000
++++ vdr-1.7/libsi/descriptor.c	2011-03-13 11:57:00.000000000 +0000
 @@ -643,6 +643,33 @@
     textualServiceIdentifier.setData(data+sizeof(descr_service_identifier), getLength()-sizeof(descr_service_identifier));
  }
@@ -321,9 +320,9 @@ diff -ur vdr-1.7.16/libsi/descriptor.c vdr-test/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.16/libsi/descriptor.h vdr-test/libsi/descriptor.h
---- vdr-1.7.16/libsi/descriptor.h	2007-02-03 11:45:58.000000000 +0000
-+++ vdr-test/libsi/descriptor.h	2010-09-23 18:20:14.000000000 +0100
+diff -ur vdr-1.7.17/libsi/descriptor.h vdr-1.7/libsi/descriptor.h
+--- vdr-1.7.17/libsi/descriptor.h	2010-11-01 15:24:32.000000000 +0000
++++ vdr-1.7/libsi/descriptor.h	2011-03-13 11:57:00.000000000 +0000
 @@ -361,6 +361,31 @@
     virtual void Parse();
  };
@@ -356,10 +355,10 @@ diff -ur vdr-1.7.16/libsi/descriptor.h vdr-test/libsi/descriptor.h
  //abstract base class
  class MultilingualNameDescriptor : public Descriptor {
  public:
-diff -ur vdr-1.7.16/libsi/headers.h vdr-test/libsi/headers.h
---- vdr-1.7.16/libsi/headers.h	2007-02-03 11:45:58.000000000 +0000
-+++ vdr-test/libsi/headers.h	2010-09-22 19:42:12.000000000 +0100
-@@ -1680,6 +1681,24 @@
+diff -ur vdr-1.7.17/libsi/headers.h vdr-1.7/libsi/headers.h
+--- vdr-1.7.17/libsi/headers.h	2010-11-01 15:24:32.000000000 +0000
++++ vdr-1.7/libsi/headers.h	2011-03-13 11:57:00.000000000 +0000
+@@ -1680,6 +1680,24 @@
     u_char descriptor_length                      :8;
  };
  
@@ -384,12 +383,12 @@ diff -ur vdr-1.7.16/libsi/headers.h vdr-test/libsi/headers.h
  /* 0x77 time_slice_fec_identifier_descriptor (ETSI EN 301 192) */
  
  struct descr_time_slice_fec_identifier {
-diff -ur vdr-1.7.16/libsi/si.c vdr-test/libsi/si.c
---- vdr-1.7.16/libsi/si.c	2010-02-13 10:31:52.000000000 +0000
-+++ vdr-test/libsi/si.c	2010-09-19 15:09:18.000000000 +0100
-@@ -606,6 +606,12 @@
-          case ExtensionDescriptorTag:
-             d=new ExtensionDescriptor();
+diff -ur vdr-1.7.17/libsi/si.c vdr-1.7/libsi/si.c
+--- vdr-1.7.17/libsi/si.c	2010-11-01 15:24:32.000000000 +0000
++++ vdr-1.7/libsi/si.c	2011-03-13 11:57:00.000000000 +0000
+@@ -609,6 +609,12 @@
+          case RegistrationDescriptorTag:
+             d=new RegistrationDescriptor();
              break;
 +         case ContentIdentifierDescriptorTag:
 +            d=new ContentIdentifierDescriptor();
@@ -400,7 +399,7 @@ diff -ur vdr-1.7.16/libsi/si.c vdr-test/libsi/si.c
  
           //note that it is no problem to implement one
           //of the unimplemented descriptors.
-@@ -648,10 +654,8 @@
+@@ -650,10 +656,8 @@
           case TransportStreamDescriptorTag:
  
           //defined in ETSI EN 300 468 v 1.7.1
@@ -411,10 +410,10 @@ diff -ur vdr-1.7.16/libsi/si.c vdr-test/libsi/si.c
           case TimeSliceFecIdentifierDescriptorTag:
           case ECMRepetitionRateDescriptorTag:
           case EnhancedAC3DescriptorTag:
-diff -ur vdr-1.7.16/menu.c vdr-test/menu.c
---- vdr-1.7.16/menu.c	2010-06-06 10:56:16.000000000 +0100
-+++ vdr-test/menu.c	2010-09-23 18:01:18.000000000 +0100
-@@ -3051,6 +3051,7 @@
+diff -ur vdr-1.7.17/menu.c vdr-1.7/menu.c
+--- vdr-1.7.17/menu.c	2011-02-27 12:37:48.000000000 +0000
++++ vdr-1.7/menu.c	2011-03-13 11:57:00.000000000 +0000
+@@ -3057,6 +3057,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));
@@ -422,9 +421,9 @@ diff -ur vdr-1.7.16/menu.c vdr-test/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.16/sdt.c vdr-test/sdt.c
---- vdr-1.7.16/sdt.c	2010-05-16 15:23:21.000000000 +0100
-+++ vdr-test/sdt.c	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/sdt.c vdr-1.7/sdt.c
+--- vdr-1.7.17/sdt.c	2010-05-16 15:23:21.000000000 +0100
++++ vdr-1.7/sdt.c	2011-03-13 11:57:00.000000000 +0000
 @@ -128,6 +128,12 @@
                       }
                   }
@@ -438,9 +437,9 @@ diff -ur vdr-1.7.16/sdt.c vdr-test/sdt.c
              default: ;
              }
            delete d;
-diff -ur vdr-1.7.16/timers.c vdr-test/timers.c
---- vdr-1.7.16/timers.c	2010-01-16 11:18:53.000000000 +0000
-+++ vdr-test/timers.c	2010-09-23 18:01:18.000000000 +0100
+diff -ur vdr-1.7.17/timers.c vdr-1.7/timers.c
+--- vdr-1.7.17/timers.c	2010-01-16 11:18:53.000000000 +0000
++++ vdr-1.7/timers.c	2011-03-13 11:57:00.000000000 +0000
 @@ -423,7 +423,7 @@
       }
  
@@ -450,9 +449,9 @@ diff -ur vdr-1.7.16/timers.c vdr-test/timers.c
          if (Margin || !Directly) {
             startTime = event->StartTime();
             stopTime = event->EndTime();
-diff -ur vdr-1.7.16/vdr.5 vdr-test/vdr.5
---- vdr-1.7.16/vdr.5	2010-05-16 13:15:48.000000000 +0100
-+++ vdr-test/vdr.5	2010-09-19 15:09:18.000000000 +0100
+diff -ur vdr-1.7.17/vdr.5 vdr-1.7/vdr.5
+--- vdr-1.7.17/vdr.5	2010-12-24 15:19:21.000000000 +0000
++++ vdr-1.7/vdr.5	2011-03-13 11:57:00.000000000 +0000
 @@ -247,6 +247,9 @@
  .B RID
  The Radio ID of this channel (typically 0, may be used to distinguish channels where