From patchwork Mon Oct  9 16:19:05 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
X-Patchwork-Id: 12396
Received: from raven.cadsoft.de ([217.7.101.211])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1GWxqT-0005qS-Un
	for vdr@linuxtv.org; Mon, 09 Oct 2006 18:19:14 +0200
Received: from [192.168.100.10] (hawk.cadsoft.de [192.168.100.10])
	by raven.cadsoft.de (8.13.3/8.13.3) with ESMTP id k99GJ9P1007917
	for <vdr@linuxtv.org>; Mon, 9 Oct 2006 18:19:09 +0200
Message-ID: <452A7679.3040600@cadsoft.de>
Date: Mon, 09 Oct 2006 18:19:05 +0200
From: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
Organization: CadSoft Computer GmbH
User-Agent: Thunderbird 1.5.0.4 (X11/20060516)
MIME-Version: 1.0
To: vdr@linuxtv.org
Subject: Re: [vdr] vdr-1.4.3-1.diff epg problems
References: <20061008211016.2736.qmail@web58411.mail.re3.yahoo.com>
In-Reply-To: <20061008211016.2736.qmail@web58411.mail.re3.yahoo.com>
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Mon, 09 Oct 2006 18:19:10 +0200 (CEST)
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2006 16:19:14 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 10868

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

--- 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;