fixed invalid cast of an rvalue by adding a string constructor to class eServiceRefer...

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 6c45bb2909d0ed0d10cada59976b86ad0137b23d..5b6f19fc806b0ea126d655c13e82ec91d473271c 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -19,7 +19,7 @@
 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
@@ -185,6 +185,11 @@ struct eServiceReferenceDVB: public eServiceReference
                :eServiceReference(eServiceReference::idDVB, 0)
        {
        }
+
+       eServiceReferenceDVB(const std::string &string)
+               :eServiceReference(string)
+       {
+       }
 };
 
 
@@ -343,7 +348,7 @@ public:
        };
        virtual RESULT setTone(int tone)=0;
        enum {
-               voltageOff, voltage13, voltage18
+               voltageOff, voltage13, voltage18, voltage13_5, voltage18_5
        };
        virtual RESULT setVoltage(int voltage)=0;
        virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0;
@@ -388,7 +393,13 @@ public:
                state_ok,          /* ok */
                state_release      /* channel is being shut down. */
        };
+       
+       enum 
+       {
+               evtEOF, evtFailed
+       };
        virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
+       virtual RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection)=0;
        virtual RESULT getState(int &state)=0;
        
                /* demux capabilities */
@@ -429,7 +440,7 @@ public:
                   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 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;
 };
@@ -444,7 +455,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 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;
 };
@@ -460,12 +471,15 @@ public:
                /** Set Displayed Audio PID and type */
        virtual RESULT setAudioPID(int apid, int type)=0;
 
+               /** Set Displayed Videotext PID */
+       virtual RESULT setTextPID(int vpid)=0;
+
                /** Set Sync mode to PCR */
        virtual RESULT setSyncPCR(int pcrpid)=0;
        enum { sm_Audio, sm_Video };
                /** Set Sync mode to either audio or video master */
        virtual RESULT setSyncMaster(int who)=0;
-       
+
                /** Apply settings */
        virtual RESULT start()=0;