X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c6cb89ad8e6db0985d61717a19cacd9e52c1687e..a39683740f78cc2463900d1ba73f7d7e2c69d807:/lib/service/servicedvbrecord.cpp?ds=sidebyside

diff --git a/lib/service/servicedvbrecord.cpp b/lib/service/servicedvbrecord.cpp
index 2f1dea0e..5b4f35ed 100644
--- a/lib/service/servicedvbrecord.cpp
+++ b/lib/service/servicedvbrecord.cpp
@@ -5,11 +5,12 @@
 
 DEFINE_REF(eDVBServiceRecord);
 
-eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref), m_service_handler(1)
+eDVBServiceRecord::eDVBServiceRecord(const eServiceReferenceDVB &ref): m_ref(ref)
 {
 	CONNECT(m_service_handler.serviceEvent, eDVBServiceRecord::serviceEvent);
 	m_state = stateIdle;
 	m_want_record = 0;
+	m_tuned = 0;
 }
 
 void eDVBServiceRecord::serviceEvent(int event)
@@ -20,6 +21,9 @@ void eDVBServiceRecord::serviceEvent(int event)
 	case eDVBServicePMTHandler::eventTuned:
 	{
 		eDebug("tuned..");
+		m_tuned = 1;
+		if (m_state == stateRecording && m_want_record)
+			doRecord();
 		break;
 	}
 	case eDVBServicePMTHandler::eventNewProgramInfo:
@@ -33,12 +37,11 @@ void eDVBServiceRecord::serviceEvent(int event)
 	}
 }
 
-
 RESULT eDVBServiceRecord::prepare(const char *filename)
 {
 	m_filename = filename;
 	if (m_state == stateIdle)
-		return m_service_handler.tune(m_ref);
+		return doPrepare();
 	else
 		return -1;
 }
@@ -56,7 +59,8 @@ RESULT eDVBServiceRecord::stop()
 	eDebug("stop recording!!");
 	if (m_state == stateRecording)
 	{
-		m_record->stop();
+		if (m_record)
+			m_record->stop();
 		m_state = statePrepared;
 	}
 	
@@ -74,16 +78,39 @@ int eDVBServiceRecord::doPrepare()
 		/* allocate a ts recorder if we don't already have one. */
 	if (m_state == stateIdle)
 	{
+		m_pids_active.clear();
+		m_state = statePrepared;
+		return m_service_handler.tune(m_ref, 0);
+	}
+	return 0;
+}
+
+int eDVBServiceRecord::doRecord()
+{
+	int err = doPrepare();
+	if (err)
+		return err;
+	
+	if (!m_tuned)
+		return 0; /* try it again when we are tuned in */
+	
+	if (!m_record && m_tuned)
+	{
+
 		eDebug("Recording to %s...", m_filename.c_str());
 		::remove(m_filename.c_str());
-		int fd = ::open(m_filename.c_str(), O_WRONLY|O_CREAT, 0644);
+		int fd = ::open(m_filename.c_str(), O_WRONLY|O_CREAT|O_LARGEFILE, 0644);
 		if (fd == -1)
 		{
-			eDebug("eDVBServiceRecord - can't open hardcoded recording file!");
+			eDebug("eDVBServiceRecord - can't open recording file!");
 			return -1;
 		}
+		
+			/* turn off kernel caching strategies */
+		posix_fadvise(fd, 0, 0, POSIX_FADV_RANDOM);
+		
 		ePtr<iDVBDemux> demux;
-		if (m_service_handler.getDemux(demux))
+		if (m_service_handler.getDataDemux(demux))
 		{
 			eDebug("eDVBServiceRecord - NO DEMUX available!");
 			return -2;
@@ -95,22 +122,7 @@ int eDVBServiceRecord::doPrepare()
 			return -3;
 		}
 		m_record->setTargetFD(fd);
-		m_pids_active.clear();
-		m_state = statePrepared;
-	} else if ((m_state == statePrepared) || (m_state == stateRecording))
-	{
-			/* when we're already recording, we already have a recorder allocated. */
-		assert(m_record);
 	}
-	return 0;
-}
-
-int eDVBServiceRecord::doRecord()
-{
-	int err = doPrepare();
-	if (err)
-		return err;
-	
 	eDebug("starting recording..");
 	
 	eDVBServicePMTHandler::program program;
@@ -125,6 +137,8 @@ int eDVBServiceRecord::doRecord()
 		if (program.pmtPid != -1)
 			pids_to_record.insert(program.pmtPid); // PMT
 		
+		int timing_pid = -1;
+		
 		eDebugNoNewLine("RECORD: have %d video stream(s)", program.videoStreams.size());
 		if (!program.videoStreams.empty())
 		{
@@ -134,6 +148,10 @@ int eDVBServiceRecord::doRecord()
 				i != program.videoStreams.end(); ++i)
 			{
 				pids_to_record.insert(i->pid);
+				
+				if (timing_pid == -1)
+					timing_pid = i->pid;
+				
 				if (i != program.videoStreams.begin())
 					eDebugNoNewLine(", ");
 				eDebugNoNewLine("%04x", i->pid);
@@ -149,16 +167,23 @@ int eDVBServiceRecord::doRecord()
 				i != program.audioStreams.end(); ++i)
 			{
 				pids_to_record.insert(i->pid);
+
+				if (timing_pid == -1)
+					timing_pid = i->pid;
+				
 				if (i != program.audioStreams.begin())
 					eDebugNoNewLine(", ");
 				eDebugNoNewLine("%04x", i->pid);
 			}
 			eDebugNoNewLine(")");
 		}
-		eDebug(", and the pcr pid is %04x", program.pcrPid);
+		eDebugNoNewLine(", and the pcr pid is %04x", program.pcrPid);
 		if (program.pcrPid != 0x1fff)
 			pids_to_record.insert(program.pcrPid);
-		
+		eDebug(", and the text pid is %04x", program.textPid);
+		if (program.textPid != -1)
+			pids_to_record.insert(program.textPid); // Videotext
+
 			/* find out which pids are NEW and which pids are obsolete.. */
 		std::set<int> new_pids, obsolete_pids;
 		
@@ -183,6 +208,11 @@ int eDVBServiceRecord::doRecord()
 			m_record->removePID(*i);
 		}
 		
+		if (timing_pid != -1)
+			m_record->setTimingPID(timing_pid);
+		
+		m_pids_active = pids_to_record;
+		
 		if (m_state != stateRecording)
 		{
 			m_record->start();