parsing for /etc/timezone.xml added

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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 01a0e47ea36cc6838f8fff207ac67366bc43c09f..03702db26794989196abcf3fe38d64a02b6630ee 100644 (file)
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -114,7 +114,7 @@ class eDVBResourceManager: public iObject
                           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<iDVBFrontendParameters> &feparm, ePtr<eDVBAllocatedFrontend> &fe);
        
                        /* allocate a demux able to filter on the selected frontend. */
        RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
@@ -178,7 +178,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);
@@ -192,8 +192,10 @@ public:
        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);
+       RESULT seekTo(int relative, pts_t &pts);
+                       /* seeking to relative positions won't work - 
+                          there is an unknown amount of buffers in between */
+       RESULT seekToPosition(const off_t &off);
 
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;