#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>
#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;
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);
eServiceReferenceDVB getParentServiceReference() const
{
eServiceReferenceDVB tmp(*this);
- if (data[4] && data[5])
+ if (data[5] && data[6])
{
tmp.data[1] = data[5];
tmp.data[2] = data[6];
class eDVBService: public iStaticServiceInformation
{
DECLARE_REF(eDVBService);
+ int *m_cache;
+ void initCache();
+ void copyCache(int *source);
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. */
std::string m_provider_name;
void genSortName();
-
+
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 &);
// 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);
tSatellitePosition,
tChannelID,
tAND,
- tOR
+ tOR,
+ tAny,
+ tFlags
};
int m_type;
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 getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0;
virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0;
- virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &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;
};
class iDVBSatelliteEquipmentControl;
class eSecCommandList;
-class iDVBFrontend: public iObject
+class iDVBFrontend_ENUMS
+{
+#ifdef SWIG
+ iDVBFrontend_ENUMS();
+ ~iDVBFrontend_ENUMS();
+#endif
+public:
+ 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 };
+};
+
+SWIG_IGNORE(iDVBFrontend);
+class iDVBFrontend: public iDVBFrontend_ENUMS, public iObject
{
public:
- enum {
- feSatellite, feCable, feTerrestrial
- };
virtual RESULT getFrontendType(int &SWIG_OUTPUT)=0;
virtual RESULT tune(const iDVBFrontendParameters &where)=0;
#ifndef SWIG
virtual RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)=0;
#endif
- enum {
- stateIdle = 0,
- stateTuning = 1,
- stateFailed = 2,
- stateLock = 3,
- stateLostLock = 4,
- };
virtual RESULT getState(int &SWIG_OUTPUT)=0;
- enum {
- toneOff, toneOn
- };
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 setSEC(iDVBSatelliteEquipmentControl *sec)=0;
virtual RESULT setSecSequence(const eSecCommandList &list)=0;
#endif
- enum {
- bitErrorRate, signalPower, signalQuality, Locked, Synced
- };
virtual int readFrontendData(int type)=0;
virtual PyObject *readTransponderData(bool original)=0;
-
#ifndef SWIG
virtual RESULT getData(int num, int &data)=0;
virtual RESULT setData(int num, int val)=0;
virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
#endif
};
-TEMPLATE_TYPEDEF(ePtr<iDVBFrontend>, iDVBFrontendPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontend>, iDVBFrontendPtr);
#ifndef SWIG
class iDVBSatelliteEquipmentControl: public iObject
};
#endif // SWIG
+SWIG_IGNORE(iDVBChannel);
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 */
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;
-
- /* direct frontend access for raw channels and/or status inquiries. */
- virtual RESULT getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
+ virtual RESULT getState(int &SWIG_OUTPUT)=0;
-#ifndef SWIG
virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
enum
{
virtual void ReleaseUse() = 0;
#endif
};
-TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);
+SWIG_TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);
#ifndef SWIG
-
/* signed, so we can express deltas. */
typedef long long pts_t;
};
class iDVBSectionReader;
+class iDVBPESReader;
class iDVBTSRecorder;
class iTSMPEGDecoder;
{
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 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;
{
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;
+ 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;
virtual RESULT setTrickmode(int what) = 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
git.cweiske.de / enigma2.git / blobdiff