From 2262baf322e7fdfa10a60c260a565fda0d27ee62 Mon Sep 17 00:00:00 2001 From: ghost Date: Wed, 16 Feb 2011 23:14:04 +0100 Subject: tools/enigma2.sh.in: add support for libpassthrough, add hook to execute scripts before every enigma2 start --- tools/enigma2.sh.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/enigma2.sh.in b/tools/enigma2.sh.in index a19e6733..5914c3f8 100755 --- a/tools/enigma2.sh.in +++ b/tools/enigma2.sh.in @@ -7,11 +7,23 @@ if [ -x @bindir@/showiframe -a -f /boot/backdrop.mvi ]; then @bindir@/showiframe /boot/backdrop.mvi fi +# hook to execute scripts always before enigma2 start +if [ -x @bindir@/enigma2_pre_start.sh ]; then + @bindir@/enigma2_pre_start.sh +fi + if [ -d /home/root ]; then cd /home/root fi -LD_PRELOAD=@libdir@/libopen.so.0.0.0 @bindir@/enigma2 +LIBS=@libdir@/libopen.so.0.0.0 + +#check for dreambox specific passthrough helper lib +if [ -e @libdir@/libpassthrough.so ]; then + LIBS="$LIBS @libdir@/libpassthrough.so" +fi + +LD_PRELOAD=$LIBS @bindir@/enigma2 # enigma2 exit codes: # -- cgit v1.2.3 From 11ea70cc0749456ad092a193e5c5bd70c1fac0dc Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 18 Feb 2011 13:21:58 +0100 Subject: Sources/ServiceEvent.py: removed unneeded directoy/marker check in ServiceEvent source so now the bouquet/provider name is visible in OLED/LCD display in servicelist fixes bug #646 --- lib/python/Components/Sources/ServiceEvent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/Components/Sources/ServiceEvent.py b/lib/python/Components/Sources/ServiceEvent.py index 93c733bd..8a0a66a1 100644 --- a/lib/python/Components/Sources/ServiceEvent.py +++ b/lib/python/Components/Sources/ServiceEvent.py @@ -25,7 +25,7 @@ class ServiceEvent(Source, object): def newService(self, ref): if not self.service or not ref or self.service != ref: self.service = ref - if not ref or (ref.flags & Ref.flagDirectory) == Ref.flagDirectory or ref.flags & Ref.isMarker: + if not ref: self.changed((self.CHANGED_CLEAR,)) else: self.changed((self.CHANGED_ALL,)) -- cgit v1.2.3 From 281453adb0ff8b3e86eb47aca241284d0cfd7313 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 18 Feb 2011 16:37:35 +0100 Subject: fixed oled/lcd clear on enigma2 shutdown fixes bug #690 --- lib/python/Screens/Standby.py | 9 +-------- main/enigma.cpp | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index 1a7ebbd1..c93dd008 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -160,14 +160,7 @@ class TryQuitMainloop(MessageBox): self.conntected=False self.session.nav.record_event.remove(self.getRecordEvent) if value: - # hack .. we dont like to show any other screens when this screen has closed - self.onClose = [self.__closed] - self.session.dialog_stack = [] - self.session.summary_stack = [None] - MessageBox.close(self, True) - - def __closed(self): - quitMainloop(self.retval) + quitMainloop(self.retval) def __onShow(self): global inTryQuitMainloop diff --git a/main/enigma.cpp b/main/enigma.cpp index 1cdd867b..91645d89 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -251,8 +251,9 @@ int main(int argc, char **argv) { gPainter p(my_lcd_dc); - p.resetClip(eRect(0, 0, 132, 64)); + p.resetClip(eRect(ePoint(0, 0), my_lcd_dc->size())); p.clear(); + p.flush(); } return exit_code; -- cgit v1.2.3