mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Now clearing an event's Title, ShortText and Description if there is no ShortEventDescriptor or ExtendedEventDescriptor, respectively
This commit is contained in:
parent
94e43892a5
commit
f951fb2f9c
@ -2008,3 +2008,6 @@ Martin Ostermann <martin@familie-ostermann.de>
|
|||||||
|
|
||||||
Boguslaw Juza <bogdan@uci.agh.edu.pl>
|
Boguslaw Juza <bogdan@uci.agh.edu.pl>
|
||||||
for reporting that there are stations that use blanks in the language codes
|
for reporting that there are stations that use blanks in the language codes
|
||||||
|
for reporting that events without an ExtendedEventDescriptor may get duplicate
|
||||||
|
information in their ShortText through the EPG bugfixes in case they are received
|
||||||
|
again
|
||||||
|
5
HISTORY
5
HISTORY
@ -4938,3 +4938,8 @@ Video Disk Recorder Revision History
|
|||||||
- Changed the I18nNormalizeLanguageCode() check to also allow blanks (and all other
|
- Changed the I18nNormalizeLanguageCode() check to also allow blanks (and all other
|
||||||
printable characters) in the language codes (thanks to Boguslaw Juza for reporting
|
printable characters) in the language codes (thanks to Boguslaw Juza for reporting
|
||||||
that there are stations that use blanks in these codes).
|
that there are stations that use blanks in these codes).
|
||||||
|
- Now clearing an event's Title, ShortText and Description if there is no
|
||||||
|
ShortEventDescriptor or ExtendedEventDescriptor, respectively (thanks to Boguslaw
|
||||||
|
Juza for reporting that events without an ExtendedEventDescriptor may get
|
||||||
|
duplicate information in their ShortText through the EPG bugfixes in case they
|
||||||
|
are received again).
|
||||||
|
8
eit.c
8
eit.c
@ -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.120 2006/08/05 10:01:21 kls Exp $
|
* $Id: eit.c 1.121 2006/10/07 12:32:24 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "eit.h"
|
#include "eit.h"
|
||||||
@ -234,10 +234,16 @@ 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 {
|
||||||
|
pEvent->SetTitle(NULL);
|
||||||
|
pEvent->SetShortText(NULL);
|
||||||
|
}
|
||||||
if (ExtendedEventDescriptors) {
|
if (ExtendedEventDescriptors) {
|
||||||
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
|
||||||
|
pEvent->SetDescription(NULL);
|
||||||
}
|
}
|
||||||
delete ExtendedEventDescriptors;
|
delete ExtendedEventDescriptors;
|
||||||
delete ShortEventDescriptor;
|
delete ShortEventDescriptor;
|
||||||
|
Loading…
Reference in New Issue
Block a user