small code cleanup, fix memleaks

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

diff --git a/lib/service/servicedvbrecord.h b/lib/service/servicedvbrecord.h
index 5f36991f92935b78982cdbb4538c41512cef9894..0535f02919f02c3658a66b03aa5b6bb0b87fc4da 100644 (file)
--- a/lib/service/servicedvbrecord.h
+++ b/lib/service/servicedvbrecord.h
@@ -11,38 +11,65 @@
 #include <lib/service/servicedvb.h>
 
 class eDVBServiceRecord: public eDVBServiceBase,
-       public iRecordableService, public Object
+       public iRecordableService, 
+       public iStreamableService,
+       public iSubserviceList,
+       public Object
 {
-DECLARE_REF(eDVBServiceRecord);
+       DECLARE_REF(eDVBServiceRecord);
 public:
        RESULT connectEvent(const Slot2<void,iRecordableService*,int> &event, ePtr<eConnection> &connection);
-       RESULT prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id);
-       RESULT start();
+       RESULT prepare(const char *filename, time_t begTime, time_t endTime, int eit_event_id, const char *name, const char *descr, const char *tags);
+       RESULT prepareStreaming();
+       RESULT start(bool simulate=false);
        RESULT stop();
+       RESULT stream(ePtr<iStreamableService> &ptr);
        RESULT getError(int &error) { error = m_error; return 0; }
+       RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
+       RESULT subServices(ePtr<iSubserviceList> &ptr);
+
+               // iStreamableService
+       PyObject *getStreamingData();
+
+               // iSubserviceList
+       int getNumberOfSubservices();
+       RESULT getSubservice(eServiceReference &subservice, unsigned int n);
 private:
        enum { stateIdle, statePrepared, stateRecording };
+       bool m_simulate;
        int m_state, m_want_record;
        friend class eServiceFactoryDVB;
        eDVBServiceRecord(const eServiceReferenceDVB &ref);
        
+       eDVBServiceEITHandler m_event_handler;
+       
        eServiceReferenceDVB m_ref;
        
        ePtr<iDVBTSRecorder> m_record;
+       ePtr<eConnection> m_con_record_event;
        
        int m_recording, m_tuned, m_error;
        std::set<int> m_pids_active;
        std::string m_filename;
+
+       std::map<int,pts_t> m_event_timestamps;
        int m_target_fd;
+       int m_streaming;
+       int m_last_event_id;
        
        int doPrepare();
        int doRecord();
-       RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
 
                        /* events */
        void serviceEvent(int event);
        Signal2<void,iRecordableService*,int> m_event;
+       
+                       /* recorder events */
+       void recordEvent(int event);
 
+                       /* eit updates */
+       void gotNewEvent();
+       void saveCutlist();
 };
 
 #endif