add support for markers in bouquets

< > are usable to jump from marker to marker

2 files changed, 9 insertions, 3 deletions

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index eb0721b6..eb62f1fb 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -12,13 +12,19 @@
 
 DEFINE_REF(eDVBService);
 
-RESULT eBouquet::addService(const eServiceReference &ref)
+RESULT eBouquet::addService(const eServiceReference &ref, eServiceReference before)
 {
 	list::iterator it =
 		std::find(m_services.begin(), m_services.end(), ref);
 	if ( it != m_services.end() )
 		return -1;
-	m_services.push_back(ref);
+	if (before.valid())
+	{
+		it = std::find(m_services.begin(), m_services.end(), before);
+		m_services.insert(it, ref);
+	}
+	else
+		m_services.push_back(ref);
 	return 0;
 }
 
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 5c427e7a..46d3e5d6 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -34,7 +34,7 @@ struct eBouquet
 	list m_services;
 // the following five methods are implemented in db.cpp
 	RESULT flushChanges();
-	RESULT addService(const eServiceReference &);
+	RESULT addService(const eServiceReference &, eServiceReference before=eServiceReference());
 	RESULT removeService(const eServiceReference &);
 	RESULT moveService(const eServiceReference &, unsigned int);
 	RESULT setListName(const std::string &name);