shouldSort=8, // should be ASCII-sorted according to service_name. great for directories.
hasSortKey=16, // has a sort key in data[3]. not having a sort key implies 0.
sort1=32, // sort key is 1 instead of 0
- isMarker=64 // Marker
+ isMarker=64, // Marker
+ isGroup=128 // is a group of services
};
int flags; // flags will NOT be compared.
data[3]=data3;
data[4]=data4;
}
+#endif
eServiceReference(int type, int flags, const std::string &path)
: type(type), flags(flags), path(path)
{
memset(data, 0, sizeof(data));
}
-#endif
eServiceReference(const std::string &string);
std::string toString() const;
std::string toCompareString() const;
extern PyObject *New_eServiceReference(const eServiceReference &ref); // defined in enigma_python.i
+#ifndef SWIG
+#ifdef PYTHON_REFCOUNT_DEBUG
+inline ePyObject Impl_New_eServiceReference(const char* file, int line, const eServiceReference &ref)
+{
+ return ePyObject(New_eServiceReference(ref), file, line);
+}
+#define NEW_eServiceReference(ref) Impl_New_eServiceReference(__FILE__, __LINE__, ref)
+#else
+inline ePyObject Impl_New_eServiceReference(const eServiceReference &ref)
+{
+ return New_eServiceReference(ref);
+}
+#define NEW_eServiceReference(ref) Impl_New_eServiceReference(ref)
+#endif
+#endif // SWIG
+
typedef long long pts_t;
/* the reason we have the servicereference as additional argument is
Hide the result only if there is another way to check for failure! */
-TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
-
+class eServiceEvent;
+
+SWIG_IGNORE(iStaticServiceInformation);
class iStaticServiceInformation: public iObject
{
#ifdef SWIG
#endif
public:
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);
virtual SWIG_VOID(RESULT) getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT, time_t start_time=-1);
// returns true when not implemented
- virtual bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+ virtual int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
virtual int getInfo(const eServiceReference &ref, int w);
virtual std::string getInfoString(const eServiceReference &ref,int w);
+ virtual PyObject *getInfoObject(const eServiceReference &ref, int w);
virtual int setInfo(const eServiceReference &ref, int w, int v);
virtual int setInfoString(const eServiceReference &ref, int w, const char *v);
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
-TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
-
-class iServiceInformation: public iObject
+class iServiceInformation_ENUMS
{
#ifdef SWIG
- iServiceInformation();
- ~iServiceInformation();
+ iServiceInformation_ENUMS();
+ ~iServiceInformation_ENUMS();
#endif
public:
- virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
- virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
-
enum {
- sIsCrypted, /* is encrypted (no indication if decrypt was possible) */
- sAspect, /* aspect ratio: 0=4:3, 1=16:9, 2=whatever we need */
- sIsMultichannel, /* multichannel *available* (probably not selected) */
-
+ sIsCrypted, /* is encrypted (no indication if decrypt was possible) */
+ sAspect, /* aspect ratio: 0=4:3, 1=16:9, 2=whatever we need */
+ sIsMultichannel, /* multichannel *available* (probably not selected) */
+
/* "user serviceable info" - they are not reliable. Don't use them for anything except the service menu!
- that's also the reason why they are so globally defined.
-
-
+ that's also the reason why they are so globally defined.
again - if somebody EVER tries to use this information for anything else than simply displaying it,
i will change this to return a user-readable text like "zero x zero three three" (and change the
- exact spelling in every version) to stop that!
- */
+ exact spelling in every version) to stop that! */
+
sVideoPID,
sAudioPID,
sPCRPID,
sPMTPID,
sTXTPID,
-
+
sSID,
sONID,
sTSID,
sNamespace,
sProvider,
-
+
sDescription,
sServiceref,
- sTimeCreate, // unix time or string
-
+ sTimeCreate, /* unix time or string */
+
sTitle,
sArtist,
sAlbum,
sTracknumber,
sGenre,
sCAIDs,
- sVideoType, // MPEG2 MPEG4
-
- sTags, /* space seperated list of tags */
+ sVideoType, /* MPEG2 MPEG4 */
+
+ sTags, /* space seperated list of tags */
+
+ sDVBState, /* states as defined in pmt handler (as events there) */
+
+ sVideoHeight,
+ sVideoWidth,
+
+ sTransponderData /* transponderdata as python dict */
};
- enum { resNA = -1, resIsString = -2, resIsPyObject = -3 };
+ enum {
+ resNA = -1,
+ resIsString = -2,
+ resIsPyObject = -3
+ };
+};
+
+/* some words to structs like struct iServiceInformation_ENUMS
+For some classes we need in python just the SmartPointer Variants.
+So we prevent building wrapper classes for the non smart pointer classes with the SWIG_IGNORE makro.
+But now we have the problem that swig do not export enums for smart pointer classes (i dont know why).
+So we move all enum's to own classes (with _ENUMS as name ending) and let our real
+class inherit from the *_ENUMS class. This *_ENUMS classes are normally exportet via swig to python.
+But in the python code we doesn't like to write iServiceInformation_ENUMS.sVideoType....
+we like to write iServiceInformation.sVideoType.
+So until swig have no Solution for this Problem we call in lib/python/Makefile.am a python script named
+enigma_py_patcher.py to remove the "_ENUMS" strings in enigma.py at all needed locations. */
+
+SWIG_IGNORE(iServiceInformation);
+class iServiceInformation: public iServiceInformation_ENUMS, public iObject
+{
+#ifdef SWIG
+ iServiceInformation();
+ ~iServiceInformation();
+#endif
+public:
+ virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
+ virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
virtual int getInfo(int w);
virtual std::string getInfoString(int w);
virtual PyObject *getInfoObject(int w);
-
+
virtual int setInfo(int w, int v);
virtual int setInfoString(int w, const char *v);
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
-TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
-
-class iFrontendInformation: public iObject
+class iFrontendInformation_ENUMS
{
#ifdef SWIG
- iFrontendInformation();
- ~iFrontendInformation();
+ iFrontendInformation_ENUMS();
+ ~iFrontendInformation_ENUMS();
#endif
public:
enum {
syncState,
frontendNumber
};
- virtual int getFrontendInfo(int w)=0;
- virtual PyObject *getFrontendData(bool original=false)=0;
};
-TEMPLATE_TYPEDEF(ePtr<iFrontendInformation>, iFrontendInformationPtr);
+SWIG_IGNORE(iFrontendInformation);
+class iFrontendInformation: public iFrontendInformation_ENUMS, public iObject
+{
+#ifdef SWIG
+ iFrontendInformation();
+ ~iFrontendInformation();
+#endif
+public:
+ virtual int getFrontendInfo(int w)=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_IGNORE(iPauseableService);
class iPauseableService: public iObject
{
#ifdef SWIG
public:
virtual RESULT pause()=0;
virtual RESULT unpause()=0;
-
+
/* hm. */
virtual RESULT setSlowMotion(int ratio=0)=0;
virtual RESULT setFastForward(int ratio=0)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);
-TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);
+class iSeekableService_ENUMS
+{
+#ifdef SWIG
+ iSeekableService_ENUMS();
+ ~iSeekableService_ENUMS();
+#endif
+public:
+ enum { dirForward = +1, dirBackward = -1 };
+};
-class iSeekableService: public iObject
+SWIG_IGNORE(iSeekableService);
+class iSeekableService: public iSeekableService_ENUMS, public iObject
{
#ifdef SWIG
iSeekableService();
public:
virtual RESULT getLength(pts_t &SWIG_OUTPUT)=0;
virtual RESULT seekTo(pts_t to)=0;
- enum { dirForward = +1, dirBackward = -1 };
virtual RESULT seekRelative(int direction, pts_t to)=0;
virtual RESULT getPlayPosition(pts_t &SWIG_OUTPUT)=0;
- /* if you want to do several seeks in a row, you can enable the trickmode.
+ /* if you want to do several seeks in a row, you can enable the trickmode.
audio will be switched off, sync will be disabled etc. */
virtual RESULT setTrickmode(int trick=0)=0;
virtual RESULT isCurrentlySeekable()=0;
};
-
-TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
struct iAudioTrackInfo
{
std::string getDescription() { return m_description; }
std::string getLanguage() { return m_language; }
};
-
SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
+SWIG_IGNORE(iAudioTrackSelection);
class iAudioTrackSelection: public iObject
{
#ifdef SWIG
virtual RESULT selectTrack(unsigned int i)=0;
virtual SWIG_VOID(RESULT) getTrackInfo(struct iAudioTrackInfo &SWIG_OUTPUT, unsigned int n)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
-TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
+class iAudioChannelSelection_ENUMS
+{
+#ifdef SWIG
+ iAudioChannelSelection_ENUMS();
+ ~iAudioChannelSelection_ENUMS();
+#endif
+public:
+ enum { LEFT, STEREO, RIGHT };
+};
-class iAudioChannelSelection: public iObject
+SWIG_IGNORE(iAudioChannelSelection);
+class iAudioChannelSelection: public iAudioChannelSelection_ENUMS, public iObject
{
#ifdef SWIG
iAudioChannelSelection();
~iAudioChannelSelection();
#endif
public:
- enum { LEFT, STEREO, RIGHT };
virtual int getCurrentChannel()=0;
virtual RESULT selectChannel(int i)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioChannelSelection>, iAudioChannelSelectionPtr);
-TEMPLATE_TYPEDEF(ePtr<iAudioChannelSelection>, iAudioChannelSelectionPtr);
-
+SWIG_IGNORE(iAudioDelay);
class iAudioDelay: public iObject
{
#ifdef SWIG
virtual void setAC3Delay(int)=0;
virtual void setPCMDelay(int)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
-TEMPLATE_TYPEDEF(ePtr<iAudioDelay>, iAudioDelayPtr);
-
+SWIG_IGNORE(iRadioText);
class iRadioText: public iObject
{
#ifdef SWIG
public:
virtual std::string getRadioText(int x=0)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iRadioText>, iRadioTextPtr);
-TEMPLATE_TYPEDEF(ePtr<iRadioText>, iRadioTextPtr);
-
+SWIG_IGNORE(iSubserviceList);
class iSubserviceList: public iObject
{
#ifdef SWIG
virtual int getNumberOfSubservices()=0;
virtual SWIG_VOID(RESULT) getSubservice(eServiceReference &SWIG_OUTPUT, unsigned int n)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iSubserviceList>, iSubserviceListPtr);
-TEMPLATE_TYPEDEF(ePtr<iSubserviceList>, iSubserviceListPtr);
-
+SWIG_IGNORE(iTimeshiftService);
class iTimeshiftService: public iObject
{
#ifdef SWIG
public:
virtual RESULT startTimeshift()=0;
virtual RESULT stopTimeshift()=0;
-
+
virtual int isTimeshiftActive()=0;
/* this essentially seeks to the relative end of the timeshift buffer */
virtual RESULT activateTimeshift()=0;
};
-
-TEMPLATE_TYPEDEF(ePtr<iTimeshiftService>, iTimeshiftServicePtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iTimeshiftService>, iTimeshiftServicePtr);
/* not related to eCueSheet */
-class iCueSheet: public iObject
+
+class iCueSheet_ENUMS
+{
+#ifdef SWIG
+ iCueSheet_ENUMS();
+ ~iCueSheet_ENUMS();
+#endif
+public:
+ enum { cutIn = 0, cutOut = 1, cutMark = 2 };
+};
+
+SWIG_IGNORE(iCueSheet);
+class iCueSheet: public iCueSheet_ENUMS, public iObject
{
#ifdef SWIG
iCueSheet();
~iCueSheet();
#endif
public:
- /* returns a list of (pts, what)-tuples */
+ /* returns a list of (pts, what)-tuples */
virtual PyObject *getCutList() = 0;
- virtual void setCutList(PyObject *list) = 0;
+ virtual void setCutList(SWIG_PYOBJECT(ePyObject) list) = 0;
virtual void setCutListEnable(int enable) = 0;
- enum { cutIn = 0, cutOut = 1, cutMark = 2 };
};
-
-TEMPLATE_TYPEDEF(ePtr<iCueSheet>, iCueSheetPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iCueSheet>, iCueSheetPtr);
class eWidget;
class PyList;
+SWIG_IGNORE(iSubtitleOutput);
class iSubtitleOutput: public iObject
{
public:
- virtual RESULT enableSubtitles(eWidget *parent, PyObject *entry)=0;
+ virtual RESULT enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) entry)=0;
virtual RESULT disableSubtitles(eWidget *parent)=0;
virtual PyObject *getSubtitleList()=0;
virtual PyObject *getCachedSubtitle()=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iSubtitleOutput>, iSubtitleOutputPtr);
-TEMPLATE_TYPEDEF(ePtr<iSubtitleOutput>, iSubtitleOutputPtr);
+SWIG_IGNORE(iMutableServiceList);
+class iMutableServiceList: public iObject
+{
+#ifdef SWIG
+ iMutableServiceList();
+ ~iMutableServiceList();
+#endif
+public:
+ /* flush changes */
+ virtual RESULT flushChanges()=0;
+ /* adds a service to a list */
+ virtual RESULT addService(eServiceReference &ref, eServiceReference before=eServiceReference())=0;
+ /* removes a service from a list */
+ virtual RESULT removeService(eServiceReference &ref)=0;
+ /* moves a service in a list, only if list suppports a specific sort method. */
+ /* pos is the new, absolute position from 0..size-1 */
+ virtual RESULT moveService(eServiceReference &ref, int pos)=0;
+ /* set name of list, for bouquets this is the visible bouquet name */
+ virtual RESULT setListName(const std::string &name)=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iMutableServiceList>, iMutableServiceListPtr);
-class iPlayableService: public iObject
+SWIG_IGNORE(iListableService);
+class iListableService: public iObject
{
#ifdef SWIG
- iPlayableService();
- ~iPlaybleService();
+ iListableService();
+ ~iListableService();
#endif
- friend class iServiceHandler;
public:
- enum
+#ifndef SWIG
+ /* legacy interface: get a list */
+ virtual RESULT getContent(std::list<eServiceReference> &list, bool sorted=false)=0;
+#endif
+ virtual PyObject *getContent(const char* format, bool sorted=false)=0;
+
+ /* new, shiny interface: streaming. */
+ virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;
+
+ /* use this for sorting. output is not sorted because of either
+ - performance reasons: the whole list must be buffered or
+ - the interface would be restricted to a list. streaming
+ (as well as a future "active" extension) won't be possible.
+ */
+ virtual int compareLessEqual(const eServiceReference &, const eServiceReference &)=0;
+
+ virtual SWIG_VOID(RESULT) startEdit(ePtr<iMutableServiceList> &SWIG_OUTPUT)=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
+
+#ifndef SWIG
+ /* a helper class which can be used as argument to stl's sort(). */
+class iListableServiceCompare
+{
+ ePtr<iListableService> m_list;
+public:
+ iListableServiceCompare(iListableService *list): m_list(list) { }
+ bool operator()(const eServiceReference &a, const eServiceReference &b)
{
+ return m_list->compareLessEqual(a, b);
+ }
+};
+#endif
+
+SWIG_IGNORE(iServiceOfflineOperations);
+class iServiceOfflineOperations: public iObject
+{
+#ifdef SWIG
+ iServiceOfflineOperations();
+ ~iServiceOfflineOperations();
+#endif
+public:
+ /* to delete a service, forever. */
+ virtual RESULT deleteFromDisk(int simulate=1)=0;
+
+ /* for transferring a service... */
+ virtual SWIG_VOID(RESULT) getListOfFilenames(std::list<std::string> &SWIG_OUTPUT)=0;
+
+ // TODO: additional stuff, like a conversion interface?
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
+
+class iPlayableService_ENUMS
+{
+#ifdef SWIG
+ iPlayableService_ENUMS();
+ ~iPlayableService_ENUMS();
+#endif
+public:
+ enum {
/* these first two events are magical, and should only
be generated if you know what you're doing. */
evStart,
evEnd,
-
+
evTuneFailed,
- // when iServiceInformation is implemented:
+
+ /* when iServiceInformation is implemented:*/
evUpdatedEventInfo,
evUpdatedInfo,
- /* when seek() is implemented: */
+ /* when seek() is implemented: */
evSeekableStatusChanged, /* for example when timeshifting */
-
+
evEOF,
evSOF, /* bounced against start of file (when seeking backwards) */
-
- /* only when cueSheet is implemented */
+
+ /* when cueSheet is implemented */
evCuesheetChanged,
- evUpdatedRadioText
+ /* when radioText is implemented */
+ evUpdatedRadioText,
+
+ evVideoSizeChanged,
+
+ evStopped
};
+};
+
+SWIG_IGNORE(iPlayableService);
+class iPlayableService: public iPlayableService_ENUMS, public iObject
+{
+#ifdef SWIG
+ iPlayableService();
+ ~iPlaybleService();
+#endif
+ friend class iServiceHandler;
+public:
#ifndef SWIG
virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
#endif
virtual SWIG_VOID(RESULT) audioDelay(ePtr<iAudioDelay> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) radioText(ePtr<iRadioText> &SWIG_OUTPUT)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
-TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
+SWIG_IGNORE(iStreamableService);
+class iStreamableService: public iObject
+{
+#ifdef SWIG
+ iStreamableService();
+ ~iStreamableService();
+#endif
+public:
+ /* returns a dict:
+ { "demux": <n>,
+ "pids": [(x,type),(y,type),(z,type),..],
+ ...
+ }
+ with type being "video", "audio", "pmt", "pat"...
+ */
+ virtual PyObject *getStreamingData()=0;
+};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iStreamableService>, iStreamableServicePtr);
-class iRecordableService: public iObject
+class iRecordableService_ENUMS
{
#ifdef SWIG
- iRecordableService();
- ~iRecordableService();
+ iRecordableService_ENUMS();
+ ~iRecordableService_ENUMS();
#endif
public:
- enum
- {
+ enum {
evStart,
- evStop,
+ evEnd,
evTunedIn,
evTuneFailed,
evRecordRunning,
evRecordStopped,
evNewProgramInfo,
evRecordFailed
-// evDiskFull
+ /*evDiskFull*/
};
- enum
- {
+ enum {
NoError=0,
errOpenRecordFile=-1,
errNoDemuxAvailable=-2,
errDiskFull=-4,
errTuneFailed=-255
};
+};
+
+SWIG_IGNORE(iRecordableService);
+class iRecordableService: public iRecordableService_ENUMS, public iObject
+{
+#ifdef SWIG
+ iRecordableService();
+ ~iRecordableService();
+#endif
+public:
#ifndef SWIG
virtual RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection)=0;
#endif
- virtual RESULT getError(int &)=0;
+ virtual SWIG_VOID(RESULT) getError(int &SWIG_OUTPUT)=0;
virtual RESULT prepare(const char *filename, time_t begTime=-1, time_t endTime=-1, int eit_event_id=-1)=0;
+ virtual RESULT prepareStreaming()=0;
virtual RESULT start()=0;
virtual RESULT stop()=0;
virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
+ virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
-TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
+extern PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ref); // defined in enigma_python.i
-PyObject *PyFrom(ePtr<iRecordableService>&); // implemented in servicedvbrecord.cpp
-
-// TEMPLATE_TYPEDEF(std::list<eServiceReference>, eServiceReferenceList);
-
-class iMutableServiceList: public iObject
+inline PyObject *PyFrom(ePtr<iRecordableService> &c)
{
-#ifdef SWIG
- iMutableServiceList();
- ~iMutableServiceList();
-#endif
-public:
- /* flush changes */
- virtual RESULT flushChanges()=0;
- /* adds a service to a list */
- virtual RESULT addService(eServiceReference &ref, eServiceReference before=eServiceReference())=0;
- /* removes a service from a list */
- virtual RESULT removeService(eServiceReference &ref)=0;
- /* moves a service in a list, only if list suppports a specific sort method. */
- /* pos is the new, absolute position from 0..size-1 */
- virtual RESULT moveService(eServiceReference &ref, int pos)=0;
- /* set name of list, for bouquets this is the visible bouquet name */
- virtual RESULT setListName(const std::string &name)=0;
-};
-
-TEMPLATE_TYPEDEF(ePtr<iMutableServiceList>, iMutableServiceListPtr);
-
-class iListableService: public iObject
-{
-#ifdef SWIG
- iListableService();
- ~iListableService();
-#endif
-public:
- /* legacy interface: get a list */
- virtual RESULT getContent(std::list<eServiceReference> &list, bool sorted=false)=0;
- virtual PyObject *getContent(const char* format, bool sorted=false)=0;
-
- /* new, shiny interface: streaming. */
- virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;
-
- /* use this for sorting. output is not sorted because of either
- - performance reasons: the whole list must be buffered or
- - the interface would be restricted to a list. streaming
- (as well as a future "active" extension) won't be possible.
- */
- virtual int compareLessEqual(const eServiceReference &, const eServiceReference &)=0;
-
- virtual SWIG_VOID(RESULT) startEdit(ePtr<iMutableServiceList> &SWIG_OUTPUT)=0;
-};
-
-TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
+ return New_iRecordableServicePtr(c);
+}
#ifndef SWIG
- /* a helper class which can be used as argument to stl's sort(). */
-class iListableServiceCompare
+#ifdef PYTHON_REFCOUNT_DEBUG
+inline ePyObject Impl_New_iRecordableServicePtr(const char* file, int line, const ePtr<iRecordableService> &ptr)
{
- ePtr<iListableService> m_list;
-public:
- iListableServiceCompare(iListableService *list): m_list(list) { }
- bool operator()(const eServiceReference &a, const eServiceReference &b)
- {
- return m_list->compareLessEqual(a, b);
- }
-};
-#endif
-
-class iServiceOfflineOperations: public iObject
+ return ePyObject(New_iRecordableServicePtr(ptr), file, line);
+}
+#define NEW_iRecordableServicePtr(ptr) Impl_New_iRecordableServicePtr(__FILE__, __LINE__, ptr)
+#else
+inline ePyObject Impl_New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr)
{
-#ifdef SWIG
- iServiceOfflineOperations();
- ~iServiceOfflineOperations();
+ return New_iRecordableServicePtr(ptr);
+}
+#define NEW_iRecordableServicePtr(ptr) Impl_New_iRecordableServicePtr(ptr)
#endif
-public:
- /* to delete a service, forever. */
- virtual RESULT deleteFromDisk(int simulate=1)=0;
-
- /* for transferring a service... */
- virtual SWIG_VOID(RESULT) getListOfFilenames(std::list<std::string> &SWIG_OUTPUT)=0;
-
- // TODO: additional stuff, like a conversion interface?
-};
-
-TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
+#endif // SWIG
+SWIG_IGNORE(iServiceHandler);
class iServiceHandler: public iObject
{
#ifdef SWIG
virtual SWIG_VOID(RESULT) info(const eServiceReference &, ePtr<iStaticServiceInformation> &SWIG_OUTPUT)=0;
virtual SWIG_VOID(RESULT) offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &SWIG_OUTPUT)=0;
};
-
-TEMPLATE_TYPEDEF(ePtr<iServiceHandler>, iServiceHandlerPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iServiceHandler>, iServiceHandlerPtr);
#endif
git.cweiske.de / enigma2.git / blobdiff