fix segfault

[enigma2.git] / lib / service / servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index c7c36e1c6936c461850caeba920996c14e9cdeeb..39318b2297df89c3fe6de069ee97d8deecb34784 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,6 +6,7 @@
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.h>
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.h>

+#include <lib/base/filepush.h>

 
 class eServiceFactoryDVB: public iServiceHandler
 {
 
 class eServiceFactoryDVB: public iServiceHandler
 {


@@ -32,7 +33,8 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
        virtual ~eDVBServiceList();
 DECLARE_REF(eDVBServiceList);
 public:
        virtual ~eDVBServiceList();

-       RESULT getContent(std::list<eServiceReference> &list);
+       RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
+       RESULT getContent(PyObject *list, bool sorted=false);

        RESULT getNext(eServiceReference &ptr);
        int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
        
        RESULT getNext(eServiceReference &ptr);
        int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
        


@@ -41,6 +43,7 @@ public:
        RESULT addService(eServiceReference &ref);
        RESULT removeService(eServiceReference &ref);
        RESULT moveService(eServiceReference &ref, int pos);
        RESULT addService(eServiceReference &ref);
        RESULT removeService(eServiceReference &ref);
        RESULT moveService(eServiceReference &ref, int pos);

+       RESULT setListName(const std::string &name);

 private:
        RESULT startQuery();
        eServiceReference m_parent;
 private:
        RESULT startQuery();
        eServiceReference m_parent;


@@ -55,7 +58,8 @@ private:
 class eDVBServicePlay: public iPlayableService, public iPauseableService, 
                public iSeekableService, public Object, public iServiceInformation, 
                public iAudioTrackSelection, public iFrontendStatusInformation,
 class eDVBServicePlay: public iPlayableService, public iPauseableService, 
                public iSeekableService, public Object, public iServiceInformation, 
                public iAudioTrackSelection, public iFrontendStatusInformation,

-               public iSubserviceList, public iTimeshiftService
+               public iSubserviceList, public iTimeshiftService,
+               public iCueSheet

 {
 DECLARE_REF(eDVBServicePlay);
 public:
 {
 DECLARE_REF(eDVBServicePlay);
 public:


@@ -72,6 +76,7 @@ public:
        RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
        RESULT subServices(ePtr<iSubserviceList> &ptr);
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);
        RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
        RESULT subServices(ePtr<iSubserviceList> &ptr);
        RESULT timeshift(ePtr<iTimeshiftService> &ptr);

+       RESULT cueSheet(ePtr<iCueSheet> &ptr);

 
                // iPauseableService
        RESULT pause();
 
                // iPauseableService
        RESULT pause();


@@ -85,6 +90,7 @@ public:
        RESULT seekRelative(int direction, pts_t to);
        RESULT getPlayPosition(pts_t &pos);
        RESULT setTrickmode(int trick=0);
        RESULT seekRelative(int direction, pts_t to);
        RESULT getPlayPosition(pts_t &pos);
        RESULT setTrickmode(int trick=0);

+       RESULT isCurrentlySeekable();

 
                // iServiceInformation
        RESULT getName(std::string &name);
 
                // iServiceInformation
        RESULT getName(std::string &name);


@@ -99,6 +105,7 @@ public:
 
                // iFrontendStatusInformation
        int getFrontendInfo(int w);
 
                // iFrontendStatusInformation
        int getFrontendInfo(int w);

+       PyObject *getFrontendData(bool);

 
                // iSubserviceList
        int getNumberOfSubservices();
 
                // iSubserviceList
        int getNumberOfSubservices();


@@ -107,7 +114,14 @@ public:
                // iTimeshiftService
        RESULT startTimeshift();
        RESULT stopTimeshift();
                // iTimeshiftService
        RESULT startTimeshift();
        RESULT stopTimeshift();

+       int isTimeshiftActive();
+       RESULT activateTimeshift();

 
 

+               // iCueSheet
+       PyObject *getCutList();
+       void setCutList(PyObject *);
+       void setCutListEnable(int enable);
+       

 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;


@@ -129,6 +143,7 @@ private:
        Signal2<void,iPlayableService*,int> m_event;
        
        int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
        Signal2<void,iPlayableService*,int> m_event;
        
        int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;

+       int m_first_program_info;

        
        std::string m_timeshift_file;
        int m_timeshift_fd;
        
        std::string m_timeshift_file;
        int m_timeshift_fd;


@@ -146,6 +161,33 @@ private:
        void switchToTimeshift();
        
        void updateDecoder();
        void switchToTimeshift();
        
        void updateDecoder();

+       
+       int m_skipmode;
+       
+       ePtr<eCueSheet> m_cue;
+       
+       struct cueEntry
+       {
+               pts_t where;
+               unsigned int what;
+               
+               bool operator < (const struct cueEntry &o) const
+               {
+                       return where < o.where;
+               }
+               cueEntry(const pts_t &where, unsigned int what) :
+                       where(where), what(what)
+               {
+               }
+       };
+       
+       std::multiset<cueEntry> m_cue_entries;
+       int m_cuesheet_changed, m_cutlist_enabled;
+       
+       void loadCuesheet();
+       void saveCuesheet();
+       
+       void cutlistToCuesheet();

 };
 
 #endif
 };
 
 #endif