fix relative jumps

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 5b6f19fc806b0ea126d655c13e82ec91d473271c..2090d188791a1ac41f9933044da8ab8b93e00e94 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_idvb_h
 #define __dvb_idvb_h
 
-#include <config.h>
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
 #define FRONTENDPARAMETERS FrontendParameters
@@ -12,6 +11,7 @@
 #include <lib/dvb/frontendparms.h>
 #include <lib/base/object.h>
 #include <lib/base/ebase.h>
+#include <lib/base/elock.h>
 #include <lib/service/service.h>
 #include <libsig_comp.h>
 #include <connection.h>
@@ -22,11 +22,12 @@ struct eBouquet
        std::string m_filename;  // without path.. just name
        typedef std::list<eServiceReference> list;
        list m_services;
-// the following four methods are implemented in db.cpp
+// the following five methods are implemented in db.cpp
        RESULT flushChanges();
        RESULT addService(const eServiceReference &);
        RESULT removeService(const eServiceReference &);
        RESULT moveService(const eServiceReference &, unsigned int);
+       RESULT setListName(const std::string &name);
 };
 
                /* these structures have by intention no operator int() defined.
@@ -391,12 +392,13 @@ public:
                state_failed,      /* tuning failed. */
                state_unavailable, /* currently unavailable, will be back without further interaction */
                state_ok,          /* ok */
+               state_last_instance, /* just one reference to this channel is left */
                state_release      /* channel is being shut down. */
        };
        
        enum 
        {
-               evtEOF, evtFailed
+               evtEOF, evtSOF, evtFailed
        };
        virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
        virtual RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection)=0;
@@ -420,8 +422,46 @@ public:
 };
 
        /* signed, so we can express deltas. */
+       
 typedef long long pts_t;
 
+class iFilePushScatterGather;
+class iTSMPEGDecoder;
+
+       /* note that a cue sheet describes the logical positions. thus 
+          everything is specified in pts and not file positions */
+
+       /* implemented in dvb.cpp */
+class eCueSheet: public iObject, public Object
+{
+       DECLARE_REF(eCueSheet);
+public:
+       eCueSheet();
+       
+                       /* frontend */
+       void seekTo(int relative, const pts_t &pts);
+       
+       void clear();
+       void addSourceSpan(const pts_t &begin, const pts_t &end);
+       
+       void setSkipmode(const pts_t &ratio); /* 90000 is 1:1 */
+       void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder);
+       
+                       /* frontend and backend */
+       eSingleLock m_lock;
+       
+                       /* backend */
+       enum { evtSeek, evtSkipmode, evtSpanChanged };
+       RESULT connectEvent(const Slot1<void, int> &event, ePtr<eConnection> &connection);
+
+       std::list<std::pair<pts_t,pts_t> > m_spans;     /* begin, end */
+       std::list<std::pair<int, pts_t> > m_seek_requests; /* relative, delta */
+       pts_t m_skipmode_ratio;
+       Signal1<void,int> m_event;
+       ePtr<iDVBDemux> m_decoding_demux;
+       ePtr<iTSMPEGDecoder> m_decoder;
+};
+
 class iDVBPVRChannel: public iDVBChannel
 {
 public:
@@ -431,18 +471,21 @@ public:
        };
        
                /* FIXME: there are some very ugly buffer-end and ... related problems */
-               /* so this is VERY UGLY. */
+               /* so this is VERY UGLY. 
+               
+                  ok, it's going to get better. but still...*/
        virtual RESULT playFile(const char *file) = 0;
+       virtual void stopFile() = 0;
+       
+       virtual void setCueSheet(eCueSheet *cuesheet) = 0;
        
        virtual RESULT getLength(pts_t &pts) = 0;
        
                /* we explicitely ask for the decoding demux here because a channel
                   can be shared between multiple decoders.
-                  Of couse skipping doesn't make much sense 
-                  then, but getCurrentPosition does. */
+               */
        virtual RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode) = 0;
-       virtual RESULT seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) = 0;
-       virtual RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &pts) = 0;
+               /* skipping must be done with a cue sheet */
 };
 
 class iDVBSectionReader;
@@ -508,6 +551,8 @@ public:
        virtual RESULT setZoom(int what)=0;
        
        virtual RESULT setTrickmode(int what) = 0;
+       
+       virtual RESULT getPTS(int what, pts_t &pts) = 0;
 };
 
 #endif