fix calculation in calculateDifference for cable and terrestrial which should complet...

[enigma2.git] / lib / service / iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 3c3248c41a2ef9a4fc1a2b31ff30a527a6c86279..bc0fc974bed0935e77764e57374b49ae750a04a6 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -2,6 +2,7 @@
 #define __lib_dvb_iservice_h
 
 #include <lib/python/swig.h>
+#include <lib/python/python.h>
 #include <lib/base/object.h>
 #include <string>
 #include <connection.h>
@@ -166,6 +167,8 @@ public:
 
 SWIG_ALLOW_OUTPUT_SIMPLE(eServiceReference);
 
+extern PyObject *New_eServiceReference(const eServiceReference &ref); // defined in enigma_python.i
+
 typedef long long pts_t;
 
        /* the reason we have the servicereference as additional argument is
@@ -191,12 +194,16 @@ typedef long long pts_t;
           
 class iStaticServiceInformation: public iObject
 {
+#ifdef SWIG
+       iStaticServiceInformation();
+       ~iStaticServiceInformation();
+#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=0);
+       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);
 
@@ -210,6 +217,10 @@ TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
 
 class iServiceInformation: 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);
@@ -252,6 +263,10 @@ TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
 
 class iFrontendStatusInformation: public iObject
 {
+#ifdef SWIG
+       iFrontendStatusInformation();
+       ~iFrontendStatusInformation();
+#endif
 public:
        enum {
                bitErrorRate,
@@ -265,6 +280,10 @@ TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr
 
 class iPauseableService: public iObject
 {
+#ifdef SWIG
+       iPausableService();
+       ~iPausableService();
+#endif
 public:
        virtual RESULT pause()=0;
        virtual RESULT unpause()=0;
@@ -278,6 +297,10 @@ TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);
 
 class iSeekableService: public iObject
 {
+#ifdef SWIG
+       iSeekableService();
+       ~iSeekableService();
+#endif
 public:
        virtual RESULT getLength(pts_t &SWIG_OUTPUT)=0;
        virtual RESULT seekTo(pts_t to)=0;
@@ -287,12 +310,19 @@ public:
                /* 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);
 
 struct iAudioTrackInfo
 {
+#ifdef SWIG
+private:
+       iAudioTrackInfo();
+       ~iAudioTrackInfo();
+public:
+#endif
 #ifndef SWIG
        std::string m_description;
        std::string m_language; /* iso639 */
@@ -305,6 +335,10 @@ SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
 
 class iAudioTrackSelection: public iObject
 {
+#ifdef SWIG
+       iAudioTrackSelection();
+       ~iAudioTrackSelection();
+#endif
 public:
        virtual int getNumberOfTracks()=0;
        virtual RESULT selectTrack(unsigned int i)=0;
@@ -315,6 +349,10 @@ TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 
 class iSubserviceList: public iObject
 {
+#ifdef SWIG
+       iSubserviceList();
+       ~iSubserviceList();
+#endif
 public:
        virtual int getNumberOfSubservices()=0;
        virtual SWIG_VOID(RESULT) getSubservice(eServiceReference &SWIG_OUTPUT, unsigned int n)=0;
@@ -324,19 +362,49 @@ TEMPLATE_TYPEDEF(ePtr<iSubserviceList>, iSubserviceListPtr);
 
 class iTimeshiftService: public iObject
 {
+#ifdef SWIG
+       iTimeshiftService();
+       ~iTimeshiftService();
+#endif
 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);
 
+       /* not related to eCueSheet */
+class iCueSheet: public iObject
+{
+#ifdef SWIG
+       iCueSheet();
+       ~iCueSheet();
+#endif
+public:
+                       /* returns a list of (pts, what)-tuples */
+       virtual PyObject *getCutList() = 0;
+       virtual void setCutList(PyObject *list) = 0;
+       enum { cutIn = 0, cutOut = 1, cutMark = 2 };
+};
+
+TEMPLATE_TYPEDEF(ePtr<iCueSheet>, iCueSheetPtr);
+
 class iPlayableService: public iObject
 {
+#ifdef SWIG
+       iPlayableService();
+       ~iPlaybleService();
+#endif
        friend class iServiceHandler;
 public:
        enum
        {
+                       /* these first two events are magical, and should only
+                          be generated if you know what you're doing. */
                evStart,
                evEnd,
                
@@ -344,6 +412,15 @@ public:
                        // when iServiceInformation is implemented:
                evUpdatedEventInfo,
                evUpdatedInfo,
+
+                       /* when seek() is implemented: */               
+               evSeekableStatusChanged, /* for example when timeshifting */
+               
+               evEOF,
+               evSOF, /* bounced against start of file (when seeking backwards) */
+               
+                       /* only when cueSheet is implemented */
+               evCuesheetChanged,
        };
        virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
        virtual RESULT start()=0;
@@ -355,12 +432,17 @@ public:
        virtual SWIG_VOID(RESULT) subServices(ePtr<iSubserviceList> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) frontendStatusInfo(ePtr<iFrontendStatusInformation> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) timeshift(ePtr<iTimeshiftService> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) cueSheet(ePtr<iCueSheet> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
 class iRecordableService: public iObject
 {
+#ifdef SWIG
+       iRecordableService();
+       ~iRecordableService();
+#endif
 public:
        virtual RESULT prepare(const char *filename)=0;
        virtual RESULT start()=0;
@@ -373,6 +455,10 @@ TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
 
 class iMutableServiceList: public iObject
 {
+#ifdef SWIG
+       iMutableServiceList();
+       ~iMutableServiceList();
+#endif
 public:
                /* flush changes */
        virtual RESULT flushChanges()=0;
@@ -383,16 +469,23 @@ public:
                /* 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)=0;
-       
+       virtual RESULT getContent(std::list<eServiceReference> &list, bool sorted=false)=0;
+       virtual RESULT getContent(PyObject *list, bool sorted=false)=0;
+
                /* new, shiny interface: streaming. */
        virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;
        
@@ -408,6 +501,7 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
 
+#ifndef SWIG
        /* a helper class which can be used as argument to stl's sort(). */
 class iListableServiceCompare
 {
@@ -419,9 +513,14 @@ public:
                return m_list->compareLessEqual(a, b);
        }
 };
+#endif
 
 class iServiceOfflineOperations: public iObject
 {
+#ifdef SWIG
+       iServiceOfflineOperations();
+       ~iServiceOfflineOperations();
+#endif
 public:
                /* to delete a service, forever. */
        virtual RESULT deleteFromDisk(int simulate=1)=0;
@@ -436,6 +535,10 @@ TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
 
 class iServiceHandler: public iObject
 {
+#ifdef SWIG
+       iServiceHandler();
+       ~iServiceHandler();
+#endif
 public:
        virtual SWIG_VOID(RESULT) play(const eServiceReference &, ePtr<iPlayableService> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) record(const eServiceReference &, ePtr<iRecordableService> &SWIG_OUTPUT)=0;