From patchwork Sat Oct  7 12:42:12 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: 12391
Received: from raven.cadsoft.de ([217.7.101.211])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1GWBVQ-00051y-1q
	for vdr@linuxtv.org; Sat, 07 Oct 2006 14:42:16 +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 k97CgEM6016057
	for <vdr@linuxtv.org>; Sat, 7 Oct 2006 14:42:14 +0200
Message-ID: <4527A0A4.1040403@cadsoft.de>
Date: Sat, 07 Oct 2006 14:42:12 +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] ShortText == Description
References: <Pine.GSO.4.63.0610031653310.17252@galaxy.agh.edu.pl>
	<Pine.GSO.4.63.0610032154550.12736@galaxy.agh.edu.pl>
	<Pine.GSO.4.63.0610041531590.7886@galaxy.agh.edu.pl>
	<4523D066.8030808@cadsoft.de>
	<Pine.GSO.4.63.0610041721410.6457@galaxy.agh.edu.pl>
	<4523D79A.8020405@cadsoft.de>
	<Pine.GSO.4.63.0610041749240.1679@galaxy.agh.edu.pl>
	<4523DDDE.3070100@cadsoft.de>
	<Pine.GSO.4.63.0610041859470.29111@galaxy.agh.edu.pl>
	<4523F111.6090507@cadsoft.de>
In-Reply-To: <4523F111.6090507@cadsoft.de>
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Sat, 07 Oct 2006 14:42:15 +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: Sat, 07 Oct 2006 12:42:16 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 10832

Klaus Schmidinger wrote:
> Boguslaw Juza wrote:
>>
>> I have investigated it more carefully:
>>
>> Broadcaster sends only shortText.
>>
>> VDR reads the Epg event. At EpgBugFix #6 VDR moves shortText to 
>> description if description is empty
>>
>> EPG in this state are saved in epg.data.
>>
>> After restart VDR reads epg.data. Then scans this event again. Event 
>> already have description, so it doesn't make BugFix #6 and now we have
>> shortText and description the same.
>>
>> Not exacly the same. Becouse "old" descrypion is after BugFix 
>> corrections.
>> So there is no BugFix #7 corection. But at the funcion end we have the 
>> same texts.
> 
> Ah, that's an interesting finding.
> 
> So I guess it will make sense to make sure an event that is
> newly received from the data stream has *all* its data
> refreshed from the stream. If there is no short text, for instance,
> an already existing short text needs to be deleted etc.
> 
> Thanks for this report, I'll see how it can be fixed.

Can you please try the attached patch?
It should fix this problem.

Klaus

--- eit.c	2006/08/05 10:01:21	1.120
+++ eit.c	2006/10/07 12:32:24
@@ -234,10 +234,16 @@
             pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
             pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
             }
+         else {
+            pEvent->SetTitle(NULL);
+            pEvent->SetShortText(NULL);
+            }
          if (ExtendedEventDescriptors) {
             char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
             pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
             }
+         else
+            pEvent->SetDescription(NULL);
          }
       delete ExtendedEventDescriptors;
       delete ShortEventDescriptor;