X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicedvbrecord.cpp;h=4af032005a5f6f178c0b4e16451967597a5bb24b;hp=d9cdb516d29023ecf3c4b61d2cc21f9064c058e1;hb=27e06ba9c8b055c20ea8c70a405deb0e4019edc5;hpb=a8e6636ef62a84710ec458edf68fd6b65fc878c7

diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index d9cdb51..4af0320 100644
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -2,6 +2,7 @@
 #include <lib/base/eerror.h>
 #include <lib/dvb/epgcache.h>
 #include <lib/dvb/metaparser.h>
+#include <lib/base/httpstream.h>
 #include <fcntl.h>
 
 	/* for cutlist */
@@ -14,7 +15,8 @@
 
 DEFINE_REF(eDVBServiceRecord);
 
-eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref)
+eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref, bool isstreamclient):
+	m_ref(ref),m_is_stream_client(isstreamclient)
 {
 	CONNECT(m_service_handler.serviceEvent, eDVBServiceRecord::serviceEvent);
 	CONNECT(m_event_handler.m_eit_changed, eDVBServiceRecord::gotNewEvent);
@@ -232,9 +234,32 @@ int eDVBServiceRecord::doPrepare()
 		/* allocate a ts recorder if we don't already have one. */
 	if (m_state == stateIdle)
 	{
+		bool isstreamclient = false;
 		m_pids_active.clear();
 		m_state = statePrepared;
-		return m_service_handler.tune(m_ref, 0, 0, m_simulate);
+		ePtr<iTsSource> source;
+		if (!m_ref.path.empty())
+		{
+			if (m_is_stream_client)
+			{
+				isstreamclient = true;
+				eHttpStream *f = new eHttpStream();
+				f->open(m_ref.path.c_str());
+				source = ePtr<iTsSource>(f);
+			}
+			else
+			{
+				/* re-record a recording */
+				eRawFile *f = new eRawFile();
+				f->open(m_ref.path.c_str());
+				source = ePtr<iTsSource>(f);
+			}
+		}
+		else
+		{
+			m_event((iRecordableService*)this, evTuneStart);
+		}
+		return m_service_handler.tuneExt(m_ref, 0, source, m_ref.path.c_str(), 0, m_simulate, 0, isstreamclient);
 	}
 	return 0;
 }
@@ -313,7 +338,7 @@ int eDVBServiceRecord::doRecord()
 
 			int timing_pid = -1, timing_pid_type = -1;
 
-			eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size());
+			eDebugNoNewLine("RECORD: have %zd video stream(s)", program.videoStreams.size());
 			if (!program.videoStreams.empty())
 			{
 				eDebugNoNewLine(" (");
@@ -335,7 +360,7 @@ int eDVBServiceRecord::doRecord()
 				}
 				eDebugNoNewLine(")");
 			}
-			eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+			eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
 			if (!program.audioStreams.empty())
 			{
 				eDebugNoNewLine(" (");
@@ -493,8 +518,7 @@ void eDVBServiceRecord::gotNewEvent()
 			eDebug("getting PCR failed!");
 		else
 		{
-			static int i;
-			m_event_timestamps[/* event_id*/ ++i] = p;
+			m_event_timestamps[event_id] = p;
 			eDebug("pcr of eit change: %llx", p);
 		}
 	}