- fixed bogus channel sharing

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c201c1a47dbed1d7fb6719bc35c211c2dcaf8f46..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)
@@ -234,24 +242,6 @@ public:
        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;
-};
-
 class SatelliteDeliverySystemDescriptor;
 class CableDeliverySystemDescriptor;
 class TerrestrialDeliverySystemDescriptor;
@@ -363,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;
@@ -431,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;
 };