Version 1.3.4vdr-1.3.4

- Fixed handling language codes in case there is no audio or Dolby PID.
- Fixed handling CA ids (was broken in 1.3.3).
- Fixed the SVDRP command 'STAT DISK' to avoid a 'division by 0' in case the
  disk is full (thanks to Jens Rosenboom).
- Fixed handling bitmap indexes for 256 color mode (thanks to Andreas Regel).
- Now handling "linked services" (based on the 'autopid' patch from Andreas
  Schultz). Linked channels are detected and added to 'channels.conf', but
  currently they are not yet presented to the user other than being in the
  normal channel list (this will come later).
- Preliminary fix for the "Unknown picture type error" (thanks to Sascha
  Volkenandt for his support in debugging this one). This may slow down switching
  between channels on different transponders for now, but a better solution will
  come later.
- Fixed the validity check for channel IDs, because some providers use TIDs with
  value 0 (thanks to Thomas Bergwinkl).
- Enabled switching to a channel even if it has no Vpid or Apid set, because these
  might be automatically set when tuned to that transponder.
- No longer closing the Channels menu after trying to switch to a channel that
  is currently not available.
- Removed the now obsolete CaCaps stuff. The Setup/CICAM menu now displays the
  actual CAM type as reported by the CAM. The 'ca.conf' file has been stripped
  down to the values 0..4.

1 files changed, 35 insertions, 1 deletions

diff --git a/eit.c b/eit.c
index d71cad8..c24a3d0 100644
--- a/eit.c
+++ b/eit.c
@@ -8,7 +8,7 @@
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
  *
- * $Id: eit.c 1.85 2004/01/09 15:44:43 kls Exp $
+ * $Id: eit.c 1.86 2004/02/08 10:26:54 kls Exp $
  */
 
 #include "eit.h"
@@ -95,6 +95,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
       SI::Descriptor *d;
       SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
       SI::ShortEventDescriptor *ShortEventDescriptor = NULL;
+      cLinkChannels *LinkChannels = NULL;
       for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
           switch (d->getDescriptorTag()) {
             case SI::ExtendedEventDescriptorTag: {
@@ -138,6 +139,36 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
                  pEvent->SetDescription(rEvent->Description());
                  }
                  break;
+            case SI::LinkageDescriptorTag: {
+                 SI::LinkageDescriptor *ld = (SI::LinkageDescriptor *)d;
+                 tChannelID linkID(Source, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                 if (ld->getLinkageType() == 0xB0) { // Premiere World
+                    time_t now = time(NULL);
+                    bool hit = SiEitEvent.getStartTime() <= now && now < SiEitEvent.getStartTime() + SiEitEvent.getDuration();
+                    if (hit) {
+                       cChannel *link = Channels.GetByChannelID(linkID);
+                       if (link != channel) { // only link to other channels, not the same one
+                          char linkName[ld->privateData.getLength() + 1];
+                          strn0cpy(linkName, (const char *)ld->privateData.getData(), sizeof(linkName));
+                          //fprintf(stderr, "Linkage %s %4d %4d %5d %5d %5d %5d  %02X  '%s'\n", hit ? "*" : "", channel->Number(), link ? link->Number() : -1, SiEitEvent.getEventId(), ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId(), ld->getLinkageType(), linkName);//XXX
+                          if (link) {
+                             if (Setup.UpdateChannels >= 1)
+                                link->SetName(linkName);
+                             }
+                          else if (Setup.UpdateChannels >= 3) {
+                             link = Channels.NewChannel(channel, linkName, ld->getOriginalNetworkId(), ld->getTransportStreamId(), ld->getServiceId());
+                             //XXX patFilter->Trigger();
+                             }
+                          if (link) {
+                             if (!LinkChannels)
+                                LinkChannels = new cLinkChannels;
+                             LinkChannels->Add(new cLinkChannel(link));
+                             }
+                          }
+                       }
+                    }
+                 }
+                 break;
             default: ;
             }
           delete d;
@@ -167,6 +198,9 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
          else if (SiEitEvent.getRunningStatus() == SI::RunningStatusStartsInAFewSeconds)
             pSchedule->SetFollowingEvent(pEvent);
          }
+
+      if (LinkChannels)
+         channel->SetLinkChannels(LinkChannels);
       }
 }