X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fservice%2Fservicedvbrecord.h;h=7b538031bfcbe40d5429b47b47b3db767ff5708c;hb=ae49c64044d1a591af5d8a5f1bfa79d9f43e080b;hp=018e83f98117ed5afdd056acd126c2b489ee86b7;hpb=5264f2cd003271ba2c426e21d62d13025dba177b;p=vuplus_dvbapp

diff --git a/lib/service/servicedvbrecord.h b/lib/service/servicedvbrecord.h
index 018e83f..7b53803 100644
--- a/lib/service/servicedvbrecord.h
+++ b/lib/service/servicedvbrecord.h
@@ -13,37 +13,50 @@
 class eDVBServiceRecord: public eDVBServiceBase,
 	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 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();
+	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);
 
-		/* streamable service */
+		// 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;
+	bool m_is_stream_client;
 	friend class eServiceFactoryDVB;
-	eDVBServiceRecord(const eServiceReferenceDVB &ref);
+	eDVBServiceRecord(const eServiceReferenceDVB &ref, bool isstreamclient = false);
+	
+	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();
@@ -51,6 +64,13 @@ private:
 			/* events */
 	void serviceEvent(int event);
 	Signal2<void,iRecordableService*,int> m_event;
+	
+			/* recorder events */
+	void recordEvent(int event);
+
+			/* eit updates */
+	void gotNewEvent();
+	void saveCutlist();
 };
 
 #endif