From: Felix Domke Date: Mon, 26 Sep 2005 17:25:45 +0000 (+0000) Subject: - simplified getInterface-styled calls: now using return value instead of mutable... X-Git-Tag: 2.6.0~5569 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/76e87479554f771723ea4005788f9318cd1654f4 - simplified getInterface-styled calls: now using return value instead of mutable argument --- diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py index 656fd279..ac7ed9b5 100644 --- a/lib/python/Components/EventInfo.py +++ b/lib/python/Components/EventInfo.py @@ -23,7 +23,8 @@ class EventInfo(PerServiceDisplay): service = self.navcore.getCurrentService() if service != None: - if not service.info(info): + info = service.info() + if info is not None: ev = eServiceEventPtr() if info.getEvent(ev, self.now_or_next & 1) == 0: if self.now_or_next & 2: diff --git a/lib/python/Components/ServiceName.py b/lib/python/Components/ServiceName.py index 5352de5d..c6dcbb7a 100644 --- a/lib/python/Components/ServiceName.py +++ b/lib/python/Components/ServiceName.py @@ -12,11 +12,13 @@ class ServiceName(PerServiceDisplay): }) def newService(self): - info = iServiceInformationPtr() service = self.navcore.getCurrentService() - if service != None: - if not service.info(info): + print service + + if service is not None: + info = service.info() + if info is not None: self.setText(info.getName()) setLCD(info.getName()) diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py index 462102f8..e402751c 100644 --- a/lib/python/Components/ServicePosition.py +++ b/lib/python/Components/ServicePosition.py @@ -33,7 +33,8 @@ class ServicePosition(PerServiceDisplay): self.available = 0 if service != None: - if not service.seek(seek): + seek = service.seek(seek) + if seek != None: if self.type != self.TYPE_LENGTH: self.updateTimer.start(500) @@ -43,11 +44,11 @@ class ServicePosition(PerServiceDisplay): self.update() def get(self, what): - seek = iSeekableServicePtr() service = self.navcore.getCurrentService() if service != None: - if not service.seek(seek): + seek = service.seek(seek) + if seek != None: if what == self.TYPE_LENGTH: r = seek.getLength() elif what == self.TYPE_POSITION: diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 4a19378c..62be26c0 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -142,16 +142,29 @@ typedef unsigned long long pts_t; large list, provided that no state information is nessesary to deliver the required information. Anyway - ref *must* be the same as the argument to the info() or getIServiceInformation call! */ + + /* About the usage of SWIG_VOID: + SWIG_VOID(real_returntype_t) hides a return value from swig. This is used for + the "superflouus" RESULT return values. + + Python code has to check the returned pointer against 0. This works, + as all functions returning instances in smartpointers AND having a + RESULT have to BOTH return non-zero AND set the pointer to zero. + + Python code thus can't check for the reason, but the reason isn't + user-servicable anyway. If you want to return a real reason which + goes beyong "it just doesn't work", use extra variables for this, + not the RESULT. + + Hide the result only if there is another way to check for failure! */ + class iStaticServiceInformation: public iObject { public: - virtual RESULT getName(const eServiceReference &ref, std::string &name)=0; + virtual SWIG_VOID(RESULT) getName(const eServiceReference &ref, std::string &SWIG_OUTPUT)=0; // doesn't need to be implemented, should return -1 then. virtual int getLength(const eServiceReference &ref)=0; - - // FOR SWIG - std::string getName(const eServiceReference &ref) { std::string temp; getName(ref, temp); return temp; } }; TEMPLATE_TYPEDEF(ePtr, iStaticServiceInformationPtr); @@ -161,10 +174,8 @@ class eServiceEvent; class iServiceInformation: public iObject { public: - virtual RESULT getName(std::string &name)=0; - // FOR SWIG - std::string getName() { std::string temp; getName(temp); return temp; } - virtual RESULT getEvent(ePtr &evt, int nownext); + virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) getEvent(ePtr &SWIG_OUTPUT, int nownext); }; TEMPLATE_TYPEDEF(ePtr, iServiceInformationPtr); @@ -203,9 +214,9 @@ public: virtual RESULT connectEvent(const Slot2 &event, ePtr &connection)=0; virtual RESULT start()=0; virtual RESULT stop()=0; - virtual RESULT seek(ePtr &ptr)=0; - virtual RESULT pause(ePtr &ptr)=0; - virtual RESULT info(ePtr &ptr)=0; + virtual SWIG_VOID(RESULT) seek(ePtr &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) pause(ePtr &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) info(ePtr &SWIG_OUTPUT)=0; }; TEMPLATE_TYPEDEF(ePtr, iPlayableServicePtr); @@ -229,7 +240,7 @@ public: virtual RESULT getContent(std::list &list)=0; /* new, shiny interface: streaming. */ - virtual RESULT getNext(eServiceReference &ptr)=0; + virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0; }; TEMPLATE_TYPEDEF(ePtr, iListableServicePtr); @@ -237,10 +248,10 @@ TEMPLATE_TYPEDEF(ePtr, iListableServicePtr); class iServiceHandler: public iObject { public: - virtual RESULT play(const eServiceReference &, ePtr &ptr)=0; - virtual RESULT record(const eServiceReference &, ePtr &ptr)=0; - virtual RESULT list(const eServiceReference &, ePtr &ptr)=0; - virtual RESULT info(const eServiceReference &, ePtr &ptr); + virtual SWIG_VOID(RESULT) play(const eServiceReference &, ePtr &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) record(const eServiceReference &, ePtr &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) list(const eServiceReference &, ePtr &SWIG_OUTPUT)=0; + virtual SWIG_VOID(RESULT) info(const eServiceReference &, ePtr &SWIG_OUTPUT)=0; }; TEMPLATE_TYPEDEF(ePtr, iServiceHandlerPtr);