git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add stop service
[enigma2.git]
/
lib
/
dvb
/
idvb.h
diff --git
a/lib/dvb/idvb.h
b/lib/dvb/idvb.h
index 764c4556d800daa0de4ca92ba107ce4433536cc1..bd528f0657a79b6496d3780d4899b560150dfe00 100644
(file)
--- a/
lib/dvb/idvb.h
+++ b/
lib/dvb/idvb.h
@@
-15,6
+15,13
@@
#include <libsig_comp.h>
#include <connection.h>
#include <libsig_comp.h>
#include <connection.h>
+struct eBouquet
+{
+ std::string m_bouquet_name;
+ std::string m_path;
+ std::list<eServiceReference> m_services;
+};
+
// bitte KEINE operator int() definieren, sonst bringt das ganze nix!
struct eTransportStreamID
{
// bitte KEINE operator int() definieren, sonst bringt das ganze nix!
struct eTransportStreamID
{
@@
-237,6
+244,7
@@
public:
/* sort is only valid in root, and must be from the enum above. */
int m_sort;
/* sort is only valid in root, and must be from the enum above. */
int m_sort;
+ std::string m_bouquet_name;
static RESULT compile(ePtr<eDVBChannelQuery> &res, std::string query);
static RESULT compile(ePtr<eDVBChannelQuery> &res, std::string query);
@@
-254,7
+262,9
@@
public:
virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
- virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query)=0;
+ virtual RESULT getBouquet(const eServiceReference &ref, const eBouquet* &bouquet)=0;
+
+ virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
};
class SatelliteDeliverySystemDescriptor;
};
class SatelliteDeliverySystemDescriptor;
@@
-391,7
+401,8
@@
public:
stateIdle = 0,
stateTuning = 1,
stateFailed = 2,
stateIdle = 0,
stateTuning = 1,
stateFailed = 2,
- stateLock = 3
+ stateLock = 3,
+ stateLostLock = 4,
};
virtual RESULT getState(int &state)=0;
enum {
};
virtual RESULT getState(int &state)=0;
enum {
@@
-428,6
+439,7
@@
public:
{
state_idle, /* not yet tuned */
state_tuning, /* currently tuning (first time) */
{
state_idle, /* not yet tuned */
state_tuning, /* currently tuning (first time) */
+ state_failed, /* tuning failed. */
state_unavailable, /* currently unavailable, will be back without further interaction */
state_ok, /* ok */
state_release /* channel is being shut down. */
state_unavailable, /* currently unavailable, will be back without further interaction */
state_ok, /* ok */
state_release /* channel is being shut down. */
@@
-468,6
+480,7
@@
public:
virtual RESULT getLength(pts_t &pts) = 0;
virtual RESULT getCurrentPosition(pts_t &pos) = 0;
virtual RESULT getLength(pts_t &pts) = 0;
virtual RESULT getCurrentPosition(pts_t &pos) = 0;
+ virtual RESULT seekTo(pts_t &pts) = 0;
// seekTo ...
};
// seekTo ...
};
@@
-484,6
+497,7
@@
public:
virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
virtual RESULT getSTC(pts_t &pts)=0;
virtual RESULT getCADemuxID(uint8_t &id)=0;
virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
virtual RESULT getSTC(pts_t &pts)=0;
virtual RESULT getCADemuxID(uint8_t &id)=0;
+ virtual RESULT flush()=0;
};
class iTSMPEGDecoder: public iObject
};
class iTSMPEGDecoder: public iObject