add code to simulate recordings (with faked frontends)

now its more easy to build a timer overlap detection or similar

4 files changed, 13 insertions, 9 deletions

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 929aaa93..0385b9c2 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -848,7 +848,7 @@ public:
 	virtual SWIG_VOID(RESULT) getError(int &SWIG_OUTPUT)=0;
 	virtual RESULT prepare(const char *filename, time_t begTime=-1, time_t endTime=-1, int eit_event_id=-1)=0;
 	virtual RESULT prepareStreaming()=0;
-	virtual RESULT start()=0;
+	virtual RESULT start(bool simulate=false)=0;
 	virtual RESULT stop()=0;
 	virtual SWIG_VOID(RESULT) frontendInfo(ePtr<iFrontendInformation> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) stream(ePtr<iStreamableService> &SWIG_OUTPUT)=0;
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index e7d15ba7..c259a811 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2994,6 +2994,8 @@ void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)
 		case iTSMPEGDecoder::videoEvent::eventProgressiveChanged:
 			m_event((iPlayableService*)this, evVideoProgressiveChanged);
 			break;
+		default:
+			break;
 	}
 }
 
diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index 86461d05..89d022cc 100644
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -14,6 +14,7 @@ eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref
 	m_target_fd = -1;
 	m_error = 0;
 	m_streaming = 0;
+	m_simulate = false;
 }
 
 void eDVBServiceRecord::serviceEvent(int event)
@@ -122,18 +123,19 @@ RESULT eDVBServiceRecord::prepareStreaming()
 	return -1;
 }
 
-RESULT eDVBServiceRecord::start()
+RESULT eDVBServiceRecord::start(bool simulate)
 {
+	m_simulate = simulate;
 	m_want_record = 1;
 		/* when tune wasn't yet successfully, doRecord stays in "prepared"-state which is fine. */
 	m_event((iRecordableService*)this, evStart);
 	return doRecord();
 }
 
-
 RESULT eDVBServiceRecord::stop()
 {
-	eDebug("stop recording!");
+	if (!m_simulate)
+		eDebug("stop recording!");
 	if (m_state == stateRecording)
 	{
 		if (m_record)
@@ -144,7 +146,7 @@ RESULT eDVBServiceRecord::stop()
 			m_target_fd = -1;
 		}
 		m_state = statePrepared;
-	} else
+	} else if (!m_simulate)
 		eDebug("(was not recording)");
 	if (m_state == statePrepared)
 	{
@@ -155,7 +157,6 @@ RESULT eDVBServiceRecord::stop()
 	return 0;
 }
 
-
 int eDVBServiceRecord::doPrepare()
 {
 		/* allocate a ts recorder if we don't already have one. */
@@ -163,7 +164,7 @@ int eDVBServiceRecord::doPrepare()
 	{
 		m_pids_active.clear();
 		m_state = statePrepared;
-		return m_service_handler.tune(m_ref, 0);
+		return m_service_handler.tune(m_ref, 0, 0, m_simulate);
 	}
 	return 0;
 }
@@ -181,7 +182,7 @@ int eDVBServiceRecord::doRecord()
 	if (!m_tuned)
 		return 0; /* try it again when we are tuned in */
 	
-	if (!m_record && m_tuned && !m_streaming)
+	if (!m_record && m_tuned && !m_streaming && !m_simulate)
 	{
 		eDebug("Recording to %s...", m_filename.c_str());
 		::remove(m_filename.c_str());
diff --git a/lib/service/servicedvbrecord.h b/lib/service/servicedvbrecord.h
index b46a73ea..17de033e 100644
--- a/lib/service/servicedvbrecord.h
+++ b/lib/service/servicedvbrecord.h
@@ -20,7 +20,7 @@ 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 prepareStreaming();
-	RESULT start();
+	RESULT start(bool simulate=false);
 	RESULT stop();
 	RESULT stream(ePtr<iStreamableService> &ptr);
 	RESULT getError(int &error) { error = m_error; return 0; }
@@ -31,6 +31,7 @@ public:
 
 private:
 	enum { stateIdle, statePrepared, stateRecording };
+	bool m_simulate;
 	int m_state, m_want_record;
 	friend class eServiceFactoryDVB;
 	eDVBServiceRecord(const eServiceReferenceDVB &ref);