From 26e11cd67e0bbfebd41b860a008f240d3d1b3052 Mon Sep 17 00:00:00 2001
From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 29 Nov 2010 14:10:30 +0100
Subject: use std::list instead of std::set for caid/capid pairs to support
 duplicate caids refs #621

---
 lib/dvb/pmt.cpp      | 30 +++++++++++++++++-------------
 lib/dvb/pmt.h        |  2 +-
 lib/dvb_ci/dvbci.cpp |  3 ++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 4a826c12..be4fb170 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -157,13 +157,13 @@ PyObject *eDVBServicePMTHandler::getCaIds(bool pair)
 
 	if ( !getProgramInfo(prog) )
 	{
-		int cnt=prog.caids.size();
-		if (cnt)
+		if (pair)
 		{
-			ret=PyList_New(cnt);
-			std::set<program::capid_pair>::iterator it(prog.caids.begin());
-			if (pair)
+			int cnt=prog.caids.size();
+			if (cnt)
 			{
+				ret=PyList_New(cnt);
+				std::list<program::capid_pair>::iterator it(prog.caids.begin());
 				while(cnt--)
 				{
 					ePyObject tuple = PyTuple_New(2);
@@ -172,11 +172,15 @@ PyObject *eDVBServicePMTHandler::getCaIds(bool pair)
 					PyList_SET_ITEM(ret, cnt, tuple);
 				}
 			}
-			else
-			{
-				while(cnt--)
-					PyList_SET_ITEM(ret, cnt, PyInt_FromLong((it++)->caid));
-			}
+		}
+		else
+		{
+			std::set<program::capid_pair> set(prog.caids.begin(), prog.caids.end());
+			std::set<program::capid_pair>::iterator it(set.begin());
+			int cnt=set.size();
+			ret=PyList_New(cnt);
+			while(cnt--)
+				PyList_SET_ITEM(ret, cnt, PyInt_FromLong((it++)->caid));
 		}
 	}
 
@@ -476,7 +480,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 								program::capid_pair pair;
 								pair.caid = descr->getCaSystemId();
 								pair.capid = descr->getCaPid();
-								program.caids.insert(pair);
+								program.caids.push_back(pair);
 								break;
 							}
 							default:
@@ -542,7 +546,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 						program::capid_pair pair;
 						pair.caid = descr->getCaSystemId();
 						pair.capid = descr->getCaPid();
-						program.caids.insert(pair);
+						program.caids.push_back(pair);
 					}
 				}
 			}
@@ -612,7 +616,7 @@ int eDVBServicePMTHandler::getProgramInfo(program &program)
 			program::capid_pair pair;
 			pair.caid = *it;
 			pair.capid = -1; // not known yet
-			program.caids.insert(pair);
+			program.caids.push_back(pair);
 		}
 		if ( cnt )
 			ret = 0;
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 4a506a41..40a226ef 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -191,7 +191,7 @@ public:
 		std::vector<audioStream> audioStreams;
 		int defaultAudioStream;
 		std::vector<subtitleStream> subtitleStreams;
-		std::set<capid_pair> caids;
+		std::list<capid_pair> caids;
 		int pcrPid;
 		int pmtPid;
 		int textPid;
diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 342f06a6..8a43e5b1 100644
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -297,7 +297,8 @@ void eDVBCIInterfaces::recheckPMTHandlers()
 		if (!pmthandler->getProgramInfo(p))
 		{
 			int cnt=0;
-			for (std::set<eDVBServicePMTHandler::program::capid_pair>::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt)
+			std::set<eDVBServicePMTHandler::program::capid_pair> set(p.caids.begin(), p.caids.end());
+			for (std::set<eDVBServicePMTHandler::program::capid_pair>::reverse_iterator x(set.rbegin()); x != set.rend(); ++x, ++cnt)
 				caids.push_front(x->caid);
 			if (service && cnt)
 				service->m_ca = caids;
-- 
cgit v1.2.3