summaryrefslogtreecommitdiff
path: root/eepg.c
diff options
context:
space:
mode:
authorDimitar Petrovski <dimeptr@gmail.com>2012-06-01 13:36:47 (GMT)
committerDimitar Petrovski <dimeptr@gmail.com>2012-06-01 13:36:47 (GMT)
commit1992a450ccd4780a36f8d4e1a2433aa84de1baab (patch)
tree6d875f81cfe2561346bd6181bd8a64ef172e6fe0 /eepg.c
parentf16623ebfdab035c9baea1f20041fc63a0f98ef3 (diff)
downloadvdr-plugin-eepg-1992a450ccd4780a36f8d4e1a2433aa84de1baab.tar.gz
vdr-plugin-eepg-1992a450ccd4780a36f8d4e1a2433aa84de1baab.tar.bz2
fix BEV description
Diffstat (limited to 'eepg.c')
-rw-r--r--eepg.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/eepg.c b/eepg.c
index 255a7fb..ae358e9 100644
--- a/eepg.c
+++ b/eepg.c
@@ -3444,12 +3444,17 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
if (DishEventDescriptor) {
if (DishEventDescriptor->getName())
pEvent->SetTitle(DishEventDescriptor->getName());
- //LogD(2, prep("channelID: %s DishTitle: %s"), *channel->GetChannelID().ToString(), DishShortEventDescriptor->getText());
- // pEvent->SetDescription(DishExtendedEventDescriptor->getText());
+ //LogD(2, prep("channelID: %s DishTitle: %s"), *channel->GetChannelID().ToString(), DishEventDescriptor->getName());
pEvent->SetShortText(DishEventDescriptor->getShortText());
char *tmp;
string fmt;
+ const char * description = DishEventDescriptor->getDescription();
+ //BEV sets the description previously with ExtendedEventDescriptor
+ if (0 == strcmp(DishEventDescriptor->getDescription(),"") && pEvent->Description())
+ description = pEvent->Description();
+
+
fmt = "%s";
if (DishEventDescriptor->hasTheme()) {
fmt += "\nTheme: ";
@@ -3460,8 +3465,7 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
}
fmt += "%s";
- if (0 != strcmp(DishEventDescriptor->getDescription(),"")
- && (0 != strcmp(DishEventDescriptor->getRating(),"")
+ if ((0 != strcmp(DishEventDescriptor->getRating(),"")
|| 0 != strcmp(DishEventDescriptor->getStarRating(),""))) {
fmt += "\n\nRating: ";
}
@@ -3477,7 +3481,7 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
dateok = strftime (datestr,80," Original Air Date: %a %b %d %Y",gmtime(&orgAirDate)) > 0;
}
- Asprintf (&tmp, fmt.c_str(), DishEventDescriptor->getDescription()
+ Asprintf (&tmp, fmt.c_str(), description
, DishEventDescriptor->getTheme(), DishEventDescriptor->getCategory()
, DishEventDescriptor->getRating(), DishEventDescriptor->getStarRating()
, DishEventDescriptor->getProgramId(), DishEventDescriptor->getSeriesId()
@@ -3486,8 +3490,8 @@ cEIT2::cEIT2 (cSchedules * Schedules, int Source, u_char Tid, const u_char * Dat
free(tmp);
- //LogD(2, prep("DishDescription: %s"), DishExtendedEventDescriptor->getText());
- //LogD(2, prep("DishShortText: %s"), DishExtendedEventDescriptor->getShortText());
+ //LogD(2, prep("DishDescription: %s"), DishEventDescriptor->getDescription());
+ //LogD(2, prep("DishShortText: %s"), DishEventDescriptor->getShortText());
}
}