From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 14 Apr 2010 22:42:04 +0000 (+0200)
Subject: add possibility to reserve a demux from python (via rawChannel)
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=7618d28f166bbb7da7362519784a3b24b1f4f90f

add possibility to reserve a demux from python (via rawChannel)
---

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 17712dd..836851c 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -1657,6 +1657,18 @@ void eDVBChannel::SDTready(int result)
 	m_SDT = 0;
 }
 
+int eDVBChannel::reserveDemux()
+{
+	ePtr<iDVBDemux> dmx;
+	if (!getDemux(dmx, 0))
+	{
+		uint8_t id;
+		if (!dmx->getCADemuxID(id))
+			return id;
+	}
+	return -1;
+}
+
 RESULT eDVBChannel::requestTsidOnid(ePyObject callback)
 {
 	if (PyCallable_Check(callback))
diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 7b32000..405bd55 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -268,6 +268,7 @@ public:
 	int getUseCount() { return m_use_count; }
 
 	RESULT requestTsidOnid(ePyObject callback);
+	int reserveDemux();
 private:
 	ePtr<eDVBAllocatedFrontend> m_frontend;
 	ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index d20829b..996d790 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -508,6 +508,7 @@ public:
 		/* direct frontend access for raw channels and/or status inquiries. */
 	virtual SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
 	virtual RESULT requestTsidOnid(SWIG_PYOBJECT(ePyObject) callback) { return -1; }
+	virtual int reserveDemux() { return -1; }
 #ifndef SWIG
 	enum
 	{