add audioselection, removed democode

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index d0deb2fc2a2f76c726f8dea4efe1fa78e0ece63f..01a0e47ea36cc6838f8fff207ac67366bc43c09f 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
        {
@@ -158,19 +159,45 @@ public:
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
        RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel);
-       RESULT allocatePVRChannel(int caps);
+       RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
 
        RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
        RESULT connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
        RESULT connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
 };
 
-class eDVBChannel: public iDVBChannel, public Object
+class eFilePushThread;
+
+       /* iDVBPVRChannel includes iDVBChannel. don't panic. */
+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);
+       RESULT seekToPosition(int relative, const off_t &off);
+
 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;
@@ -182,26 +209,17 @@ private:
        
        void frontendStateChanged(iDVBFrontend*fe);
        ePtr<eConnection> m_conn_frontendStateChanged;
+       
+               /* 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... */
-       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);
 };
 
 #endif