vdr-1.4.3-1.diff epg problems

Message ID 452A7679.3040600@cadsoft.de
State New
Headers

Commit Message

Klaus Schmidinger Oct. 9, 2006, 4:19 p.m. UTC
  V Live wrote:
> I patched your vdr-1.4.3-1.diff against my vdr-1.4.3 version and since 
> the epg guide and vdr-yaepg plugin show "no title" in th epg. Seems that 
> there is an error there.
> However if I remove the patches to eit.c and eit.h but keep the rest of 
> the patch the epg guide works like it should.

Well, meanwhile I guess I found it.
The problem only occurs if there is external EPG data (with
table id 0x00). The attached patch should fix that.

Klaus
  

Patch

--- eit.c	2006/10/07 12:32:24	1.121
+++ eit.c	2006/10/09 16:14:36
@@ -234,7 +234,7 @@ 
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
-         else {
+         else if (!HasExternalData) {
             pEvent->SetTitle(NULL);
             pEvent->SetShortText(NULL);
             }
@@ -242,7 +242,7 @@ 
             char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
-         else
+         else if (!HasExternalData)
             pEvent->SetDescription(NULL);
          }
       delete ExtendedEventDescriptors;
@@ -250,7 +250,8 @@ 
 
       pEvent->SetComponents(Components);
 
-      pEvent->FixEpgBugs();
+      if (!HasExternalData)
+         pEvent->FixEpgBugs();
       if (LinkChannels)
          channel->SetLinkChannels(LinkChannels);
       Modified = true;