remove unneeded code

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c57fae9aa0a134d27f0ca95ef1f21f51c36878a0..742a3a32cca0bfefd1be9bc6cf8761dfb35e40d8 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -153,6 +153,12 @@ struct eServiceReferenceDVB: public eServiceReference
        eDVBNamespace getDVBNamespace() const { return eDVBNamespace(data[4]); }
        void setDVBNamespace(eDVBNamespace dvbnamespace) { data[4]=dvbnamespace.get(); }
 
+       eServiceID getParentServiceID() const { return eServiceID(data[5]); }
+       void setParentServiceID( eServiceID sid ) { data[5]=sid.get(); }
+
+       eTransportStreamID getParentTransportStreamID() const { return eTransportStreamID(data[6]); }
+       void setParentTransportStreamID( eTransportStreamID tsid ) { data[6]=tsid.get(); }
+
        eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
                :eServiceReference(eServiceReference::idDVB, 0)
        {
@@ -218,8 +224,9 @@ public:
        
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);
-       int getLength(const eServiceReference &ref);
-       
+       RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr);
+       bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+
                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };
@@ -279,6 +286,7 @@ public:
        
        virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
        virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
+       virtual RESULT flush()=0;
 
        virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 
@@ -342,6 +350,12 @@ public:
        virtual RESULT sendToneburst(int burst)=0;
        virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
        virtual RESULT setSecSequence(const eSecCommandList &list)=0;
+
+       enum {
+               bitErrorRate, signalPower, signalQuality
+       };
+       virtual int readFrontendData(int type)=0;
+
        virtual RESULT getData(int num, int &data)=0;
        virtual RESULT setData(int num, int val)=0;
        
@@ -352,8 +366,9 @@ public:
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
-       virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)=0;
+       virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
        virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id)=0;
+       virtual void setRotorMoving(bool)=0;
 };
 
 struct eDVBCIRouting
@@ -409,9 +424,14 @@ public:
        virtual RESULT playFile(const char *file) = 0;
        
        virtual RESULT getLength(pts_t &pts) = 0;
-       virtual RESULT getCurrentPosition(pts_t &pos) = 0;
-       virtual RESULT seekTo(int relative, pts_t &pts) = 0;
-       virtual RESULT seekToPosition(const off_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;
 };
 
 class iDVBSectionReader;