[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-41-g2fcf227
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-41-g2fcf227
|
From: Thilo G. <tux...@ne...> - 2013-02-16 20:56:55
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 2fcf2277e39144a5bf1683f736b085ed7347af37 (commit)
via 373af6f35a9f09f753e5ac8349735528b13a1c5e (commit)
via 46a03c73e782815f050825e9d5df104795ea1e4d (commit)
via a6a89a9a9ff4f55df61a7d8ba703f0a6ce3d2b78 (commit)
from 528bc8294ab60342a76363c364cbd47d5d7baeaa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2fcf2277e39144a5bf1683f736b085ed7347af37
Author: micha-bbg <tux...@gm...>
Date: Sat Feb 16 14:58:40 2013 +0100
sectionsd.cpp: Remove invalid events (duration <= 1 sec.) from event list
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index ae3e311..327bf83 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -7252,7 +7252,8 @@ static void *fseitThread(void *)
if (!(e->times.empty()))
{
if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) &&
- ( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) )
+ ( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) &&
+ ( e->times.begin()->dauer > 1 ) )
{
//fprintf(stderr, "%02x ", header.table_id);
addEvent(*e, zeit);
@@ -7594,7 +7595,8 @@ static void *eitThread(void *)
if (!(e->times.empty()))
{
if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) &&
- ( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) )
+ ( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) &&
+ ( e->times.begin()->dauer > 1 ) )
{
//fprintf(stderr, "%02x ", header.table_id);
addEvent(*e, zeit);
commit 373af6f35a9f09f753e5ac8349735528b13a1c5e
Author: Stefan Seyfried <se...@tu...>
Date: Fri Feb 15 19:23:26 2013 +0100
sectionsd: add workaround for holes in SRF EPG
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index bb1c1fc..ae3e311 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -937,6 +937,13 @@ static void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
unlockEvents();
return;
}
+ /* SRF special case: advertising is inserted with start time of
+ * an existing event. Duration may differ. To avoid holes in EPG caused
+ * by the (not useful) advertising event, don't delete the (useful)
+ * original event */
+ if ((*x)->table_id == e->table_id && (e->table_id & 0xFE) == 0x4e &&
+ (*x)->times.begin()->startzeit == start_time)
+ continue;
/* here we have an overlapping event */
dprintf("%s: delete 0x%016llx.%02x time = 0x%016llx.%02x\n", __func__,
x_key, (*x)->table_id, e_key, e->table_id);
commit 46a03c73e782815f050825e9d5df104795ea1e4d
Author: Stefan Seyfried <se...@tu...>
Date: Fri Feb 15 19:18:15 2013 +0100
sectionsd: consider the table_id when inserting events
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
index 3ef2def..bb1c1fc 100644
--- a/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
+++ b/tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp
@@ -8,7 +8,7 @@
//
// Homepage: http://dbox2.elxsi.de
//
-// Copyright (C) 2008, 2009 Stefan Seyfried
+// Copyright (C) 2008-2013 Stefan Seyfried
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -912,9 +912,16 @@ static void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
else
{
event_id_t x_key = (*x)->uniqueKey();
- /* do we need this check? */
if (x_key == e_key)
- continue;
+ {
+ /* the present event has a higher table_id than the new one
+ * => delete and insert the new one */
+ if ((*x)->table_id >= e->table_id)
+ continue;
+ /* else: keep the old event with the lower table_id */
+ unlockEvents();
+ return;
+ }
if ((*x)->times.begin()->startzeit >= end_time)
continue;
/* iterating backwards: if the endtime of the stored events
@@ -922,6 +929,14 @@ static void addEvent(const SIevent &evt, const time_t zeit, bool cn = false)
* find an identical one => bail out */
if ((*x)->times.begin()->startzeit + (long)(*x)->times.begin()->dauer <= start_time)
break;
+ if ((*x)->table_id < e->table_id)
+ {
+ /* don't add the higher table_id */
+ dprintf("%s: don't replace 0x%016llx.%02x with 0x%016llx.%02x\n",
+ __func__, x_key, (*x)->table_id, e_key, e->table_id);
+ unlockEvents();
+ return;
+ }
/* here we have an overlapping event */
dprintf("%s: delete 0x%016llx.%02x time = 0x%016llx.%02x\n", __func__,
x_key, (*x)->table_id, e_key, e->table_id);
commit a6a89a9a9ff4f55df61a7d8ba703f0a6ce3d2b78
Author: Stefan Seyfried <se...@tu...>
Date: Fri Feb 15 19:37:32 2013 +0100
infoviewer: don't suppress valid 'next' events
Signed-off-by: Christian Schuett <Gau...@ho...>
diff --git a/tuxbox/neutrino/src/gui/infoviewer.cpp b/tuxbox/neutrino/src/gui/infoviewer.cpp
index fa752f1..e1cc0d7 100644
--- a/tuxbox/neutrino/src/gui/infoviewer.cpp
+++ b/tuxbox/neutrino/src/gui/infoviewer.cpp
@@ -6,7 +6,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/
- Bugfixes/cleanups/dreambox port (C) 2007-2009 Stefan Seyfried
+ Bugfixes/cleanups/dreambox port (C) 2007-2013 Stefan Seyfried
(C) 2008 Novell, Inc. Author: Stefan Seyfried
Kommentar:
@@ -1710,7 +1710,9 @@ void CInfoViewer::show_Data(bool calledFromEvent)
info_CurrentNext.current_zeit.startzeit = g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].startzeit;
info_CurrentNext.current_zeit.dauer = g_RemoteControl->subChannels[g_RemoteControl->selected_subchannel].dauer;
}
- /* what is this for? is it for preventing overlapping events to be displayed? */
+#if 0
+/* this triggers false positives on some channels.
+ * TODO: test on real NVOD channels, if this was even necessary at all */
else
{
if ((info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) &&
@@ -1723,6 +1725,7 @@ void CInfoViewer::show_Data(bool calledFromEvent)
}
}
}
+#endif
time_t jetzt=time(NULL);
if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_current)
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/sectionsd/sectionsd.cpp | 34 +++++++++++++++++++---
tuxbox/neutrino/src/gui/infoviewer.cpp | 7 +++-
2 files changed, 34 insertions(+), 7 deletions(-)
--
Tuxbox-GIT: apps
|
