remove unneeded

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index b68c014bd7e77d93bf009830bbc701534fe96b21..c1c0377f6e584f7c2c3d558551300c4b249796a9 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -9,6 +9,7 @@
 #include <linux/dvb/frontend.h>
 #define FRONTENDPARAMETERS struct dvb_frontend_parameters
 #endif
 #include <linux/dvb/frontend.h>
 #define FRONTENDPARAMETERS struct dvb_frontend_parameters
 #endif

+#include <lib/dvb/frontendparms.h>

 #include <lib/base/object.h>
 #include <lib/base/ebase.h>
 #include <lib/service/service.h>
 #include <lib/base/object.h>
 #include <lib/base/ebase.h>
 #include <lib/service/service.h>


@@ -18,7 +19,7 @@
 struct eBouquet
 {
        std::string m_bouquet_name;
 struct eBouquet
 {
        std::string m_bouquet_name;

-       std::string m_path;
+       std::string m_filename;  // without path.. just name

        typedef std::list<eServiceReference> list;
        list m_services;
 // the following four methods are implemented in db.cpp
        typedef std::list<eServiceReference> list;
        list m_services;
 // the following four methods are implemented in db.cpp


@@ -28,7 +29,16 @@ struct eBouquet
        RESULT moveService(const eServiceReference &, unsigned int);
 };
 
        RESULT moveService(const eServiceReference &, unsigned int);
 };
 

-               // bitte KEINE operator int() definieren, sonst bringt das ganze nix!
+               /* these structures have by intention no operator int() defined.
+                  the reason of these structures is to avoid mixing for example
+                  a onid and a tsid (as there's no general order for them).
+                  
+                  defining an operator int() would implicitely convert values
+                  between them over the constructor with the int argument.
+                  
+                  'explicit' doesn't here - eTransportStreamID(eOriginalNetworkID(n)) 
+                  would still work. */
+

 struct eTransportStreamID
 {
 private:
 struct eTransportStreamID
 {
 private:


@@ -143,6 +153,12 @@ struct eServiceReferenceDVB: public eServiceReference
        eDVBNamespace getDVBNamespace() const { return eDVBNamespace(data[4]); }
        void setDVBNamespace(eDVBNamespace dvbnamespace) { data[4]=dvbnamespace.get(); }
 
        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)
        {
        eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
                :eServiceReference(eServiceReference::idDVB, 0)
        {


@@ -197,6 +213,8 @@ public:
        std::string m_service_name, m_service_name_sort;
        std::string m_provider_name;
        
        std::string m_service_name, m_service_name_sort;
        std::string m_provider_name;
        

+       void genSortName();
+       

        int m_flags;
        std::set<int> m_ca;
        std::map<int,int> m_cache;
        int m_flags;
        std::set<int> m_ca;
        std::map<int,int> m_cache;


@@ -206,8 +224,9 @@ public:
        
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);
        
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);

-       int getLength(const eServiceReference &ref);
-       
+       RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
+       bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+

                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };
                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };


@@ -267,105 +286,13 @@ 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 flush()=0;

 
        virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 
        virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
 };
 
 
        virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 
        virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
 };
 

-class SatelliteDeliverySystemDescriptor;
-class CableDeliverySystemDescriptor;
-class TerrestrialDeliverySystemDescriptor;
-
-struct eDVBFrontendParametersSatellite
-{
-       struct Polarisation
-       {
-               enum {
-                       Horizontal, Vertical, CircularLeft, CircularRight
-               };
-       };
-       struct Inversion
-       {
-               enum {
-                       On, Off, Unknown
-               };
-       };
-       struct FEC
-       {
-               enum {
-                       fNone, f1_2, f2_3, f3_4, f5_6, f7_8, fAuto
-               };
-       };
-       unsigned int frequency, symbol_rate;
-       int polarisation, fec, inversion, orbital_position;
-       
-       void set(const SatelliteDeliverySystemDescriptor  &);
-};
-
-struct eDVBFrontendParametersCable
-{
-       unsigned int frequency, symbol_rate;
-       int modulation, inversion, fec_inner;
-       void set(const CableDeliverySystemDescriptor  &);
-};
-
-struct eDVBFrontendParametersTerrestrial
-{
-       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  &);
-};
-

 class iDVBFrontendParameters: public iObject
 {
 public:
 class iDVBFrontendParameters: public iObject
 {
 public:


@@ -423,14 +350,25 @@ public:
        virtual RESULT sendToneburst(int burst)=0;
        virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
        virtual RESULT setSecSequence(const eSecCommandList &list)=0;
        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;
        virtual RESULT getData(int num, int &data)=0;
        virtual RESULT setData(int num, int val)=0;

+       
+               /* 0 means: not compatible. other values are a priority. */
+       virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;

 };
 
 class iDVBSatelliteEquipmentControl: public iObject
 {
 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
 };
 
 struct eDVBCIRouting


@@ -486,9 +424,14 @@ public:
        virtual RESULT playFile(const char *file) = 0;
        
        virtual RESULT getLength(pts_t &pts) = 0;
        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, int mode) = 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;
 };
 
 class iDVBSectionReader;


@@ -501,7 +444,7 @@ public:
        virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
        virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
        virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
        virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
        virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
        virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &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;
 };
        virtual RESULT getCADemuxID(uint8_t &id)=0;
        virtual RESULT flush()=0;
 };


@@ -531,6 +474,9 @@ public:
                /** Continue after freeze. */
        virtual RESULT unfreeze()=0;
        
                /** Continue after freeze. */
        virtual RESULT unfreeze()=0;
        

+               /** fast forward by skipping frames. 0 is disabled, 2 is twice-the-speed, ... */
+       virtual RESULT setFastForward(int skip=0)=0;
+       

                // stop on .. Picture
        enum { spm_I, spm_Ref, spm_Any };
                /** Stop on specific decoded picture. For I-Frame display. */
                // stop on .. Picture
        enum { spm_I, spm_Ref, spm_Any };
                /** Stop on specific decoded picture. For I-Frame display. */


@@ -546,6 +492,8 @@ public:
        enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
                /** Set Zoom. mode *must* be fitting. */
        virtual RESULT setZoom(int what)=0;
        enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
                /** Set Zoom. mode *must* be fitting. */
        virtual RESULT setZoom(int what)=0;

+       
+       virtual RESULT setTrickmode(int what) = 0;

 };
 
 #endif
 };
 
 #endif