[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.27-1_etobi1
etobi
git at e-tobi.net
Sat Mar 31 11:28:02 UTC 2012
The following commit has been merged in the e-tobi branch:
commit bac52d92e0ead664c8ba022bf42db7ab868300ce
Author: etobi <git at e-tobi.net>
Date: Sun Mar 11 20:00:39 2012 +0100
Dropped opt-38_disableDoubleEpgEntrys.patch (doesn't apply anmore)
diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 3089d94..d366ba8 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -4,7 +4,6 @@ debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
debian/patches/16_channels.conf.terr-fix.patch:933f8daa6bb6d26c711d0ae987a2b03e
debian/patches/opt-50_graphtft-liemikuutio.patch:a5a3ead7091ddd35fab0b6925ffefcab
debian/patches/17_epg_channel_name_width.patch:12180ba935fa7834f818fcae9e0ed182
-debian/patches/opt-38_disableDoubleEpgEntrys.patch:c637b1551cb497a5d63d963849198025
debian/patches/opt-45_yaepg.patch:8e9c35a5b9224381cfc8936f0de2fe48
debian/patches/04_newplugin.patch:5877f4f62dab4f3d437d4eef7cae3ac0
debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
diff --git a/debian/changelog b/debian/changelog
index a8721e0..0e0df3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ vdr (1.7.26-1~ctvdr1) unstable; urgency=low
* Dropped opt-39_noepg.patch (not required anymore)
* Dropped opt-21_internal-cam-devices.patch (doesn't apply anmore)
* Updated opt-24_jumpplay.patch
+ * Dropped opt-38_disableDoubleEpgEntrys.patch (doesn't apply anmore)
-- Tobias Grimm <etobi at debian.org> Sun, 19 Feb 2012 17:21:08 +0100
diff --git a/debian/patches/opt-38_disableDoubleEpgEntrys.patch b/debian/patches/opt-38_disableDoubleEpgEntrys.patch
deleted file mode 100644
index 4fb9006..0000000
--- a/debian/patches/opt-38_disableDoubleEpgEntrys.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-Description: This patch suppresses double EPG entries.
-Author: Emanuel Wontorra <hoerzu2vdr at wontorra.net>
-Origin: http://vdrportal.de/board/thread.php?postid=317214#post317214
-
-Index: vdr/config.c
-===================================================================
---- vdr.orig/config.c 2012-01-15 21:21:10.000000000 +0100
-+++ vdr/config.c 2012-01-15 21:21:18.000000000 +0100
-@@ -401,6 +401,10 @@
- SubtitleFgTransparency = 0;
- SubtitleBgTransparency = 0;
- EPGLanguages[0] = -1;
-+ DoubleEpgTimeDelta = 15;
-+ DoubleEpgAction = 0;
-+ MixEpgAction = 0;
-+ DisableVPS = 0;
- EPGScanTimeout = 5;
- EPGBugfixLevel = 3;
- EPGLinger = 0;
-@@ -600,6 +604,10 @@
- else if (!strcasecmp(Name, "SubtitleFgTransparency")) SubtitleFgTransparency = atoi(Value);
- else if (!strcasecmp(Name, "SubtitleBgTransparency")) SubtitleBgTransparency = atoi(Value);
- else if (!strcasecmp(Name, "EPGLanguages")) return ParseLanguages(Value, EPGLanguages);
-+ else if (!strcasecmp(Name, "DoubleEpgTimeDelta")) DoubleEpgTimeDelta = atoi(Value);
-+ else if (!strcasecmp(Name, "DoubleEpgAction")) DoubleEpgAction = atoi(Value);
-+ else if (!strcasecmp(Name, "MixEpgAction")) MixEpgAction = atoi(Value);
-+ else if (!strcasecmp(Name, "DisableVPS")) DisableVPS = atoi(Value);
- else if (!strcasecmp(Name, "EPGScanTimeout")) EPGScanTimeout = atoi(Value);
- else if (!strcasecmp(Name, "EPGBugfixLevel")) EPGBugfixLevel = atoi(Value);
- else if (!strcasecmp(Name, "EPGLinger")) EPGLinger = atoi(Value);
-@@ -702,6 +710,10 @@
- Store("SubtitleFgTransparency", SubtitleFgTransparency);
- Store("SubtitleBgTransparency", SubtitleBgTransparency);
- StoreLanguages("EPGLanguages", EPGLanguages);
-+ Store("DoubleEpgTimeDelta", DoubleEpgTimeDelta);
-+ Store("DoubleEpgAction", DoubleEpgAction);
-+ Store("MixEpgAction", MixEpgAction);
-+ Store("DisableVPS", DisableVPS);
- Store("EPGScanTimeout", EPGScanTimeout);
- Store("EPGBugfixLevel", EPGBugfixLevel);
- Store("EPGLinger", EPGLinger);
-Index: vdr/config.h
-===================================================================
---- vdr.orig/config.h 2012-01-15 21:21:10.000000000 +0100
-+++ vdr/config.h 2012-01-15 21:21:18.000000000 +0100
-@@ -263,6 +263,10 @@
- int SubtitleOffset;
- int SubtitleFgTransparency, SubtitleBgTransparency;
- int EPGLanguages[I18N_MAX_LANGUAGES + 1];
-+ int DoubleEpgTimeDelta;
-+ int DoubleEpgAction;
-+ int MixEpgAction;
-+ int DisableVPS;
- int EPGScanTimeout;
- int EPGBugfixLevel;
- int EPGLinger;
-Index: vdr/eit.c
-===================================================================
---- vdr.orig/eit.c 2012-01-15 21:02:12.000000000 +0100
-+++ vdr/eit.c 2012-01-15 21:21:18.000000000 +0100
-@@ -83,7 +83,83 @@
- uchar TableID = pEvent->TableID();
- if (TableID == 0x00) {
- if (pEvent->Version() == getVersionNumber())
-- continue;
-+ {
-+ if(Setup.MixEpgAction == 0)
-+ continue;
-+
-+ //printf("in");
-+ //printf("%s", pEvent->GetTimeString());
-+ // to use the info of the original epg, update the extern one,
-+ // if it has less info
-+ SI::Descriptor *d;
-+ SI::ExtendedEventDescriptors *ExtendedEventDescriptors = NULL;
-+ //SI::ExtendedEventDescriptor *eed = NULL;
-+ SI::ShortEventDescriptor *ShortEventDescriptor = NULL;
-+ //SI::ShortEventDescriptor *sed = NULL;
-+ //SI::TimeShiftedEventDescriptor *tsed = NULL;
-+ //cLinkChannels *LinkChannels = NULL;
-+ for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2));)
-+ {
-+ if(d->getDescriptorTag() == SI::ShortEventDescriptorTag)
-+ {
-+ int LanguagePreferenceShort = -1;
-+ SI::ShortEventDescriptor *sed = (SI::ShortEventDescriptor *)d;
-+ if (I18nIsPreferredLanguage(Setup.EPGLanguages, sed->languageCode, LanguagePreferenceShort) || !ShortEventDescriptor)
-+ {
-+ delete ShortEventDescriptor;
-+ ShortEventDescriptor = sed;
-+ d = NULL; // so that it is not deleted
-+ }
-+ }
-+ else if(d->getDescriptorTag() == SI::ExtendedEventDescriptorTag)
-+ {
-+ int LanguagePreferenceExt = -1;
-+ bool UseExtendedEventDescriptor = false;
-+ SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
-+ if (I18nIsPreferredLanguage(Setup.EPGLanguages, eed->languageCode, LanguagePreferenceExt) || !ExtendedEventDescriptors)
-+ {
-+ delete ExtendedEventDescriptors;
-+ ExtendedEventDescriptors = new SI::ExtendedEventDescriptors;
-+ UseExtendedEventDescriptor = true;
-+ }
-+ if (UseExtendedEventDescriptor)
-+ {
-+ ExtendedEventDescriptors->Add(eed);
-+ d = NULL; // so that it is not deleted
-+ }
-+ if (eed->getDescriptorNumber() == eed->getLastDescriptorNumber())
-+ UseExtendedEventDescriptor = false;
-+ }
-+ delete d;
-+ }
-+ if(pEvent)
-+ {
-+
-+ if(ShortEventDescriptor)
-+ {
-+ char buffer[256];
-+ if(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)) && pEvent->ShortText() && (strlen(ShortEventDescriptor->text.getText(buffer, sizeof(buffer))) > strlen(pEvent->ShortText())))
-+ {
-+ pEvent->SetShortText(ShortEventDescriptor->text.getText(buffer, sizeof(buffer)));
-+ pEvent->FixEpgBugs();
-+ }
-+ }
-+ if(ExtendedEventDescriptors)
-+ {
-+ char buffer[ExtendedEventDescriptors->getMaximumTextLength(": ") + 1];
-+ //pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
-+
-+ if(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": ") && pEvent->Description() && (strlen(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": ")) > strlen(pEvent->Description())))
-+ {
-+ pEvent->SetDescription(ExtendedEventDescriptors->getText(buffer, sizeof(buffer), ": "));
-+ pEvent->FixEpgBugs();
-+ }
-+ }
-+ }
-+ delete ExtendedEventDescriptors;
-+ delete ShortEventDescriptor;
-+ continue;
-+ }
- HasExternalData = ExternalData = true;
- }
- // If the new event has a higher table ID, let's skip it.
-@@ -108,7 +184,7 @@
- if (newEvent)
- pSchedule->AddEvent(newEvent);
- if (Tid == 0x4E) { // we trust only the present/following info on the actual TS
-- if (SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
-+ if (Setup.DisableVPS == 0 && SiEitEvent.getRunningStatus() >= SI::RunningStatusNotRunning)
- pSchedule->SetRunningStatus(pEvent, SiEitEvent.getRunningStatus(), channel);
- }
- if (OnlyRunningStatus)
-@@ -297,6 +373,80 @@
- if (LinkChannels)
- channel->SetLinkChannels(LinkChannels);
- Modified = true;
-+
-+ //to avoid double epg-entrys from ext and int epg sources :EW
-+ if (pEvent && pEvent->TableID() != 0x00)
-+ {
-+ cEvent *pPreviousEvent = (cEvent *)pSchedule->GetPreviousEvent(pEvent);
-+
-+ if (pPreviousEvent)
-+ {
-+ if(Setup.DoubleEpgAction == 0)
-+ {
-+ pPreviousEvent->SetStartTime(pEvent->StartTime());
-+ pPreviousEvent->SetDuration(pEvent->Duration());
-+
-+ if(Setup.DisableVPS == 0)
-+ {
-+ if(channel)
-+ pPreviousEvent->SetRunningStatus(pEvent->RunningStatus(), channel);
-+ else
-+ pPreviousEvent->SetRunningStatus(pEvent->RunningStatus());
-+ }
-+
-+ // to use the info of the original epg, update the extern one,
-+ // if it has less info
-+ char buffer_short_intern[256];
-+ char buffer_short_extern[256];
-+ int len_short_intern = 0;
-+ int len_short_extern = 0;
-+
-+ if (pEvent->ShortText())
-+ len_short_intern = snprintf (buffer_short_intern, sizeof(buffer_short_intern), "%s", pEvent->ShortText());
-+
-+ if (pPreviousEvent->ShortText())
-+ len_short_extern = snprintf (buffer_short_extern, sizeof(buffer_short_extern), "%s",pPreviousEvent->ShortText());
-+
-+ if(len_short_intern > 0)
-+ {
-+ if(len_short_extern < 1)
-+ pPreviousEvent->SetShortText(buffer_short_intern);
-+ else if (len_short_intern > len_short_extern)
-+ pPreviousEvent->SetShortText(buffer_short_intern);
-+ }
-+
-+ if(pEvent->Description())
-+ {
-+ char buffer_title_intern[4096];
-+ char buffer_title_extern[4096];
-+ int len_title_intern = 0;
-+ int len_title_extern = 0;
-+
-+ if (pEvent->Description())
-+ len_title_intern = snprintf (buffer_title_intern, sizeof(buffer_title_intern), "%s", pEvent->Description());
-+
-+ if (pPreviousEvent->Description())
-+ len_title_extern = snprintf (buffer_title_extern, sizeof(buffer_title_extern), "%s", pPreviousEvent->Description());
-+
-+ if(len_title_intern > 0)
-+ {
-+ if(len_title_extern < 1)
-+ pPreviousEvent->SetDescription(buffer_title_intern);
-+ else if (len_title_intern > len_title_extern)
-+ pPreviousEvent->SetDescription(buffer_title_intern);
-+ }
-+ }
-+
-+ if(pPreviousEvent->Vps() == 0 && pEvent->Vps() != 0)
-+ pPreviousEvent->SetVps(pEvent->Vps());
-+
-+ pSchedule->DelEvent(pEvent);
-+ pPreviousEvent->FixEpgBugs();
-+ }
-+ else
-+ pSchedule->DelEvent(pPreviousEvent);
-+ }
-+ }
- }
- if (Tid == 0x4E) {
- if (Empty && getSectionNumber() == 0)
-Index: vdr/epg.c
-===================================================================
---- vdr.orig/epg.c 2012-01-15 21:07:03.000000000 +0100
-+++ vdr/epg.c 2012-01-15 21:21:18.000000000 +0100
-@@ -946,6 +946,29 @@
- return pe;
- }
-
-+const cEvent *cSchedule::GetPreviousEvent(cEvent *Event) const
-+{
-+
-+ if(!Event || Event->Duration() == 0 || Event->StartTime() == 0)
-+ return NULL;
-+ // Returns either the event info to the previous/following event to the given EventID or, if that one can't be found NULL :EW
-+ cEvent *pt = NULL;
-+ int epgTimeDelta = Setup.DoubleEpgTimeDelta * 60 + 1;
-+ for (pt = events.First(); pt; pt = events.Next(pt))
-+ if(pt && pt->TableID() == 0x00)
-+ if ((Event->StartTime() - pt->StartTime()) > - epgTimeDelta && (Event->StartTime() - pt->StartTime()) < epgTimeDelta)
-+ {
-+ if((pt->Duration() + (pt->Duration()/ 5) + 1) > Event->Duration() && (pt->Duration() - (pt->Duration()/ 5) - 1) < Event->Duration())
-+ return pt;
-+ else if (pt->Title() && Event->Title() && (strcmp(pt->Title(), ".") != 0 && strcmp(Event->Title(), ".") != 0))
-+ {
-+ if (strstr(pt->Title(), Event->Title()) != NULL || strstr(Event->Title(), pt->Title()) != NULL)
-+ return pt;
-+ }
-+ }
-+ return NULL;
-+}
-+
- void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus, cChannel *Channel)
- {
- hasRunning = false;
-Index: vdr/epg.h
-===================================================================
---- vdr.orig/epg.h 2012-01-15 21:02:12.000000000 +0100
-+++ vdr/epg.h 2012-01-15 21:21:18.000000000 +0100
-@@ -163,6 +163,7 @@
- void DropOutdated(time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version);
- void Cleanup(time_t Time);
- void Cleanup(void);
-+ const cEvent *GetPreviousEvent(cEvent *Event) const; //:EW
- cEvent *AddEvent(cEvent *Event);
- void DelEvent(cEvent *Event);
- void HashEvent(cEvent *Event);
-Index: vdr/menu.c
-===================================================================
---- vdr.orig/menu.c 2012-01-15 21:21:14.000000000 +0100
-+++ vdr/menu.c 2012-01-15 21:21:18.000000000 +0100
-@@ -2866,6 +2866,10 @@
- for (int i = 0; i < numLanguages; i++)
- // TRANSLATORS: note the singular!
- Add(new cMenuEditStraItem(tr("Setup.EPG$Preferred language"), &data.EPGLanguages[i], I18nLanguages()->Size(), &I18nLanguages()->At(0)));
-+ Add(new cMenuEditIntItem(tr("Setup.EPG$Period for double EPG search(min)"), &data.DoubleEpgTimeDelta));
-+ Add(new cMenuEditBoolItem(tr("Setup.EPG$extern double Epg entry"), &data.DoubleEpgAction, "adjust", "delete"));
-+ Add(new cMenuEditBoolItem(tr("Setup.EPG$Mix intern and extern EPG"), &data.MixEpgAction));
-+ Add(new cMenuEditBoolItem(tr("Setup.EPG$Disable running VPS event"), &data.DisableVPS));
-
- SetCurrent(Get(current));
- Display();
-Index: vdr/po/de_DE.po
-===================================================================
---- vdr.orig/po/de_DE.po 2012-01-15 21:21:10.000000000 +0100
-+++ vdr/po/de_DE.po 2012-01-15 21:21:18.000000000 +0100
-@@ -852,6 +852,18 @@
- msgid "Button$Scan"
- msgstr "Scan"
-
-+msgid "Setup.EPG$Period for double EPG search(min)"
-+msgstr "Zeitspanne für dop. EPG-Suche(min)"
-+
-+msgid "Setup.EPG$extern double Epg entry"
-+msgstr "Doppelten externen EPG-Eintrag"
-+
-+msgid "Setup.EPG$Mix intern and extern EPG"
-+msgstr "Internen und externen EPG mischen"
-+
-+msgid "Setup.EPG$Disable running VPS event"
-+msgstr "Erk. des lauf. VPS-Events abschalten"
-+
- msgid "Setup.EPG$EPG scan timeout (h)"
- msgstr "Zeit bis zur EPG-Aktualisierung (h)"
-
-Index: vdr/po/fr_FR.po
-===================================================================
---- vdr.orig/po/fr_FR.po 2012-01-15 21:21:10.000000000 +0100
-+++ vdr/po/fr_FR.po 2012-01-15 21:21:18.000000000 +0100
-@@ -858,6 +858,18 @@
- msgid "Button$Scan"
- msgstr "Scan"
-
-+msgid "Setup.EPG$Period for double EPG search(min)"
-+msgstr "Intervalle de recherche du double EPG(min)"
-+
-+msgid "Setup.EPG$extern double Epg entry"
-+msgstr "Entrée EPG externe en double"
-+
-+msgid "Setup.EPG$Mix intern and extern EPG"
-+msgstr "Mixer EPG interne et externe"
-+
-+msgid "Setup.EPG$Disable running VPS event"
-+msgstr "Désactiver événement VPS"
-+
- msgid "Setup.EPG$EPG scan timeout (h)"
- msgstr "Inactivité avant rech. EPG (h)"
-
diff --git a/debian/patches/series b/debian/patches/series
index 58878c4..b8ea90e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,9 +32,6 @@ opt-27_ttxtsubs.patch
# Patch needed for the menuorg plugin.
opt-37-x_menuorg.patch
-# Patch that suppresses double EPG entries.
-opt-38_disableDoubleEpgEntrys.patch
-
# Patch to show an info, if it is possible to record an event in the timer-info.
opt-41-x_timer-info.patch
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list