Merge branch 'master' of git.opendreambox.org:/git/enigma2

2 files changed, 96 insertions, 89 deletions

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 44191586..e5a94392 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -786,7 +786,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 		return Py_False;
 	}
 	int tmp, *dest = NULL,
-		modulation, system, freq, sr, pol, fec, inv, pilot, rolloff;
+		modulation, system, freq, sr, pol, fec, inv, pilot, rolloff, tsid, onid;
 	char *end_ptr;
 	const Attribute *at;
 	std::string name;
@@ -851,9 +851,12 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 				inv = 2; // AUTO default
 				pilot = 2; // AUTO default
 				rolloff = 0; // alpha 0.35
+				tsid = -1;
+				onid = -1;
+
 				for (AttributeConstIterator it(tp_attributes.begin()); it != end; ++it)
 				{
-//					eDebug("\t\tattr: %s", at->name().c_str());
+					//eDebug("\t\tattr: %s", at->name().c_str());
 					at = *it;
 					name = at->name();
 					if (name == "modulation") dest = &modulation;
@@ -865,6 +868,8 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 					else if (name == "inversion") dest = &inv;
 					else if (name == "rolloff") dest = &rolloff;
 					else if (name == "pilot") dest = &pilot;
+					else if (name == "tsid") dest = &tsid;
+					else if (name == "onid") dest = &onid;
 					if (dest)
 					{
 						tmp = strtol(at->value().c_str(), &end_ptr, 10);
@@ -874,7 +879,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 				}
 				if (freq && sr && pol != -1)
 				{
-					tuple = PyTuple_New(10);
+					tuple = PyTuple_New(12);
 					PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(0));
 					PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong(freq));
 					PyTuple_SET_ITEM(tuple, 2, PyInt_FromLong(sr));
@@ -885,6 +890,8 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 					PyTuple_SET_ITEM(tuple, 7, PyInt_FromLong(inv));
 					PyTuple_SET_ITEM(tuple, 8, PyInt_FromLong(rolloff));
 					PyTuple_SET_ITEM(tuple, 9, PyInt_FromLong(pilot));
+					PyTuple_SET_ITEM(tuple, 10, PyInt_FromLong(tsid));
+					PyTuple_SET_ITEM(tuple, 11, PyInt_FromLong(onid));
 					PyList_Append(tplist, tuple);
 					Py_DECREF(tuple);
 				}
@@ -1497,7 +1504,7 @@ int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 {
 	ePtr<eDVBService> a_service, b_service;
 	int sortmode = m_query ? m_query->m_sort : eDVBChannelQuery::tName;
-	
+
 	if ((sortmode == eDVBChannelQuery::tName) || (sortmode == eDVBChannelQuery::tProvider))
 	{
 		if (a.name.empty() && m_db->getService(a, a_service))
@@ -1505,7 +1512,7 @@ int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServ
 		if (b.name.empty() && m_db->getService(b, b_service))
 			return 1;
 	}
-	
+
 	switch (sortmode)
 	{
 	case eDVBChannelQuery::tName:
@@ -1747,10 +1754,10 @@ static int decodeType(const std::string &type)
 RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::const_iterator begin, std::list<std::string>::const_iterator end)
 {
 	std::list<std::string>::const_iterator end_of_exp;
-	
+
 	if (begin == end)
 		return 0;
-	
+
 	if (*begin == "(")
 	{
 		end_of_exp = begin;
@@ -1759,36 +1766,36 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 				break;
 			else
 				++end_of_exp;
-	
+
 		if (end_of_exp == end)
 		{
 			eDebug("expression parse: end of expression while searching for closing brace");
 			return -1;
 		}
-		
+
 		++begin;
 		// begin..end_of_exp
 		int r = parseExpression(res, begin, end_of_exp);
 		if (r)
 			return r;
 		++end_of_exp;
-		
+
 			/* we had only one sub expression */
 		if (end_of_exp == end)
 		{
 //			eDebug("only one sub expression");
 			return 0;
 		}
-		
+
 			/* otherwise we have an operator here.. */
-		
+
 		ePtr<eDVBChannelQuery> r2 = res;
 		res = new eDVBChannelQuery();
 		res->m_sort = 0;
 		res->m_p1 = r2;
 		res->m_inverse = 0;
 		r2 = 0;
-		
+
 		if (*end_of_exp == "||")
 			res->m_type = eDVBChannelQuery::tOR;
 		else if (*end_of_exp == "&&")
@@ -1799,18 +1806,18 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 			res = 0;
 			return 1;
 		}
-		
+
 		++end_of_exp;
-		
+
 		return parseExpression(res->m_p2, end_of_exp, end);
 	}
-	
+
 	// "begin" <op> "end"
 	std::string type, op, val;
-	
+
 	res = new eDVBChannelQuery();
 	res->m_sort = 0;
-	
+
 	int cnt = 0;
 	while (begin != end)
 	{
@@ -1832,23 +1839,23 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 		++begin;
 		++cnt;
 	}
-	
+
 	if (cnt != 3)
 	{
 		eDebug("malformed query: missing stuff");
 		res = 0;
 		return 1;
 	}
-	
+
 	res->m_type = decodeType(type);
-	
+
 	if (res->m_type == -1)
 	{
 		eDebug("malformed query: invalid type %s", type.c_str());
 		res = 0;
 		return 1;
 	}
-	
+
 	if (op == "==")
 		res->m_inverse = 0;
 	else if (op == "!=")
@@ -1859,7 +1866,7 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 		res = 0;
 		return 1;
 	}
-	
+
 	res->m_string = val;
 
 	if (res->m_type == eDVBChannelQuery::tChannelID)
@@ -1879,7 +1886,7 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 {
 	std::list<std::string> tokens;
-	
+
 	std::string current_token;
 	std::string bouquet_name;
 
@@ -1891,34 +1898,34 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 	{
 		int c = (i < query.size()) ? query[i] : ' ';
 		++i;
-		
+
 		int issplit = !!strchr(splitchars, c);
 		int isaln = isalnum(c);
 		int iswhite = c == ' ';
 		int isquot = c == '\"';
-		
+
 		if (quotemode)
 		{
 			iswhite = issplit = 0;
 			isaln = lastalnum;
 		}
-		
+
 		if (issplit || iswhite || isquot || lastsplit || (lastalnum != isaln))
 		{
 			if (current_token.size())
 				tokens.push_back(current_token);
 			current_token.clear();
 		}
-		
+
 		if (!(iswhite || isquot))
 			current_token += c;
-		
+
 		if (isquot)
 			quotemode = !quotemode;
 		lastsplit = issplit;
 		lastalnum = isaln;
 	}
-	
+
 //	for (std::list<std::string>::const_iterator a(tokens.begin()); a != tokens.end(); ++a)
 //	{
 //		printf("%s\n", a->c_str());
@@ -1970,12 +1977,12 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 		res = 0;
 		return -1;
 	}
-	
+
 //	eDebug("sort by %d", sort);
-	
+
 		/* now we recursivly parse that. */
 	int r = parseExpression(res, tokens.begin(), tokens.end());
-	
+
 		/* we have an empty (but valid!) expression */
 	if (!r && !res)
 	{
@@ -1983,7 +1990,7 @@ RESULT eDVBChannelQuery::compile(ePtr<eDVBChannelQuery> &res, std::string query)
 		res->m_inverse = 0;
 		res->m_type = eDVBChannelQuery::tAny;
 	}
-	
+
 	if (res)
 	{
 		res->m_sort = sort;
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index eac4554d..24609438 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -70,19 +70,19 @@ eDVBResourceManager::eDVBResourceManager()
 
 	if (!instance)
 		instance = this;
-		
+
 		/* search available adapters... */
 
 		// add linux devices
-	
+
 	int num_adapter = 0;
 	while (eDVBAdapterLinux::exist(num_adapter))
 	{
 		addAdapter(new eDVBAdapterLinux(num_adapter));
 		num_adapter++;
 	}
-	
-	eDebug("found %d adapter, %d frontends(%d sim) and %d demux", 
+
+	eDebug("found %d adapter, %d frontends(%d sim) and %d demux",
 		m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size());
 
 	eDVBCAService::registerChannelCallback(this);
@@ -104,7 +104,7 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
 {
 		// scan frontends
 	int num_fe = 0;
-	
+
 	eDebug("scanning for frontends..");
 	while (1)
 	{
@@ -133,7 +133,7 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
 		}
 		++num_fe;
 	}
-	
+
 		// scan demux
 	int num_demux = 0;
 	while (1)
@@ -148,10 +148,10 @@ eDVBAdapterLinux::eDVBAdapterLinux(int nr): m_nr(nr)
 		if (stat(filename, &s))
 			break;
 		ePtr<eDVBDemux> demux;
-		
+
 		demux = new eDVBDemux(m_nr, num_demux);
 		m_demux.push_back(demux);
-			
+
 		++num_demux;
 	}
 }
@@ -169,12 +169,12 @@ RESULT eDVBAdapterLinux::getDemux(ePtr<eDVBDemux> &demux, int nr)
 		--nr;
 		++i;
 	}
-	
+
 	if (i != m_demux.end())
 		demux = *i;
 	else
 		return -1;
-		
+
 	return 0;
 }
 
@@ -191,12 +191,12 @@ RESULT eDVBAdapterLinux::getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simula
 		--nr;
 		++i;
 	}
-	
+
 	if (i != m_frontend.end())
 		fe = *i;
 	else
 		return -1;
-		
+
 	return 0;
 }
 
@@ -224,9 +224,9 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 {
 	int num_fe = adapter->getNumFrontends();
 	int num_demux = adapter->getNumDemux();
-	
+
 	m_adapter.push_back(adapter);
-	
+
 	int i;
 	for (i=0; i<num_demux; ++i)
 	{
@@ -426,9 +426,9 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 
 	if (i == m_demux.end())
 		return -1;
-	
+
 	ePtr<eDVBRegisteredDemux> unused;
-	
+
 	if (m_demux.size() < 5)
 	{
 		/* FIXME: hardware demux policy */
@@ -444,14 +444,14 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 		for (; i != m_demux.end(); ++i, ++n)
 		{
 			int is_decode = n < 2;
-		
+
 			int in_use = is_decode ? (i->m_demux->getRefCount() != 2) : i->m_inuse;
-		
+
 			if ((!in_use) && ((!fe) || (i->m_adapter == fe->m_adapter)))
 			{
 				if ((cap & iDVBChannel::capDecode) && !is_decode)
 					continue;
-				unused = i;	
+				unused = i;
 				break;
 			}
 		}
@@ -467,7 +467,7 @@ RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
 					if (!unused)
 						unused = i;
 				}
-				else if (i->m_adapter == fe->m_adapter && 
+				else if (i->m_adapter == fe->m_adapter &&
 				    i->m_demux->getSource() == fe->m_frontend->getDVBID())
 				{
 					demux = new eDVBAllocatedDemux(i);
@@ -573,7 +573,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
 	}
 
 	/* allocate a frontend. */
-	
+
 	ePtr<eDVBAllocatedFrontend> fe;
 
 	int err = allocateFrontend(fe, feparm, simulate);
@@ -999,7 +999,7 @@ int eDVBChannelFilePush::filterRecordData(const unsigned char *_data, int len, s
 
 			if (m_iframe_state == 1)
 			{
-					/* we are allowing data, and stop allowing data on the next frame. 
+					/* we are allowing data, and stop allowing data on the next frame.
 					   we now found a frame. so stop here. */
 				memset(data + offset, 0, 188 - (offset%188)); /* zero out rest of TS packet */
 				current_span_remaining = 0;
@@ -1064,9 +1064,9 @@ eDVBChannel::eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *fronte
 	m_frontend = frontend;
 
 	m_pvr_thread = 0;
-	
+
 	m_skipmode_n = m_skipmode_m = 0;
-	
+
 	if (m_frontend)
 		m_frontend->get().connectStateChange(slot(*this, &eDVBChannel::frontendStateChanged), m_conn_frontendStateChanged);
 }
@@ -1082,14 +1082,14 @@ eDVBChannel::~eDVBChannel()
 void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 {
 	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;
-	
+
 	if (state == iDVBFrontend::stateLock)
 	{
 		eDebug("OURSTATE: ok");
@@ -1118,7 +1118,7 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
 		ourstate = state_failed;
 	} else
 		eFatal("state unknown");
-	
+
 	if (ourstate != m_state)
 	{
 		m_state = ourstate;
@@ -1235,7 +1235,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	const int blocksize = 188;
 	unsigned int max = align(10*1024*1024, blocksize);
 	current_offset = align(current_offset, blocksize);
-	
+
 	if (!m_cue)
 	{
 		eDebug("no cue sheet. forcing normal play");
@@ -1306,7 +1306,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				continue;
 			}
 		}
-		
+
 		if (relative == 1) /* pts relative */
 		{
 			pts += now;
@@ -1317,7 +1317,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 		if (relative != 2)
 			if (pts < 0)
 				pts = 0;
-		
+
 		if (relative == 2) /* AP relative */
 		{
 			eDebug("AP relative seeking: %lld, at %lld", pts, now);
@@ -1332,7 +1332,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 				pts = nextap;
 			}
 		}
-		
+
 		off_t offset = 0;
 		if (m_tstools.getOffset(offset, pts))
 		{
@@ -1350,7 +1350,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off
 	{
 		long long aligned_start = align(i->first, blocksize);
 		long long aligned_end = align(i->second, blocksize);
-	
+
 		if ((current_offset >= aligned_start) && (current_offset < aligned_end))
 		{
 			start = current_offset;
@@ -1449,7 +1449,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
 {
 	if (m_channel_id)
 		m_mgr->removeChannel(this);
-		
+
 	if (!channelid)
 		return 0;
 
@@ -1458,7 +1458,7 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
 		eDebug("no frontend to tune!");
 		return -ENODEV;
 	}
-	
+
 	m_channel_id = channelid;
 	m_mgr->addChannel(channelid, this);
 	m_state = state_tuning;
@@ -1466,14 +1466,14 @@ RESULT eDVBChannel::setChannel(const eDVBChannelID &channelid, ePtr<iDVBFrontend
 	int res;
 	res = m_frontend->get().tune(*feparm);
 	m_current_frontend_parameters = feparm;
-	
+
 	if (res)
 	{
 		m_state = state_release;
 		m_stateChanged(this);
 		return res;
 	}
-	
+
 	return 0;
 }
 
@@ -1558,21 +1558,21 @@ RESULT eDVBChannel::requestTsidOnid(ePyObject callback)
 RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
 {
 	ePtr<eDVBAllocatedDemux> &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux;
-	
+
 	if (!our_demux)
 	{
 		demux = 0;
-		
+
 		if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap))
 			return -1;
 	}
-	
+
 	demux = *our_demux;
 		/* don't hold a reference to the decoding demux, we don't need it. */
-		
+
 		/* FIXME: by dropping the 'allocated demux' in favour of the 'iDVBDemux',
-		   the refcount is lost. thus, decoding demuxes are never allocated. 
-		   
+		   the refcount is lost. thus, decoding demuxes are never allocated.
+
 		   this poses a big problem for PiP. */
 	if (cap & capDecode)
 		our_demux = 0;
@@ -1605,12 +1605,12 @@ RESULT eDVBChannel::playFile(const char *file)
 		delete m_pvr_thread;
 		m_pvr_thread = 0;
 	}
-	
+
 	m_tstools.openFile(file);
-	
+
 		/* 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.) */
 #if HAVE_DVB_API_VERSION < 3
 	m_pvr_fd_dst = open("/dev/pvr", O_WRONLY);
@@ -1671,11 +1671,11 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in
 {
 	if (!decoding_demux)
 		return -1;
-	
+
 	pts_t now;
-	
+
 	int r;
-	
+
 	if (mode == 0) /* demux */
 	{
 		r = decoding_demux->getSTC(now, 0);
@@ -1686,7 +1686,7 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in
 		}
 	} else
 		now = pos; /* fixup supplied */
-	
+
 	off_t off = 0; /* TODO: fixme */
 	r = m_tstools.fixupPTS(off, now);
 	if (r)
@@ -1694,9 +1694,9 @@ RESULT eDVBChannel::getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, in
 		eDebug("fixup PTS failed");
 		return -1;
 	}
-	
+
 	pos = now;
-	
+
 	return 0;
 }
 
@@ -1707,7 +1707,7 @@ void eDVBChannel::flushPVR(iDVBDemux *decoding_demux)
 			   a.) the filepush's internal buffer
 			   b.) the PVR buffer (before demux)
 			   c.) the ratebuffer (after demux)
-			   
+
 			   it's important to clear them in the correct order, otherwise
 			   the ratebuffer (for example) would immediately refill from
 			   the not-yet-flushed PVR buffer.
@@ -1718,7 +1718,7 @@ void eDVBChannel::flushPVR(iDVBDemux *decoding_demux)
 	m_pvr_thread->flush();
 		/* HACK: flush PVR buffer */
 	::ioctl(m_pvr_fd_dst, 0);
-	
+
 		/* flush ratebuffers (video, audio) */
 	if (decoding_demux)
 		decoding_demux->flush();
@@ -1742,7 +1742,7 @@ void eCueSheet::seekTo(int relative, const pts_t &pts)
 	m_lock.Unlock();
 	m_event(evtSeek);
 }
-	
+
 void eCueSheet::clear()
 {
 	m_lock.WrLock();