remove non working indication of playable services in servicelist

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index f85862576601bb573c33ec3e8705887f4ec62909..5c3c515035819d37a535b6bf158810ade742ba9d 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -7,7 +7,6 @@
 #include <lib/dvb/tstools.h>
 #include <connection.h>
 
-class eDVBChannel;
 class eDVBChannel;
 
        /* we do NOT handle resource conflicts here. instead, the allocateChannel
@@ -106,15 +105,16 @@ class eDVBResourceManager: public iObject
        
        void addAdapter(iDVBAdapter *adapter);
        
-                       /* allocates a frontend able to tune to channelID "chid".
+                       /* allocates a frontend able to tune to frontend paramters 'feperm'.
                           the frontend must be tuned lateron. there is no guarante
-                          that tuning will suceed - it just means that if this frontend
+                          that tuning will succeed - it just means that if this frontend
                           can't tune, no other frontend could do it.
                           
                           there might be a priority given to certain frontend/chid 
                           combinations. this will be evaluated here. */
                           
-       RESULT allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe);
+       RESULT allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm);
+       RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int index);
        
                        /* allocate a demux able to filter on the selected frontend. */
        RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
@@ -141,6 +141,8 @@ class eDVBResourceManager: public iObject
        Signal1<void,eDVBChannel*> m_channelAdded;
        Signal1<void,eDVBChannel*> m_channelRemoved;
        Signal1<void,iDVBChannel*> m_channelRunning;
+
+       bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask);
 public:
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
@@ -155,15 +157,17 @@ public:
                errNoDemux    = -2,
                errChidNotFound = -3
        };
-       
+
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
-       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel);
+       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index);
        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);
+
+       bool canAllocateChannel(const eDVBChannelID &channelid);
 };
 
 class eFilePushThread;
@@ -178,7 +182,7 @@ public:
 
                /* only for managed channels - effectively tunes to the channelid. should not be used... */
                /* cannot be used for PVR channels. */
-       RESULT setChannel(const eDVBChannelID &id);
+       RESULT setChannel(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &feparam);
        eDVBChannelID getChannelID() { return m_channel_id; }
 
        RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
@@ -191,8 +195,11 @@ public:
                /* iDVBPVRChannel */
        RESULT playFile(const char *file);
        RESULT getLength(pts_t &len);
-       RESULT getCurrentPosition(pts_t &pos);
-       RESULT seekTo(pts_t &pts);
+       RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos);
+       RESULT seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts);
+                       /* seeking to relative positions won't work - 
+                          there is an unknown amount of buffers in between */
+       RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
 
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;