Update httpstream

[vuplus_dvbapp] / lib / dvb / dvb.h

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index f612aff..8d72d2e 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -135,7 +135,7 @@ class eDVBResourceManager: public iObject, public Object
        DECLARE_REF(eDVBResourceManager);
        int avail, busy;
 
-       enum { DM7025, DM800, DM500HD, DM800SE, DM8000 };
+       enum { DM7025, DM800, DM500HD, DM800SE, DM8000, DM7020HD };
 
        int m_boxtype;
 
@@ -191,11 +191,11 @@ public:
        };
        
        RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-       int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore, bool simulate=false);
+       int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore, int &system, bool simulate=false);
 
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate=false);
-       RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
+       RESULT allocatePVRChannel(const eDVBChannelID &channelid, eUsePtr<iDVBPVRChannel> &channel);
        static RESULT getInstance(ePtr<eDVBResourceManager> &);
 
                        /* allocates a frontend able to tune to frontend paramters 'feperm'.