frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed clearing an event's Title, ShortText and Description in case the data comes from an external source

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-10-09 16:22:07 +02:00
parent a9d6bb256d
commit c65fc15934
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY
View File

@ -4950,3 +4950,8 @@ Video Disk Recorder Revision History
- Fixed handling language codes and descriptions of recorded audio tracks on channels - Fixed handling language codes and descriptions of recorded audio tracks on channels
with multiple tracks where not all of them appear in the event data (reported by with multiple tracks where not all of them appear in the event data (reported by
Boguslaw Juza). Boguslaw Juza).
2006-10-09: Version 1.4.3-2
- Fixed clearing an event's Title, ShortText and Description in case the data comes
from an external source.

4
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 1.272 2006/09/24 10:09:25 kls Exp $ * $Id: config.h 1.273 2006/10/09 16:12:33 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -21,7 +21,7 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.4.3-1" #define VDRVERSION "1.4.3-2"
#define VDRVERSNUM 10403 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10403 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

9
eit.c
View File

@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * 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>. * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
* *
* $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $ * $Id: eit.c 1.122 2006/10/09 16:14:36 kls Exp $
*/ */
#include "eit.h" #include "eit.h"
@ -234,7 +234,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer))); pEvent->SetTitle(ShortEventDescriptor->name.getText(buffer, sizeof(buffer)));
pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer))); pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
} }
else { else if (!HasExternalData) {
pEvent->SetTitle(NULL); pEvent->SetTitle(NULL);
pEvent->SetShortText(NULL); pEvent->SetShortText(NULL);
} }
@ -242,7 +242,7 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1]; char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": ")); pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
} }
else else if (!HasExternalData)
pEvent->SetDescription(NULL); pEvent->SetDescription(NULL);
} }
delete ExtendedEventDescriptors; delete ExtendedEventDescriptors;
@ -250,7 +250,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
pEvent->SetComponents(Components); pEvent->SetComponents(Components);
pEvent->FixEpgBugs(); if (!HasExternalData)
pEvent->FixEpgBugs();
if (LinkChannels) if (LinkChannels)
channel->SetLinkChannels(LinkChannels); channel->SetLinkChannels(LinkChannels);
Modified = true; Modified = true;