- fixed bogus channel sharing

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 15796166dc596ba6fff75ff4c175d68aa59e8a73..0dc5ce5766e5ed0655ce3abb6679dac1ea881fab 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -77,6 +77,14 @@ struct eDVBChannelID
        eDVBNamespace dvbnamespace;
        eTransportStreamID transport_stream_id;
        eOriginalNetworkID original_network_id;
+       
+       bool operator==(const eDVBChannelID &c) const
+       {
+               return dvbnamespace == c.dvbnamespace &&
+                       transport_stream_id == c.transport_stream_id &&
+                       original_network_id == c.original_network_id;
+       }
+       
        bool operator<(const eDVBChannelID &c) const
        {
                if (dvbnamespace < c.dvbnamespace)
@@ -160,7 +168,7 @@ class eDVBChannelQuery;
 
 class eDVBService: public iStaticServiceInformation
 {
-       DECLARE_REF;
+       DECLARE_REF(eDVBService);
 public:
        eDVBService();
        std::string m_service_name;
@@ -194,7 +202,7 @@ public:
 
 class eDVBChannelQuery: public iObject
 {
-       DECLARE_REF;
+       DECLARE_REF(eDVBChannelQuery);
 public:
        enum
        {
@@ -223,27 +231,15 @@ public:
 class iDVBChannelList: public iObject
 {
 public:
+       virtual RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)=0;
+       virtual RESULT removeChannel(const eDVBChannelID &id)=0;
+       
        virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=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;
-};
 
-class iDVBResourceManager: public iObject
-{
-public:
-       /*
-                       solange rumloopen bis eine resource gefunden wurde, die eine frequenz
-                       tunen will
-                       
-                       wenn natuerlich sowas schon vorhanden ist, dann einfach ne ref darauf
-                       geben. (zwei services auf dem gleichen transponder teilen sich einen
-                       channel)
-       */
-       virtual RESULT setChannelList(iDVBChannelList *list)=0;
-       virtual RESULT getChannelList(ePtr<iDVBChannelList> &list)=0;
-       virtual RESULT allocateChannel(const eDVBChannelID &channel, ePtr<iDVBChannel> &channel)=0;
-       virtual RESULT allocateRawChannel(ePtr<iDVBChannel> &channel)=0;
-       virtual RESULT allocatePVRChannel(int caps)=0;
+       virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query)=0;
 };
 
 class SatelliteDeliverySystemDescriptor;
@@ -285,7 +281,57 @@ struct eDVBFrontendParametersCable
 
 struct eDVBFrontendParametersTerrestrial
 {
-       int unknown;
+       unsigned int frequency;
+       struct Bandwidth {
+               enum { Bw8MHz, Bw7MHz, Bw6MHz, BwAuto };
+       };
+       
+       struct FEC
+       {
+               enum {
+                       fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
+               };
+       };
+       
+       struct TransmissionMode {
+               enum {
+                       TM2k, TM8k, TMAuto
+               };
+       };
+       
+       struct GuardInterval {
+               enum {
+                       GI_1_32, GI_1_16, GI_1_8, GI_1_4, GI_Auto
+               };
+       };
+       
+       struct Hierarchy {
+               enum {
+                       HNone, H1, H2, H4, HAuto
+               };
+       };
+       
+       struct Modulation {
+               enum {
+                       QPSK, QAM16, Auto
+               };
+       };
+
+       struct Inversion
+       {
+               enum {
+                       On, Off, Unknown
+               };
+       };
+       
+       int bandwidth;
+       int code_rate_HP, code_rate_LP;
+       int modulation;
+       int transmission_mode;
+       int guard_interval;
+       int hierarchy;
+       int inversion;
+       
        void set(const TerrestrialDeliverySystemDescriptor  &);
 };
 
@@ -307,6 +353,10 @@ struct eDVBDiseqcCommand
 {
        int len;
        __u8 data[MAX_DISEQC_LENGTH];
+#if HAVE_DVB_API_VERSION < 3
+       int tone;
+       int voltage;
+#endif
 };
 
 class iDVBSatelliteEquipmentControl;
@@ -375,12 +425,14 @@ public:
 };
 
 class iDVBSectionReader;
+class iDVBTSRecorder;
 class iTSMPEGDecoder;
 
 class iDVBDemux: public iObject
 {
 public:
        virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
+       virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
        virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
 };