Fixed handling EPG data where the 'extended event descriptor' comes before the 'short event' or a 'time shifted event'

CONTRIBUTORS

@@ -639,3 +639,7 @@ Carsten Siebholz <c.siebholz@t-online.de>
 Wolfgang Goeller <wgoeller@heraklit.ch>
  for reporting a bug in keeping live video active in case the primary device doesn't
  have an MPEG decoder
+
+Jonan Santiago <jonan-lists-vdr@callisia.com>
+ for fixing handling EPG data where the "extended event descriptor" comes before the
+ "short event" or a "time shifted event"

HISTORY

@@ -2129,3 +2129,5 @@ Video Disk Recorder Revision History
   dvbplayer.c. Also, the long timeout in WaitForPut caused problems with cReceivers
   that use a ring buffer and didn't immediately return from their Receive() function
   if the buffer runs full (thanks to Sascha Volkenandt for reporting this one).
+- Fixed handling EPG data where the "extended event descriptor" comes before the
+  "short event" or a "time shifted event" (thanks to Jonan Santiago).

libdtv/libvdr/libvdr.c

@@ -47,6 +47,7 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
    struct LIST                *Result, *EventList;
    struct Event               *Event;
    struct Descriptor          *Descriptor;
+   int GotVdrProgramInfo;
    
    if (!siBuffer) return (NULL);
 
@@ -57,22 +58,24 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
    xForeach (EventList, Event)
    {
       VdrProgramInfo = NULL;
+      GotVdrProgramInfo = 0;
       
       xForeach (Event->Descriptors, Descriptor)
       {
-         switch (Descriptor->Tag)
-         {
-            case DESCR_SHORT_EVENT:
-            {
-               if (!xName(Descriptor) || !xName(Descriptor)[0])
-                  break;
-
          if (!VdrProgramInfo)
          {
             CreateVdrProgramInfo(VdrProgramInfo,
                Event->EventID, Event->TransportStreamID,
                Event->ServiceID, Event->StartTime,
                Event->Duration, Event->Status);
+         }
+         
+         switch (Descriptor->Tag)
+         {
+            case DESCR_SHORT_EVENT:
+            {
+               if (!xName(Descriptor) || !xName(Descriptor)[0])
+                  break;
 
                VdrProgramInfo->ShortName =
                   xSetText (xName (Descriptor));
@@ -82,7 +85,7 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                memcpy (VdrProgramInfo->LanguageCode, ((struct
                   ShortEventDescriptor *)Descriptor)->
                   LanguageCode, 4);
-               }
+               GotVdrProgramInfo = 1;
             }      
             break;
 
@@ -90,20 +93,13 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
             {
                struct tm *StartTime;
 
-               if (!VdrProgramInfo)
-               {
-                  CreateVdrProgramInfo(VdrProgramInfo,
-                     Event->EventID, Event->TransportStreamID,
-                     Event->ServiceID, Event->StartTime,
-                     Event->Duration, Event->Status);
-
                VdrProgramInfo->ReferenceServiceID =
                   ((struct TimeShiftedEventDescriptor
                      *)Descriptor)->ReferenceServiceID;
                VdrProgramInfo->ReferenceEventID =
                   ((struct TimeShiftedEventDescriptor
                      *)Descriptor)->ReferenceEventID;
-               }
+               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -111,8 +107,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
             {
                struct ExtendedEventItem *Item;
 
-               if (VdrProgramInfo)
-               {
                if (xName (Descriptor))
                   AddToText (xName (Descriptor),
                      VdrProgramInfo->ExtendedName);
@@ -124,7 +118,7 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                   AddItemToText (Item->Text,
                      VdrProgramInfo->ExtendedText);
                }
-               }
+               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -132,8 +126,6 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
             {
                int i, j;
 
-               if (VdrProgramInfo)
-               {
                for (j = 0; j < ((struct ContentDescriptor*)
                   Descriptor)->Amount; j++)
                {
@@ -142,7 +134,7 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
                   VdrProgramInfo->ContentNibble2 =
                      GetContentContentNibble2(Descriptor, j);
                }
-               }
+               GotVdrProgramInfo = 1;
             }
             break;
 
@@ -150,19 +142,17 @@ struct LIST *createVdrProgramInfos (unsigned char *siBuffer)
             {
                struct ParentalRating *Rating;
                
-               if (VdrProgramInfo)
-               {
                xForeach (((struct ParentalRatingDescriptor *)
                            Descriptor)->Ratings, Rating)
                   if (!strncmp (VdrProgramInfo->LanguageCode,
                           Rating->LanguageCode, 3))
                      VdrProgramInfo->Rating = Rating->Rating;
-               }
+               GotVdrProgramInfo = 1;
             }
             break;
          }
       }      
-      if (VdrProgramInfo) xAddTail (Result, VdrProgramInfo);
+      if (GotVdrProgramInfo) xAddTail (Result, VdrProgramInfo);
    }
 
    return (Result);