X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/740ae9b4a03c13901e4f4ffc008e4c0cfd63d896..4cdb4528bbff583dc193f24508157e96a0d95c59:/lib/dvb/idvb.h diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h index 6c45bb29..a8f361a4 100644 --- a/lib/dvb/idvb.h +++ b/lib/dvb/idvb.h @@ -1,7 +1,6 @@ #ifndef __dvb_idvb_h #define __dvb_idvb_h -#include #if HAVE_DVB_API_VERSION < 3 #include #define FRONTENDPARAMETERS FrontendParameters @@ -12,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -19,14 +19,15 @@ struct eBouquet { std::string m_bouquet_name; - std::string m_path; + std::string m_filename; // without path.. just name typedef std::list list; list m_services; -// the following four methods are implemented in db.cpp +// the following five methods are implemented in db.cpp RESULT flushChanges(); RESULT addService(const eServiceReference &); RESULT removeService(const eServiceReference &); RESULT moveService(const eServiceReference &, unsigned int); + RESULT setListName(const std::string &name); }; /* these structures have by intention no operator int() defined. @@ -185,6 +186,11 @@ struct eServiceReferenceDVB: public eServiceReference :eServiceReference(eServiceReference::idDVB, 0) { } + + eServiceReferenceDVB(const std::string &string) + :eServiceReference(string) + { + } }; @@ -343,7 +349,7 @@ public: }; virtual RESULT setTone(int tone)=0; enum { - voltageOff, voltage13, voltage18 + voltageOff, voltage13, voltage18, voltage13_5, voltage18_5 }; virtual RESULT setVoltage(int voltage)=0; virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0; @@ -352,9 +358,10 @@ public: virtual RESULT setSecSequence(const eSecCommandList &list)=0; enum { - bitErrorRate, signalPower, signalQuality + bitErrorRate, signalPower, signalQuality, Locked, Synced }; virtual int readFrontendData(int type)=0; + virtual PyObject *readTransponderData()=0; virtual RESULT getData(int num, int &data)=0; virtual RESULT setData(int num, int val)=0; @@ -366,7 +373,7 @@ public: class iDVBSatelliteEquipmentControl: public iObject { public: - virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)=0; + 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 void setRotorMoving(bool)=0; }; @@ -386,9 +393,16 @@ public: state_failed, /* tuning failed. */ state_unavailable, /* currently unavailable, will be back without further interaction */ state_ok, /* ok */ + state_last_instance, /* just one reference to this channel is left */ state_release /* channel is being shut down. */ }; + + enum + { + evtEOF, evtSOF, evtFailed + }; virtual RESULT connectStateChange(const Slot1 &stateChange, ePtr &connection)=0; + virtual RESULT connectEvent(const Slot2 &eventChange, ePtr &connection)=0; virtual RESULT getState(int &state)=0; /* demux capabilities */ @@ -409,8 +423,47 @@ public: }; /* signed, so we can express deltas. */ + typedef long long pts_t; +class iFilePushScatterGather; +class iTSMPEGDecoder; + + /* note that a cue sheet describes the logical positions. thus + everything is specified in pts and not file positions */ + + /* implemented in dvb.cpp */ +class eCueSheet: public iObject, public Object +{ + DECLARE_REF(eCueSheet); +public: + eCueSheet(); + + /* frontend */ + void seekTo(int relative, const pts_t &pts); + + void clear(); + void addSourceSpan(const pts_t &begin, const pts_t &end); + void commitSpans(); + + void setSkipmode(const pts_t &ratio); /* 90000 is 1:1 */ + void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder); + + /* frontend and backend */ + eSingleLock m_lock; + + /* backend */ + enum { evtSeek, evtSkipmode, evtSpanChanged }; + RESULT connectEvent(const Slot1 &event, ePtr &connection); + + std::list > m_spans; /* begin, end */ + std::list > m_seek_requests; /* relative, delta */ + pts_t m_skipmode_ratio; + Signal1 m_event; + ePtr m_decoding_demux; + ePtr m_decoder; +}; + class iDVBPVRChannel: public iDVBChannel { public: @@ -420,18 +473,21 @@ public: }; /* FIXME: there are some very ugly buffer-end and ... related problems */ - /* so this is VERY UGLY. */ + /* so this is VERY UGLY. + + ok, it's going to get better. but still...*/ virtual RESULT playFile(const char *file) = 0; + virtual void stopFile() = 0; + + virtual void setCueSheet(eCueSheet *cuesheet) = 0; virtual RESULT getLength(pts_t &pts) = 0; /* we explicitely ask for the decoding demux here because a channel can be shared between multiple decoders. - Of couse skipping doesn't make much sense - then, but getCurrentPosition does. */ - virtual RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos) = 0; - virtual RESULT seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) = 0; - virtual RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &pts) = 0; + */ + virtual RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode) = 0; + /* skipping must be done with a cue sheet */ }; class iDVBSectionReader; @@ -444,7 +500,7 @@ public: virtual RESULT createSectionReader(eMainloop *context, ePtr &reader)=0; virtual RESULT createTSRecorder(ePtr &recorder)=0; virtual RESULT getMPEGDecoder(ePtr &reader)=0; - virtual RESULT getSTC(pts_t &pts)=0; + virtual RESULT getSTC(pts_t &pts, int num=0)=0; virtual RESULT getCADemuxID(uint8_t &id)=0; virtual RESULT flush()=0; }; @@ -460,12 +516,15 @@ public: /** Set Displayed Audio PID and type */ virtual RESULT setAudioPID(int apid, int type)=0; + /** Set Displayed Videotext PID */ + virtual RESULT setTextPID(int vpid)=0; + /** Set Sync mode to PCR */ virtual RESULT setSyncPCR(int pcrpid)=0; enum { sm_Audio, sm_Video }; /** Set Sync mode to either audio or video master */ virtual RESULT setSyncMaster(int who)=0; - + /** Apply settings */ virtual RESULT start()=0; @@ -494,6 +553,8 @@ public: virtual RESULT setZoom(int what)=0; virtual RESULT setTrickmode(int what) = 0; + + virtual RESULT getPTS(int what, pts_t &pts) = 0; }; #endif