show real satellite name in satellite list

3 files changed, 37 insertions, 8 deletions

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 285063ec..f84b9613 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -47,6 +47,19 @@ public:
 	std::string path;
 	std::string getPath() { return path; }
 
+	int getData(int num) const
+	{
+		if ( num < sizeof(data)/sizeof(int) )
+			return data[num];
+		return 0;
+	}
+
+	void setData(int num, int val)
+	{
+		if ( num < sizeof(data)/sizeof(int) )
+			data[num] = val;
+	}
+
 // only for override service names in bouquets or to give servicerefs a name which not have a
 // real existing service ( for dvb eServiceDVB )
 	std::string name;
diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 035658ee..cd48c62e 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -3,12 +3,29 @@
 #include <lib/gdi/font.h>
 #include <lib/dvb/epgcache.h>
 #include <lib/dvb/pmt.h>
+#include <lib/python/connections.h>
 
-void eListboxServiceContent::setRoot(const eServiceReference &root)
+void eListboxServiceContent::addService(const eServiceReference &service)
+{
+	m_list.push_back(service);
+}
+
+void eListboxServiceContent::FillFinished()
+{
+	m_size = m_list.size();
+	cursorHome();
+
+	if (m_listbox)
+		m_listbox->entryReset();
+}
+
+void eListboxServiceContent::setRoot(const eServiceReference &root, bool justSet)
 {
 	m_list.clear();
 	m_root = root;
-	
+
+	if (justSet)
+		return;
 	assert(m_service_center);
 	
 	ePtr<iListableService> lst;
@@ -18,11 +35,7 @@ void eListboxServiceContent::setRoot(const eServiceReference &root)
 		if (lst->getContent(m_list))
 			eDebug("getContent failed");
 
-	m_size = m_list.size();
-	cursorHome();
-	
-	if (m_listbox)
-		m_listbox->entryReset();
+	FillFinished();
 }
 
 void eListboxServiceContent::setCurrent(const eServiceReference &ref)
diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index a742b061..234cd390 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -11,8 +11,11 @@ class eListboxServiceContent: public virtual iListboxContent
 public:
 	eListboxServiceContent();
 
+	void addService(const eServiceReference &ref);
+	void FillFinished();
+
 	void setIgnoreService( const eServiceReference &service );
-	void setRoot(const eServiceReference &ref);
+	void setRoot(const eServiceReference &ref, bool justSet=false);
 	void getCurrent(eServiceReference &ref);
 	
 	int getNextBeginningWithChar(char c);