use ChoiceBox for audio selection (audio tracks are now sorted by description)

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 13f200811357e9f75f8e82c1274ac3eaf0dee16d..f4e28d2b4b3910e8853a9ba84fa1e0519ed179fd 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -165,7 +165,7 @@ struct eServiceReferenceDVB: public eServiceReference
        eServiceReferenceDVB getParentServiceReference() const
        {
                eServiceReferenceDVB tmp(*this);
-               if (data[4] && data[5])
+               if (data[5] && data[6])
                {
                        tmp.data[1] = data[5];
                        tmp.data[2] = data[6];
@@ -236,8 +236,21 @@ public:
        std::string m_provider_name;
        
        void genSortName();
-       
+
        int m_flags;
+       enum
+       {
+#if 0  // not yet implemented
+               dxNoSDT=1,    // don't get SDT
+               dxDontshow=2,
+               dxHoldName=8,
+               dxNewFound=64, // found in prev scan
+#endif
+               dxNoDVB=4  // dont use PMT for this service ( use cached pids )
+       };
+
+       bool usePMT() const { return !(m_flags & dxNoDVB); }
+
        std::set<int> m_ca;
        std::map<int,int> m_cache;
        virtual ~eDVBService();
@@ -279,7 +292,8 @@ public:
                tSatellitePosition,
                tChannelID,
                tAND,
-               tOR
+               tOR,
+               tAny
        };
        
        int m_type;
@@ -434,7 +448,7 @@ public:
        virtual RESULT getState(int &SWIG_OUTPUT)=0;    
 
                /* direct frontend access for raw channels and/or status inquiries. */
-       virtual RESULT getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
+       virtual RESULT getFrontend(ePtr<iDVBFrontend> &)=0;
 
 #ifndef SWIG
        virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
@@ -540,7 +554,7 @@ 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;
+       virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary=1)=0;
        virtual RESULT getSTC(pts_t &pts, int num=0)=0;
        virtual RESULT getCADemuxID(uint8_t &id)=0;
        virtual RESULT flush()=0;