X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a33ff213255db7f59090f70235ec06c502e2a2ce..33a78f65a250068a9c82707b704fb38f3a54091e:/lib/dvb/dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index f1f5580a..4f5ecf2e 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1,12 +1,14 @@
-#include <lib/dvb/idvb.h>
 #include <lib/base/eerror.h>
+#include <lib/base/filepush.h>
+#include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/sec.h>
-#include <errno.h>
 
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 DEFINE_REF(eDVBRegisteredFrontend);
 DEFINE_REF(eDVBRegisteredDemux);
@@ -214,9 +216,9 @@ RESULT eDVBResourceManager::allocateFrontend(const eDVBChannelID &chid, ePtr<eDV
 
 RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux)
 {
-		/* find first unused demux which is on same adapter as frontend */
+		/* find first unused demux which is on same adapter as frontend (or any, if PVR) */
 	for (eSmartPtrList<eDVBRegisteredDemux>::iterator i(m_demux.begin()); i != m_demux.end(); ++i)
-		if ((!i->m_inuse) && (i->m_adapter == fe->m_adapter))
+		if ((!i->m_inuse) && ((!fe) || (i->m_adapter == fe->m_adapter)))
 		{
 			demux = new eDVBAllocatedDemux(i);
 			return 0;
@@ -240,7 +242,7 @@ RESULT eDVBResourceManager::getChannelList(ePtr<iDVBChannelList> &list)
 }
 
 
-RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, ePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel)
 {
 		/* first, check if a channel is already existing. */
 	
@@ -289,7 +291,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, ePtr
 	return 0;
 }
 
-RESULT eDVBResourceManager::allocateRawChannel(ePtr<iDVBChannel> &channel)
+RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel)
 {
 	ePtr<eDVBAllocatedFrontend> fe;
 	
@@ -312,9 +314,19 @@ RESULT eDVBResourceManager::allocateRawChannel(ePtr<iDVBChannel> &channel)
 	return 0;
 }
 
-RESULT eDVBResourceManager::allocatePVRChannel(int caps)
+
+RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
-	return -1; // will nicht, mag nicht, und das interface ist auch kaputt
+	ePtr<eDVBAllocatedDemux> demux;
+	
+	if (allocateDemux(0, demux))
+		return errNoDemux;
+	
+	eDVBChannel *ch;
+	ch = new eDVBChannel(this, 0, demux);
+	
+	channel = ch;
+	return 0;
 }
 
 RESULT eDVBResourceManager::addChannel(const eDVBChannelID &chid, eDVBChannel *ch)
@@ -334,7 +346,6 @@ RESULT eDVBResourceManager::removeChannel(eDVBChannel *ch)
 		{
 			i = m_active_channels.erase(i);
 			++cnt;
-			/* emit */ m_channelRemoved(ch);
 		} else
 			++i;
 	}
@@ -350,24 +361,14 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
 	return 0;
 }
 
-RESULT eDVBResourceManager::connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection)
-{
-	connection = new eConnection((eDVBResourceManager*)this, m_channelRemoved.connect(channelRemoved));
-	return 0;
-}
-
-RESULT eDVBResourceManager::connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRunning, ePtr<eConnection> &connection)
-{
-	connection = new eConnection((eDVBResourceManager*)this, m_channelRunning.connect(channelRunning));
-	return 0;
-}
-
 DEFINE_REF(eDVBChannel);
 
 eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend, eDVBAllocatedDemux *demux): m_state(state_idle), m_mgr(mgr)
 {
 	m_frontend = frontend;
 	m_demux = demux;
+
+	m_pvr_thread = 0;
 	
 	if (m_frontend)
 		m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged);
@@ -377,12 +378,25 @@ eDVBChannel::~eDVBChannel()
 {
 	if (m_channel_id)
 		m_mgr->removeChannel(this);
+	
+	if (m_pvr_thread)
+	{
+		m_pvr_thread->stop();
+		::close(m_pvr_fd_src);
+		::close(m_pvr_fd_dst);
+		delete m_pvr_thread;
+	}
 }
 
 void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 {
 	eDebug("fe state changed!");
 	int state, ourstate = 0;
+	
+		/* if we are already in shutdown, don't change state. */
+	if (m_state == state_release)
+		return;
+	
 	if (fe->getState(state))
 		return;
 	
@@ -408,6 +422,20 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 	}
 }
 
+void eDVBChannel::AddUse()
+{
+	++m_use_count;
+}
+
+void eDVBChannel::ReleaseUse()
+{
+	if (!--m_use_count)
+	{
+		m_state = state_release;
+		m_stateChanged(this);
+	}
+}
+
 RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid)
 {
 	if (m_channel_id)
@@ -478,3 +506,40 @@ RESULT eDVBChannel::getFrontend(ePtr<iDVBFrontend> &frontend)
 	else
 		return -ENODEV;
 }
+
+RESULT eDVBChannel::playFile(const char *file)
+{
+	ASSERT(!m_frontend);
+	if (m_pvr_thread)
+	{
+		m_pvr_thread->stop();
+		delete m_pvr_thread;
+		m_pvr_thread = 0;
+	}
+	
+		/* DON'T EVEN THINK ABOUT FIXING THIS. FIX THE ATI SOURCES FIRST,
+		   THEN DO A REAL FIX HERE! */
+	
+	
+		/* (this codepath needs to be improved anyway.) */
+	m_pvr_fd_dst = open("/dev/misc/pvr", O_WRONLY);
+	if (m_pvr_fd_dst < 0)
+	{
+		eDebug("can't open /dev/misc/pvr - you need to buy the new(!) $$$ box! (%m)");
+		return -ENODEV;
+	}
+	
+	m_pvr_fd_src = open(file, O_RDONLY);
+	if (m_pvr_fd_src < 0)
+	{
+		eDebug("can't open PVR m_pvr_fd_src file %s (%m)", file);
+		close(m_pvr_fd_dst);
+		return -ENOENT;
+	}
+
+	m_state = state_ok;
+	m_stateChanged(this);
+	
+	m_pvr_thread = new eFilePushThread();
+	m_pvr_thread->start(m_pvr_fd_src, m_pvr_fd_dst);
+}