git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add StaticMultiList for MultiContentList-styled content
[enigma2.git]
/
lib
/
service
/
iservice.h
diff --git
a/lib/service/iservice.h
b/lib/service/iservice.h
index 96cd792d7b1546c03ba17381e6585e97face1428..df4e302f12b5fd50c4f0863fd14e1258fda3d78a 100644
(file)
--- a/
lib/service/iservice.h
+++ b/
lib/service/iservice.h
@@
-224,7
+224,7
@@
typedef long long pts_t;
Hide the result only if there is another way to check for failure! */
Hide the result only if there is another way to check for failure! */
-
SWIG_TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr)
;
+
class eServiceEvent
;
SWIG_IGNORE(iStaticServiceInformation);
class iStaticServiceInformation: public iObject
SWIG_IGNORE(iStaticServiceInformation);
class iStaticServiceInformation: public iObject
@@
-367,7
+367,10
@@
class iFrontendInformation: public iFrontendInformation_ENUMS, public iObject
#endif
public:
virtual int getFrontendInfo(int w)=0;
#endif
public:
virtual int getFrontendInfo(int w)=0;
- virtual PyObject *getFrontendData(bool original=false)=0;
+ virtual PyObject *getFrontendData()=0;
+ virtual PyObject *getFrontendStatus()=0;
+ virtual PyObject *getTransponderData(bool original)=0;
+ virtual PyObject *getAll(bool original)=0; // a sum of getFrontendData/Status/TransponderData
};
SWIG_TEMPLATE_TYPEDEF(ePtr<iFrontendInformation>, iFrontendInformationPtr);
};
SWIG_TEMPLATE_TYPEDEF(ePtr<iFrontendInformation>, iFrontendInformationPtr);
@@
-480,17
+483,30
@@
public:
};
SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
};
SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
-SWIG_IGNORE(iRadioText);
-class iRadioText: public iObject
+class iRdsDecoder_ENUMS
+{
+#ifdef SWIG
+ iRdsDecoder_ENUMS();
+ ~iRdsDecoder_ENUMS();
+#endif
+public:
+ enum { RadioText, RtpText };
+};
+
+SWIG_IGNORE(iRdsDecoder);
+class iRdsDecoder: public iObject, public iRdsDecoder_ENUMS
{
#ifdef SWIG
{
#ifdef SWIG
- iR
adioText
();
- ~iR
adioText
();
+ iR
dsDecoder
();
+ ~iR
dsDecoder
();
#endif
public:
#endif
public:
- virtual std::string getRadioText(int x=0)=0;
+ virtual std::string getText(int x=RadioText)=0;
+ virtual void showRassSlidePicture()=0;
+ virtual void showRassInteractivePic(int page, int subpage)=0;
+ virtual SWIG_PYOBJECT(ePyObject) getRassInteractiveMask()=0;
};
};
-SWIG_TEMPLATE_TYPEDEF(ePtr<iR
adioText>, iRadioText
Ptr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iR
dsDecoder>, iRdsDecoder
Ptr);
SWIG_IGNORE(iSubserviceList);
class iSubserviceList: public iObject
SWIG_IGNORE(iSubserviceList);
class iSubserviceList: public iObject
@@
-673,8
+689,13
@@
public:
/* when cueSheet is implemented */
evCuesheetChanged,
/* when cueSheet is implemented */
evCuesheetChanged,
- /* when r
adioText
is implemented */
+ /* when r
dsDecoder
is implemented */
evUpdatedRadioText,
evUpdatedRadioText,
+ evUpdatedRtpText,
+
+ /* Radio Screenshow Support */
+ evUpdatedRassSlidePic,
+ evUpdatedRassInteractivePicMask,
evVideoSizeChanged,
evVideoSizeChanged,
@@
-709,7
+730,7
@@
public:
virtual SWIG_VOID(RESULT) cueSheet(ePtr<iCueSheet> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) subtitle(ePtr<iSubtitleOutput> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) cueSheet(ePtr<iCueSheet> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) subtitle(ePtr<iSubtitleOutput> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
- virtual SWIG_VOID(RESULT) r
adioText(ePtr<iRadioText
> &SWIG_OUTPUT)=0;
+ virtual SWIG_VOID(RESULT) r
dsDecoder(ePtr<iRdsDecoder
> &SWIG_OUTPUT)=0;
};
SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
};
SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);