X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6c64f5122744f89b948540faad3352fbacbc6c58..3a65450f335f7b831cf8a01267fa43c6c19bfc58:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 6b027088..17712dde 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1124,6 +1124,7 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte
 	m_frontend = frontend;
 
 	m_pvr_thread = 0;
+	m_pvr_fd_dst = -1;
 
 	m_skipmode_n = m_skipmode_m = m_skipmode_frames = 0;
 
@@ -1323,16 +1324,6 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		return;
 	}
 
-	m_cue->m_lock.RdLock();
-	if (!m_cue->m_decoding_demux)
-	{
-		start = current_offset;
-		size = max;
-		eDebug("getNextSourceSpan, no decoding demux. forcing normal play");
-		m_cue->m_lock.Unlock();
-		return;
-	}
-
 	if (m_skipmode_n)
 	{
 		eDebug("skipmode %d:%d (x%d)", m_skipmode_m, m_skipmode_n, m_skipmode_frames);
@@ -1340,7 +1331,6 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	}
 
 	eDebug("getNextSourceSpan, current offset is %08llx, m_skipmode_m = %d!", current_offset, m_skipmode_m);
-	
 	int frame_skip_success = 0;
 
 	if (m_skipmode_m)
@@ -1385,6 +1375,8 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		}
 	}
 
+	m_cue->m_lock.RdLock();
+
 	while (!m_cue->m_seek_requests.empty())
 	{
 		std::pair<int, pts_t> seek = m_cue->m_seek_requests.front();
@@ -1409,6 +1401,13 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				eDebug("decoder getPTS failed, can't seek relative");
 				continue;
 			}
+			if (!m_cue->m_decoding_demux)
+			{
+				eDebug("getNextSourceSpan, no decoding demux. couldn't seek to %llx... ignore request!", pts);
+				start = current_offset;
+				size = max;
+				continue;
+			}
 			if (getCurrentPosition(m_cue->m_decoding_demux, now, 1))
 			{
 				eDebug("seekTo: getCurrentPosition failed!");
@@ -1461,12 +1460,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 			continue;
 		}
 		
-		size_t iframe_len;
-			/* try to align to iframe */
-		int direction = pts < 0 ? -1 : 1;
-		m_tstools.findFrame(offset, iframe_len, direction);
-
-		eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx (skipped additional %d frames due to iframe re-align)", relative, pts, offset, direction);
+		eDebug("ok, resolved skip (rel: %d, diff %lld), now at %08llx", relative, pts, offset);
 		current_offset = align(offset, blocksize); /* in case tstools return non-aligned offset */
 	}
 
@@ -1750,16 +1744,19 @@ RESULT eDVBChannel::playFile(const char *file)
 		/* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST,
 		   THEN DO A REAL FIX HERE! */
 
+	if (m_pvr_fd_dst < 0)
+	{
 		/* (this codepath needs to be improved anyway.) */
 #if HAVE_DVB_API_VERSION < 3
-	m_pvr_fd_dst = open("/dev/pvr", O_WRONLY);
+		m_pvr_fd_dst = open("/dev/pvr", O_WRONLY);
 #else
-	m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
+		m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
 #endif
-	if (m_pvr_fd_dst < 0)
-	{
-		eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
-		return -ENODEV;
+		if (m_pvr_fd_dst < 0)
+		{
+			eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)"); // or wait for the driver to be improved.
+			return -ENODEV;
+		}
 	}
 
 	m_pvr_thread = new eDVBChannelFilePush();
@@ -1767,10 +1764,14 @@ RESULT eDVBChannel::playFile(const char *file)
 	m_pvr_thread->setStreamMode(1);
 	m_pvr_thread->setScatterGather(this);
 
+	m_event(this, evtPreStart);
+
 	if (m_pvr_thread->start(file, m_pvr_fd_dst))
 	{
 		delete m_pvr_thread;
 		m_pvr_thread = 0;
+		::close(m_pvr_fd_dst);
+		m_pvr_fd_dst = -1;
 		eDebug("can't open PVR file %s (%m)", file);
 		return -ENOENT;
 	}
@@ -1787,10 +1788,11 @@ void eDVBChannel::stopFile()
 	if (m_pvr_thread)
 	{
 		m_pvr_thread->stop();
-		::close(m_pvr_fd_dst);
 		delete m_pvr_thread;
 		m_pvr_thread = 0;
 	}
+	if (m_pvr_fd_dst >= 0)
+		::close(m_pvr_fd_dst);
 }
 
 void eDVBChannel::setCueSheet(eCueSheet *cuesheet)