From d5e22a275d2ecdf3205bfefa927be6e125ac27b8 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Fri, 29 Jul 2005 01:09:09 +0000 Subject: [PATCH] - add movie selector --- keymap.xml | 13 ++-- lib/python/Components/Makefile.am | 2 +- lib/python/Components/MovieList.py | 89 ++++++++++++++++++++++++++++ lib/python/Components/__init__.py | 2 +- lib/python/Screens/InfoBar.py | 8 ++- lib/python/Screens/Makefile.am | 2 +- lib/python/Screens/MovieSelection.py | 29 +++++++++ lib/python/Screens/__init__.py | 4 +- lib/service/iservice.h | 4 ++ lib/service/servicedvb.cpp | 6 ++ lib/service/servicedvb.h | 1 + lib/service/servicefs.cpp | 19 ++++++ lib/service/servicefs.h | 4 ++ skin.py | 5 +- 14 files changed, 174 insertions(+), 14 deletions(-) create mode 100644 lib/python/Components/MovieList.py create mode 100644 lib/python/Screens/MovieSelection.py diff --git a/keymap.xml b/keymap.xml index dde32c92..7b9d0c64 100644 --- a/keymap.xml +++ b/keymap.xml @@ -42,6 +42,7 @@ + @@ -59,15 +60,15 @@ - - + + - - + + - - + + diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am index d9b3890e..7d35f561 100644 --- a/lib/python/Components/Makefile.am +++ b/lib/python/Components/Makefile.am @@ -6,4 +6,4 @@ install_DATA = \ Clock.py HTMLSkin.py ServiceList.py VariableText.py \ ConfigList.py Header.py ServiceName.py VariableValue.py \ EventInfo.py Label.py ServiceScan.py VolumeBar.py \ - GUIComponent.py MenuList.py TextInput.py __init__.py + GUIComponent.py MenuList.py TextInput.py __init__.py MovieList.py diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py new file mode 100644 index 00000000..4144353e --- /dev/null +++ b/lib/python/Components/MovieList.py @@ -0,0 +1,89 @@ +from HTMLComponent import * +from GUIComponent import * + +from enigma import eListboxPythonMultiContent, eListbox, gFont + +from enigma import eServiceReference, eServiceCenter, \ + eServiceCenterPtr, iListableServicePtr, \ + iStaticServiceInformationPtr + + + +RT_HALIGN_LEFT = 0 +RT_HALIGN_RIGHT = 1 +RT_HALIGN_CENTER = 2 +RT_HALIGN_BLOCK = 4 + +RT_VALIGN_TOP = 0 +RT_VALIGN_CENTER = 8 +RT_VALIGN_BOTTOM = 16 + +RT_WRAP = 32 + + +# +# | name of movie | +# +def MovieListEntry(serviceref, serviceHandler): + res = [ serviceref ] + + info = iStaticServiceInformationPtr() + + if serviceHandler.info(serviceref, info): + # ignore service which refuse to info + del info + return + + res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, info.getName(serviceref))) + res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "Toller Film")) + res.append((0, 50, 200, 20, 1, RT_HALIGN_LEFT, "Aufgenommen: irgendwann")) + res.append((200, 50, 200, 20, 1, RT_HALIGN_RIGHT, "1232MB")) + + return res + +class MovieList(HTMLComponent, GUIComponent): + def __init__(self, root): + GUIComponent.__init__(self) + self.l = eListboxPythonMultiContent() + self.load(root) + self.l.setList(self.list) + self.l.setFont(0, gFont("Arial", 30)) + self.l.setFont(1, gFont("Arial", 18)) + + def getCurrent(self): + return self.l.getCurrentSelection() + + def GUIcreate(self, parent): + self.instance = eListbox(parent) + self.instance.setContent(self.l) + self.instance.setItemHeight(75) + + def GUIdelete(self): + self.instance.setContent(None) + self.instance = None + + def load(self, root): + # this lists our root service, then building a + # nice list + + self.list = [ ] + + serviceHandler = eServiceCenterPtr() + eServiceCenter.getInstance(serviceHandler) + list = iListableServicePtr() + + if serviceHandler.list(root, list): + raise "listing of movies failed" + + movieList = [ ] + while 1: + s = eServiceReference() + if list.getNext(s): + del s + del list + break + movieList.append(s) + + # now process them... + for ref in movieList: + self.list.append(MovieListEntry(ref, serviceHandler)) diff --git a/lib/python/Components/__init__.py b/lib/python/Components/__init__.py index d7cd406b..9f15abd4 100644 --- a/lib/python/Components/__init__.py +++ b/lib/python/Components/__init__.py @@ -3,5 +3,5 @@ __all__ = ["ActionMap", "Button", "Clock", "ConfigList", "EventInfo", "GUIComponent", "GUISkin", "HTMLComponent", "HTMLSkin", "Header", "Label", "MenuList", "PerServiceDisplay", "ProgressBar", "ServiceList", "ServiceName", "ServiceScan", "VariableText", "VariableValue", "VolumeBar", - "components", "config", "TimerList", "TimeInput" ] + "components", "config", "TimerList", "TimeInput", "MovieList" ] diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index f89eba0f..be6b65c9 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -7,6 +7,7 @@ from Components.ServiceName import ServiceName from Components.EventInfo import EventInfo from Screens.MessageBox import MessageBox +from Screens.MovieSelection import MovieSelection from enigma import * @@ -31,7 +32,8 @@ class InfoBar(Screen): "zapDown": self.zapDown, "instantRecord": self.instantRecord, "hide": self.hide, - "toggleShow": self.toggleShow + "toggleShow": self.toggleShow, + "showMovies": self.showMovies, }) # self["okbutton"] = Button("mainMenu", [self.mainMenu]) @@ -100,4 +102,6 @@ class InfoBar(Screen): epg = ev # fix me, description. self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record") - + + def showMovies(self): + self.session.open(MovieSelection) diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am index e9eeec29..0da3f515 100644 --- a/lib/python/Screens/Makefile.am +++ b/lib/python/Screens/Makefile.am @@ -3,4 +3,4 @@ installdir = $(LIBDIR)/enigma2/python/Screens install_DATA = \ ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py \ MessageBox.py ScartLoopThrough.py Screen.py ServiceScan.py TimerEdit.py \ - __init__.py + MovieSelection.py __init__.py diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py new file mode 100644 index 00000000..f5f26528 --- /dev/null +++ b/lib/python/Screens/MovieSelection.py @@ -0,0 +1,29 @@ +from Screen import Screen +from Components.Button import Button +from Components.ServiceList import ServiceList +from Components.ActionMap import ActionMap +from Components.MovieList import MovieList + +from enigma import eServiceReference + +class MovieSelection(Screen): + def __init__(self, session): + Screen.__init__(self, session) + + self.movemode = False + self.bouquet_mark_edit = False + + self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:/")) + + #self["okbutton"] = Button("ok", [self.channelSelected]) + + self["actions"] = ActionMap(["OkCancelActions"], + { + "cancel": self.close, + "ok": self.movieSelected, + }) + self["actions"].csel = self + + def movieSelected(self): +# self.session.nav.playService(self["list"].getCurrent()) + self.close() diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py index c91f5f57..d24aa003 100644 --- a/lib/python/Screens/__init__.py +++ b/lib/python/Screens/__init__.py @@ -1,4 +1,4 @@ __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu", - "InfoBar", "MessageBox", "Menu", "ScartLoopThrough", "Screen", "ServiceScan", + "InfoBar", "MessageBox", "Menu", "MovieSelection", + "ScartLoopThrough", "Screen", "ServiceScan", "TimerEdit"] - diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 4592a971..7e24f9c1 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -208,7 +208,11 @@ TEMPLATE_TYPEDEF(ePtr, iRecordableServicePtr); class iListableService: public iObject { public: + /* legacy interface: get a list */ virtual RESULT getContent(std::list &list)=0; + + /* new, shiny interface: streaming. */ + virtual RESULT getNext(eServiceReference &ptr)=0; }; TEMPLATE_TYPEDEF(ePtr, iListableServicePtr); diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index a32ce326..5bd25f67 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -78,6 +78,12 @@ RESULT eDVBServiceList::getContent(std::list &list) return 0; } +RESULT eDVBServiceList::getNext(eServiceReference &) +{ + /* implement me */ + return -1; +} + RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr &ptr) { ePtr service; diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index e9489cd5..5c750430 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -34,6 +34,7 @@ private: public: virtual ~eDVBServiceList(); RESULT getContent(std::list &list); + RESULT getNext(eServiceReference &ptr); }; class eDVBServicePlay: public iPlayableService, public Object, public iServiceInformation diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp index 9db85028..739dd0a6 100644 --- a/lib/service/servicefs.cpp +++ b/lib/service/servicefs.cpp @@ -81,6 +81,7 @@ DEFINE_REF(eServiceFS); eServiceFS::eServiceFS(const char *path): path(path) { + m_list_valid = 0; } eServiceFS::~eServiceFS() @@ -132,4 +133,22 @@ RESULT eServiceFS::getContent(std::list &list) return 0; } +RESULT eServiceFS::getNext(eServiceReference &ptr) +{ + if (!m_list_valid) + { + m_list_valid = 1; + int res = getContent(m_list); + if (res) + return res; + } + + if (!m_list.size()) + return -ERANGE; + + ptr = m_list.front(); + m_list.pop_front(); + return 0; +} + eAutoInitPtr init_eServiceFactoryFS(eAutoInitNumbers::service+1, "eServiceFactoryFS"); diff --git a/lib/service/servicefs.h b/lib/service/servicefs.h index 61fcb4a9..e87b53a2 100644 --- a/lib/service/servicefs.h +++ b/lib/service/servicefs.h @@ -27,10 +27,14 @@ private: std::string path; friend class eServiceFactoryFS; eServiceFS(const char *path); + + int m_list_valid; + std::list m_list; public: virtual ~eServiceFS(); RESULT getContent(std::list &list); + RESULT getNext(eServiceReference &ptr); }; #endif diff --git a/skin.py b/skin.py index ab868327..aba7fbf6 100644 --- a/skin.py +++ b/skin.py @@ -92,7 +92,7 @@ dom = xml.dom.minidom.parseString( - + @@ -100,6 +100,9 @@ dom = xml.dom.minidom.parseString( + + + -- 2.30.2