implement streamableService for playing dvb services

[enigma2.git] / lib / dvb / idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a8f361a4008afc0d551f73cfc000ed04ca86b6fc..14d6ebb0e4de361362fabbb13dc66c609c68eef2 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -1,11 +1,14 @@
 #ifndef __dvb_idvb_h
 #define __dvb_idvb_h
 
 #ifndef __dvb_idvb_h
 #define __dvb_idvb_h
 

+#ifndef SWIG
+

 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
 #define FRONTENDPARAMETERS FrontendParameters
 #else
 #include <linux/dvb/frontend.h>
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
 #define FRONTENDPARAMETERS FrontendParameters
 #else
 #include <linux/dvb/frontend.h>

+#include <linux/dvb/video.h>

 #define FRONTENDPARAMETERS struct dvb_frontend_parameters
 #endif
 #include <lib/dvb/frontendparms.h>
 #define FRONTENDPARAMETERS struct dvb_frontend_parameters
 #endif
 #include <lib/dvb/frontendparms.h>


@@ -16,6 +19,55 @@
 #include <libsig_comp.h>
 #include <connection.h>
 
 #include <libsig_comp.h>
 #include <connection.h>
 

+#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 )  // check if gcc version >= 3.1
+#include <ext/slist>
+#define CAID_LIST __gnu_cxx::slist<uint16_t>
+#else
+#include <slist>
+#define CAID_LIST std::slist<uint16_t>
+#endif
+
+#ifndef DMX_FILTER_SIZE
+#define DMX_FILTER_SIZE   16
+#endif
+
+struct eDVBSectionFilterMask
+{
+       int pid;
+               /* mode is 0 for positive, 1 for negative filtering */
+       __u8 data[DMX_FILTER_SIZE], mask[DMX_FILTER_SIZE], mode[DMX_FILTER_SIZE];
+       enum {
+               rfCRC=1,
+               rfNoAbort=2
+       };
+       int flags;
+};
+
+struct eDVBTableSpec
+{
+       int pid, tid, tidext, tid_mask, tidext_mask;
+       int version;
+       int timeout;        /* timeout in ms */
+       enum
+       {
+               tfInOrder=1,
+               /*
+                       tfAnyVersion      filter ANY version
+                       0                 filter all EXCEPT given version (negative filtering)
+                       tfThisVersion     filter only THIS version
+               */
+               tfAnyVersion=2,
+               tfThisVersion=4,
+               tfHaveTID=8,
+               tfHaveTIDExt=16,
+               tfCheckCRC=32,
+               tfHaveTimeout=64,
+               tfHaveTIDMask=128,
+               tfHaveTIDExtMask=256
+       };
+       int flags;
+};
+

 struct eBouquet
 {
        std::string m_bouquet_name;
 struct eBouquet
 {
        std::string m_bouquet_name;


@@ -24,7 +76,7 @@ struct eBouquet
        list m_services;
 // the following five methods are implemented in db.cpp
        RESULT flushChanges();
        list m_services;
 // the following five methods are implemented in db.cpp
        RESULT flushChanges();

-       RESULT addService(const eServiceReference &);
+       RESULT addService(const eServiceReference &, eServiceReference before=eServiceReference());

        RESULT removeService(const eServiceReference &);
        RESULT moveService(const eServiceReference &, unsigned int);
        RESULT setListName(const std::string &name);
        RESULT removeService(const eServiceReference &);
        RESULT moveService(const eServiceReference &, unsigned int);
        RESULT setListName(const std::string &name);


@@ -160,6 +212,20 @@ struct eServiceReferenceDVB: public eServiceReference
        eTransportStreamID getParentTransportStreamID() const { return eTransportStreamID(data[6]); }
        void setParentTransportStreamID( eTransportStreamID tsid ) { data[6]=tsid.get(); }
 
        eTransportStreamID getParentTransportStreamID() const { return eTransportStreamID(data[6]); }
        void setParentTransportStreamID( eTransportStreamID tsid ) { data[6]=tsid.get(); }
 

+       eServiceReferenceDVB getParentServiceReference() const
+       {
+               eServiceReferenceDVB tmp(*this);
+               if (data[5] && data[6])
+               {
+                       tmp.data[1] = data[5];
+                       tmp.data[2] = data[6];
+                       tmp.data[5] = tmp.data[6] = 0;
+               }
+               else
+                       tmp.type = idInvalid;
+               return tmp;
+       }
+

        eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
                :eServiceReference(eServiceReference::idDVB, 0)
        {
        eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
                :eServiceReference(eServiceReference::idDVB, 0)
        {


@@ -204,15 +270,21 @@ class eDVBChannelQuery;
 class eDVBService: public iStaticServiceInformation
 {
        DECLARE_REF(eDVBService);
 class eDVBService: public iStaticServiceInformation
 {
        DECLARE_REF(eDVBService);

+       int *m_cache;
+       void initCache();
+       void copyCache(int *source);

 public:
        enum cacheID
        {
 public:
        enum cacheID
        {

-               cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cacheMax
+               cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
+               cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
+               cSUBTITLE, cacheMax

        };
 
        };
 

-       int getCachePID(cacheID);
-       void setCachePID(cacheID, int);
-       bool cacheEmpty() { return m_cache.empty(); }
+       int getCacheEntry(cacheID);
+       void setCacheEntry(cacheID, int);
+
+       bool cacheEmpty();

 
        eDVBService();
                /* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */
 
        eDVBService();
                /* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */


@@ -220,10 +292,21 @@ public:
        std::string m_provider_name;
        
        void genSortName();
        std::string m_provider_name;
        
        void genSortName();

-       
+

        int m_flags;
        int m_flags;

-       std::set<int> m_ca;
-       std::map<int,int> m_cache;
+       enum
+       {
+               dxNoSDT=1,    // don't get SDT
+//nyi  dxDontshow=2,
+               dxNoDVB=4,  // dont use PMT for this service ( use cached pids )
+               dxHoldName=8,
+               dxNewFound=64,
+       };
+
+       bool usePMT() const { return !(m_flags & dxNoDVB); }
+
+       CAID_LIST m_ca;
+

        virtual ~eDVBService();
        
        eDVBService &operator=(const eDVBService &);
        virtual ~eDVBService();
        
        eDVBService &operator=(const eDVBService &);


@@ -231,7 +314,8 @@ public:
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);
        RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);
        RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);

-       bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+       int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+       PyObject *getInfoObject(const eServiceReference &ref, int);  // implemented in lib/service/servicedvb.h

 
                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 
                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);


@@ -263,7 +347,9 @@ public:
                tSatellitePosition,
                tChannelID,
                tAND,
                tSatellitePosition,
                tChannelID,
                tAND,

-               tOR
+               tOR,
+               tAny,
+               tFlags

        };
        
        int m_type;
        };
        
        int m_type;


@@ -285,6 +371,13 @@ public:
 class iDVBChannelList: public iObject
 {
 public:
 class iDVBChannelList: public iObject
 {
 public:

+       virtual RESULT removeService(const eServiceReference &service)=0;
+       virtual RESULT removeServices(eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=0xFFFFFFFF)=0;
+       virtual RESULT removeServices(int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF)=0;
+       virtual RESULT addFlag(const eServiceReference &service, unsigned int flagmask=0xFFFFFFFF)=0;
+       virtual RESULT removeFlag(const eServiceReference &service, unsigned int flagmask=0xFFFFFFFF)=0;
+       virtual RESULT removeFlags(unsigned int flagmask, eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=0xFFFFFFFF)=0;
+       virtual RESULT removeFlags(unsigned int flagmask, int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF)=0;

        virtual RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)=0;
        virtual RESULT removeChannel(const eDVBChannelID &id)=0;
        
        virtual RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)=0;
        virtual RESULT removeChannel(const eDVBChannelID &id)=0;
        


@@ -299,77 +392,92 @@ public:
        virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
 };
 
        virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
 };
 

+#endif  // SWIG
+

 class iDVBFrontendParameters: public iObject
 {
 class iDVBFrontendParameters: public iObject
 {

+#ifdef SWIG
+       iDVBFrontendParameters();
+       ~iDVBFrontendParameters();
+#endif

 public:
 public:

-       virtual RESULT getSystem(int &type) const = 0;
-       virtual RESULT getDVBS(eDVBFrontendParametersSatellite &p) const = 0;
-       virtual RESULT getDVBC(eDVBFrontendParametersCable &p) const = 0;
-       virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &p) const = 0;
+       virtual RESULT getSystem(int &SWIG_OUTPUT) const = 0;
+       virtual RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const = 0;
+       virtual RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0;
+       virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0;

        
        

-       virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &diff) const = 0;
-       virtual RESULT getHash(unsigned long &hash) const = 0;
+       virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0;
+       virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;

 };
 
 #define MAX_DISEQC_LENGTH  16
 
 class eDVBDiseqcCommand
 {
 };
 
 #define MAX_DISEQC_LENGTH  16
 
 class eDVBDiseqcCommand
 {

+#ifndef SWIG

 public:
 public:

+#endif

        int len;
        __u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
        int tone;
        int voltage;
 #endif
        int len;
        __u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
        int tone;
        int voltage;
 #endif

+#ifdef SWIG
+public:
+#endif
+       void setCommandString(const char *str);

 };
 
 class iDVBSatelliteEquipmentControl;
 class eSecCommandList;
 
 };
 
 class iDVBSatelliteEquipmentControl;
 class eSecCommandList;
 

-class iDVBFrontend: public iObject
+class iDVBFrontend_ENUMS

 {
 {

+#ifdef SWIG
+       iDVBFrontend_ENUMS();
+       ~iDVBFrontend_ENUMS();
+#endif

 public:
 public:

-       enum {
-               feSatellite, feCable, feTerrestrial
-       };
-       virtual RESULT getFrontendType(int &type)=0;
+       enum { feSatellite, feCable, feTerrestrial };
+       enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock };
+       enum { toneOff, toneOn };
+       enum { voltageOff, voltage13, voltage18, voltage13_5, voltage18_5 };
+       enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber, signalPowerdB };
+};
+
+SWIG_IGNORE(iDVBFrontend);
+class iDVBFrontend: public iDVBFrontend_ENUMS, public iObject
+{
+public:
+       virtual RESULT getFrontendType(int &SWIG_OUTPUT)=0;

        virtual RESULT tune(const iDVBFrontendParameters &where)=0;
        virtual RESULT tune(const iDVBFrontendParameters &where)=0;

+#ifndef SWIG

        virtual RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)=0;
        virtual RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)=0;

-       enum {
-               stateIdle = 0,
-               stateTuning = 1,
-               stateFailed = 2,
-               stateLock = 3,
-               stateLostLock = 4,
-       };
-       virtual RESULT getState(int &state)=0;
-       enum {
-               toneOff, toneOn
-       };
+#endif
+       virtual RESULT getState(int &SWIG_OUTPUT)=0;

        virtual RESULT setTone(int tone)=0;
        virtual RESULT setTone(int tone)=0;

-       enum {
-               voltageOff, voltage13, voltage18, voltage13_5, voltage18_5
-       };

        virtual RESULT setVoltage(int voltage)=0;
        virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0;
        virtual RESULT sendToneburst(int burst)=0;
        virtual RESULT setVoltage(int voltage)=0;
        virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0;
        virtual RESULT sendToneburst(int burst)=0;

+#ifndef SWIG

        virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
        virtual RESULT setSecSequence(const eSecCommandList &list)=0;
        virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
        virtual RESULT setSecSequence(const eSecCommandList &list)=0;

-
-       enum {
-               bitErrorRate, signalPower, signalQuality, Locked, Synced
-       };
+#endif

        virtual int readFrontendData(int type)=0;
        virtual int readFrontendData(int type)=0;

-       virtual PyObject *readTransponderData()=0;
-
+       virtual void getFrontendStatus(SWIG_PYOBJECT(ePyObject) dest)=0;
+       virtual void getTransponderData(SWIG_PYOBJECT(ePyObject) dest, bool original)=0;
+       virtual void getFrontendData(SWIG_PYOBJECT(ePyObject) dest)=0;
+#ifndef SWIG

        virtual RESULT getData(int num, int &data)=0;
        virtual RESULT setData(int num, int val)=0;
        virtual RESULT getData(int num, int &data)=0;
        virtual RESULT setData(int num, int val)=0;

-       

                /* 0 means: not compatible. other values are a priority. */
        virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
                /* 0 means: not compatible. other values are a priority. */
        virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;

+#endif

 };
 };

+SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontend>, iDVBFrontendPtr);

 
 

+#ifndef SWIG

 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:


@@ -382,10 +490,15 @@ struct eDVBCIRouting
 {
        int enabled;
 };
 {
        int enabled;
 };

+#endif // SWIG

 
 

+SWIG_IGNORE(iDVBChannel);

 class iDVBChannel: public iObject
 {
 public:
 class iDVBChannel: public iObject
 {
 public:

+               /* direct frontend access for raw channels and/or status inquiries. */
+       virtual SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
+#ifndef SWIG

        enum
        {
                state_idle,        /* not yet tuned */
        enum
        {
                state_idle,        /* not yet tuned */


@@ -396,15 +509,16 @@ public:
                state_last_instance, /* just one reference to this channel is left */
                state_release      /* channel is being shut down. */
        };
                state_last_instance, /* just one reference to this channel is left */
                state_release      /* channel is being shut down. */
        };

-       
+       virtual RESULT getState(int &SWIG_OUTPUT)=0;
+
+       virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;

        enum 
        {
                evtEOF, evtSOF, evtFailed
        };
        virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
        virtual RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection)=0;
        enum 
        {
                evtEOF, evtSOF, evtFailed
        };
        virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
        virtual RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection)=0;

-       virtual RESULT getState(int &state)=0;
-       
+

                /* demux capabilities */
        enum
        {
                /* demux capabilities */
        enum
        {


@@ -414,14 +528,14 @@ public:
        virtual RESULT setCIRouting(const eDVBCIRouting &routing)=0;
        virtual RESULT getDemux(ePtr<iDVBDemux> &demux, int cap=0)=0;
        
        virtual RESULT setCIRouting(const eDVBCIRouting &routing)=0;
        virtual RESULT getDemux(ePtr<iDVBDemux> &demux, int cap=0)=0;
        

-               /* direct frontend access for raw channels and/or status inquiries. */
-       virtual RESULT getFrontend(ePtr<iDVBFrontend> &frontend)=0;
-       

                /* use count handling */
        virtual void AddUse() = 0;
        virtual void ReleaseUse() = 0;
                /* use count handling */
        virtual void AddUse() = 0;
        virtual void ReleaseUse() = 0;

+#endif

 };
 };

+SWIG_TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);

 
 

+#ifndef SWIG

        /* signed, so we can express deltas. */
        
 typedef long long pts_t;
        /* signed, so we can express deltas. */
        
 typedef long long pts_t;


@@ -450,7 +564,7 @@ public:
        void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder);
        
                        /* frontend and backend */
        void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder);
        
                        /* frontend and backend */

-       eSingleLock m_lock;
+       eRdWrLock m_lock;

        
                        /* backend */
        enum { evtSeek, evtSkipmode, evtSpanChanged };
        
                        /* backend */
        enum { evtSeek, evtSkipmode, evtSpanChanged };


@@ -491,6 +605,7 @@ public:
 };
 
 class iDVBSectionReader;
 };
 
 class iDVBSectionReader;

+class iDVBPESReader;

 class iDVBTSRecorder;
 class iTSMPEGDecoder;
 
 class iDVBTSRecorder;
 class iTSMPEGDecoder;
 


@@ -498,24 +613,39 @@ class iDVBDemux: public iObject
 {
 public:
        virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
 {
 public:
        virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;

+       virtual RESULT createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader)=0;

        virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
        virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;

-       virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
+       virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary=1)=0;

        virtual RESULT getSTC(pts_t &pts, int num=0)=0;
        virtual RESULT getCADemuxID(uint8_t &id)=0;
        virtual RESULT flush()=0;
 };
 
        virtual RESULT getSTC(pts_t &pts, int num=0)=0;
        virtual RESULT getCADemuxID(uint8_t &id)=0;
        virtual RESULT flush()=0;
 };
 

+#if HAVE_DVB_API_VERSION < 3 && !defined(VIDEO_EVENT_SIZE_CHANGED)
+#define VIDEO_EVENT_SIZE_CHANGED 1
+#endif
+

 class iTSMPEGDecoder: public iObject
 {
 public:
        enum { pidDisabled = -1 };
 class iTSMPEGDecoder: public iObject
 {
 public:
        enum { pidDisabled = -1 };

-               /** Set Displayed Video PID */
-       virtual RESULT setVideoPID(int vpid)=0;
+               /** Set Displayed Video PID and type */
+       virtual RESULT setVideoPID(int vpid, int type)=0;

 
 

-       enum { af_MPEG, af_AC3, af_DTS };
+       enum { af_MPEG, af_AC3, af_DTS, af_AAC };

                /** Set Displayed Audio PID and type */
        virtual RESULT setAudioPID(int apid, int type)=0;
 
                /** Set Displayed Audio PID and type */
        virtual RESULT setAudioPID(int apid, int type)=0;
 

+       enum { ac_left, ac_stereo, ac_right };
+               /** Set Displayed Audio Channel */
+       virtual RESULT setAudioChannel(int channel)=0;
+       virtual int getAudioChannel()=0;
+
+       virtual RESULT setPCMDelay(int delay)=0;
+       virtual int getPCMDelay()=0;
+       virtual RESULT setAC3Delay(int delay)=0;
+       virtual int getAC3Delay()=0;
+

                /** Set Displayed Videotext PID */
        virtual RESULT setTextPID(int vpid)=0;
 
                /** Set Displayed Videotext PID */
        virtual RESULT setTextPID(int vpid)=0;
 


@@ -525,36 +655,53 @@ public:
                /** Set Sync mode to either audio or video master */
        virtual RESULT setSyncMaster(int who)=0;
 
                /** Set Sync mode to either audio or video master */
        virtual RESULT setSyncMaster(int who)=0;
 

-               /** Apply settings */
+               /** Apply settings with starting video */

        virtual RESULT start()=0;
        virtual RESULT start()=0;

-       
+               /** Apply settings but don't start yet */
+       virtual RESULT preroll()=0;
+

                /** Freeze frame. Either continue decoding (without display) or halt. */
        virtual RESULT freeze(int cont)=0;
                /** Continue after freeze. */
        virtual RESULT unfreeze()=0;
                /** Freeze frame. Either continue decoding (without display) or halt. */
        virtual RESULT freeze(int cont)=0;
                /** Continue after freeze. */
        virtual RESULT unfreeze()=0;

-       
+

                /** fast forward by skipping frames. 0 is disabled, 2 is twice-the-speed, ... */
        virtual RESULT setFastForward(int skip=0)=0;
                /** fast forward by skipping frames. 0 is disabled, 2 is twice-the-speed, ... */
        virtual RESULT setFastForward(int skip=0)=0;

-       
+

                // stop on .. Picture
        enum { spm_I, spm_Ref, spm_Any };
                /** Stop on specific decoded picture. For I-Frame display. */
        virtual RESULT setSinglePictureMode(int when)=0;
                // stop on .. Picture
        enum { spm_I, spm_Ref, spm_Any };
                /** Stop on specific decoded picture. For I-Frame display. */
        virtual RESULT setSinglePictureMode(int when)=0;

-       
+

        enum { pkm_B, pkm_PB };
                /** Fast forward by skipping either B or P/B pictures */
        virtual RESULT setPictureSkipMode(int what)=0;
        enum { pkm_B, pkm_PB };
                /** Fast forward by skipping either B or P/B pictures */
        virtual RESULT setPictureSkipMode(int what)=0;

-       
+

                /** Slow Motion by repeating pictures */
        virtual RESULT setSlowMotion(int repeat)=0;
        
        enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
                /** Set Zoom. mode *must* be fitting. */
        virtual RESULT setZoom(int what)=0;
                /** Slow Motion by repeating pictures */
        virtual RESULT setSlowMotion(int repeat)=0;
        
        enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
                /** Set Zoom. mode *must* be fitting. */
        virtual RESULT setZoom(int what)=0;

-       
+

        virtual RESULT setTrickmode(int what) = 0;
        virtual RESULT setTrickmode(int what) = 0;

-       
+

        virtual RESULT getPTS(int what, pts_t &pts) = 0;
        virtual RESULT getPTS(int what, pts_t &pts) = 0;

+
+       virtual RESULT showSinglePic(const char *filename) = 0;
+
+       virtual RESULT setRadioPic(const std::string &filename) = 0;
+
+       struct videoEvent
+       {
+               enum { eventUnknown = 0, eventSizeChanged = VIDEO_EVENT_SIZE_CHANGED } type;
+               unsigned char aspect;
+               unsigned short height;
+               unsigned short width;
+       };
+
+       virtual RESULT connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &connection) = 0;

 };
 
 };
 

+#endif //SWIG

 #endif
 #endif