summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitar Petrovski <dimeptr@gmail.com>2012-10-30 23:35:45 (GMT)
committerDimitar Petrovski <dimeptr@gmail.com>2012-10-30 23:35:45 (GMT)
commit250c584c8b52ca6fadc75acc1f8f9e6c2830c014 (patch)
treee8688698a3ab3f30e3f22a86e2c67ec162584273
parentfabd731b78f9c221cb6f6090308005835d09d67d (diff)
downloadvdr-plugin-eepg-250c584c8b52ca6fadc75acc1f8f9e6c2830c014.tar.gz
vdr-plugin-eepg-250c584c8b52ca6fadc75acc1f8f9e6c2830c014.tar.bz2
prevend FixEpgBugs for NA channels to keep formating
-rw-r--r--eit2.c6
-rw-r--r--epghandler.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/eit2.c b/eit2.c
index 87064c5..3980dba 100644
--- a/eit2.c
+++ b/eit2.c
@@ -427,8 +427,10 @@ void cEIT2::ProcessEventDescriptors(bool ExternalData, int Source,
// LogD(2, prep("ID: %d Title: %s Time: %d Tid: 0x%x"), pEvent->EventID(), pEvent->Title(), pEvent->StartTime(), pEvent->TableID());
// }
- // if (!HasExternalData)
- pEvent->FixEpgBugs ();
+ //FixEpgBugs removes newlines from description which is not wanted especially for DISH/BEV
+ if (Format != DISH_BEV)
+ pEvent->FixEpgBugs();
+
if (LinkChannels)
channel->SetLinkChannels (LinkChannels);
}
diff --git a/epghandler.c b/epghandler.c
index a1b92c3..49c89e4 100644
--- a/epghandler.c
+++ b/epghandler.c
@@ -10,9 +10,12 @@
#include "log.h"
#include "equivhandler.h"
#include "eit2.h"
+#include "util.h"
#include <vdr/sources.h>
#include <libsi/si.h>
+using namespace util;
+
cEEpgHandler::cEEpgHandler() {
LogD(4, prep("cEEpgHandler()"));
equivHandler = new cEquivHandler();
@@ -30,6 +33,9 @@ bool cEEpgHandler::HandleEitEvent(cSchedule* Schedule,
//DISH NID 0x1001 to 0x100B BEV 0x100 and 0x101
int nid = Schedule->ChannelID().Nid();
if ((nid >= 0x1001 && nid <= 0x100B) || nid == 0x101 || nid == 0x100) {
+ //Set the Format for Eit events so that the new lines are not erased with FixEpgBugs
+ if (Format != DISH_BEV) Format = DISH_BEV;
+
SI::cEIT2 eit2(Schedule);
eit2.ProcessEitEvent(Schedule, EitEvent, TableID, Version);
return true;