add serviceinfo

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index d9f049eb9aebe0452e05b087d1f24370571d3814..f85862576601bb573c33ec3e8705887f4ec62909 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -4,6 +4,7 @@
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
+#include <lib/dvb/tstools.h>
 #include <connection.h>
 
 class eDVBChannel;
@@ -116,7 +117,7 @@ class eDVBResourceManager: public iObject
        RESULT allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe);
        
                        /* allocate a demux able to filter on the selected frontend. */
-       RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux);
+       RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
        
        struct active_channel
        {
@@ -171,9 +172,31 @@ class eFilePushThread;
 class eDVBChannel: public iDVBPVRChannel, public Object
 {
        DECLARE_REF(eDVBChannel);
+public:
+       eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
+       virtual ~eDVBChannel();
+
+               /* only for managed channels - effectively tunes to the channelid. should not be used... */
+               /* cannot be used for PVR channels. */
+       RESULT setChannel(const eDVBChannelID &id);
+       eDVBChannelID getChannelID() { return m_channel_id; }
+
+       RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
+       RESULT getState(int &state);
+
+       RESULT setCIRouting(const eDVBCIRouting &routing);
+       RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
+       RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
+       
+               /* iDVBPVRChannel */
+       RESULT playFile(const char *file);
+       RESULT getLength(pts_t &len);
+       RESULT getCurrentPosition(pts_t &pos);
+       RESULT seekTo(pts_t &pts);
+
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;
-       ePtr<eDVBAllocatedDemux> m_demux;
+       ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
        
        ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
        eDVBChannelID m_channel_id;
@@ -189,30 +212,13 @@ private:
                /* for PVR playback */
        eFilePushThread *m_pvr_thread;
        int m_pvr_fd_src, m_pvr_fd_dst;
+       eDVBTSTools m_tstools;
 
        friend class eUsePtr<eDVBChannel>;
                /* use count */
        oRefCount m_use_count;
        void AddUse();
        void ReleaseUse();
-public:
-       eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux);
-       virtual ~eDVBChannel();
-
-               /* only for managed channels - effectively tunes to the channelid. should not be used... */
-               /* cannot be used for PVR channels. */
-       RESULT setChannel(const eDVBChannelID &id);
-       eDVBChannelID getChannelID() { return m_channel_id; }
-
-       RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
-       RESULT getState(int &state);
-
-       RESULT setCIRouting(const eDVBCIRouting &routing);
-       RESULT getDemux(ePtr<iDVBDemux> &demux);
-       RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
-       
-               /* iDVBPVRChannel */
-       RESULT playFile(const char *file);
 };
 
 #endif