#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;
enum
{
dxNoSDT=1, // don't get SDT
-//nyi dxDontshow=2,
+ dxDontshow=2,
dxNoDVB=4, // dont use PMT for this service ( use cached pids )
dxHoldName=8,
dxNewFound=64,
};
bool usePMT() const { return !(m_flags & dxNoDVB); }
+ bool isHidden() const { return m_flags & dxDontshow; }
CAID_LIST m_ca;
// iStaticServiceInformation
RESULT getName(const eServiceReference &ref, std::string &name);
RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
- int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+ int isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate=false);
PyObject *getInfoObject(const eServiceReference &ref, int); // implemented in lib/service/servicedvb.h
/* for filtering: */
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 removeServices(iDVBFrontendParameters *feparm)=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;
~iDVBFrontendParameters();
#endif
public:
- 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 &SWIG_OUTPUT, bool exact) const = 0;
- virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;
+ enum { flagOnlyFree = 1 };
+ virtual SWIG_VOID(RESULT) getSystem(int &SWIG_OUTPUT) const = 0;
+ virtual SWIG_VOID(RESULT) getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const = 0;
+ virtual SWIG_VOID(RESULT) getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0;
+ virtual SWIG_VOID(RESULT) getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0;
+ virtual SWIG_VOID(RESULT) getFlags(unsigned int &SWIG_OUTPUT) const = 0;
+#ifndef SWIG
+ virtual SWIG_VOID(RESULT) calculateDifference(const iDVBFrontendParameters *parm, int &, bool exact) const = 0;
+ virtual SWIG_VOID(RESULT) getHash(unsigned long &) const = 0;
+ virtual SWIG_VOID(RESULT) calcLockTimeout(unsigned int &) const = 0;
+#endif
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontendParameters>, iDVBFrontendParametersPtr);
#define MAX_DISEQC_LENGTH 16
#endif
public:
enum { feSatellite, feCable, feTerrestrial };
- enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock };
+ enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock, stateClosed };
enum { toneOff, toneOn };
enum { voltageOff, voltage13, voltage18, voltage13_5, voltage18_5 };
- enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber };
+ enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber, signalQualitydB };
};
SWIG_IGNORE(iDVBFrontend);
virtual RESULT setSecSequence(const eSecCommandList &list)=0;
#endif
virtual int readFrontendData(int type)=0;
- virtual PyObject *readTransponderData(bool original)=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, long &data)=0;
+ virtual RESULT setData(int num, long val)=0;
/* 0 means: not compatible. other values are a priority. */
virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
#endif
class iDVBSatelliteEquipmentControl: public iObject
{
public:
- virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
- virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id)=0;
+ virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int timeout)=0;
+ virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id, int *highest_score_lnb=0)=0;
virtual void setRotorMoving(bool)=0;
};
public:
/* direct frontend access for raw channels and/or status inquiries. */
virtual SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
+ virtual RESULT requestTsidOnid(SWIG_PYOBJECT(ePyObject) callback) { return -1; }
#ifndef SWIG
enum
{
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 getState(int &)=0;
virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
enum
void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder);
/* frontend and backend */
- eSingleLock m_lock;
+ eRdWrLock m_lock;
/* backend */
enum { evtSeek, evtSkipmode, evtSpanChanged };
virtual RESULT flush()=0;
};
+#if HAVE_DVB_API_VERSION < 3 && !defined(VIDEO_EVENT_SIZE_CHANGED)
+#define VIDEO_EVENT_SIZE_CHANGED 1
+#define VIDEO_EVENT_FRAME_RATE_CHANGED 2
+#endif
+
class iTSMPEGDecoder: public iObject
{
public:
/** 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;
-
+ /** 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;
-
+
/** 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;
-
+
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;
-
+
virtual RESULT setTrickmode(int what) = 0;
-
+
virtual RESULT getPTS(int what, pts_t &pts) = 0;
virtual RESULT showSinglePic(const char *filename) = 0;
struct videoEvent
{
- enum { eventUnknown = 0, eventSizeChanged = VIDEO_EVENT_SIZE_CHANGED } type;
+ enum { eventUnknown = 0,
+ eventSizeChanged = VIDEO_EVENT_SIZE_CHANGED,
+ eventFrameRateChanged = VIDEO_EVENT_FRAME_RATE_CHANGED,
+ eventProgressiveChanged = 16
+ } type;
unsigned char aspect;
unsigned short height;
unsigned short width;
+ bool progressive;
+ unsigned short framerate;
};
virtual RESULT connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &connection) = 0;
+
+ virtual int getVideoWidth() = 0;
+ virtual int getVideoHeight() = 0;
+ virtual int getVideoProgressive() = 0;
+ virtual int getVideoFrameRate() = 0;
+ virtual int getVideoAspect() = 0;
};
#endif //SWIG