From 44f52e5a73ba45c4a2ba31a91db4239de91ec60a Mon Sep 17 00:00:00 2001
From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Wed, 30 Apr 2008 00:40:12 +0000
Subject: use e2 functions to merge config and services

---
 lib/dvb/db.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib/dvb/db.cpp')

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index b9d1108f..e1b19175 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -260,12 +260,17 @@ void eDVBService::setCacheEntry(cacheID id, int pid)
 
 DEFINE_REF(eDVBDB);
 
-	/* THIS CODE IS BAD. it should be replaced by somethine better. */
 void eDVBDB::reloadServicelist()
+{
+	loadServicelist(CONFIGDIR"/enigma2/lamedb");
+}
+
+	/* THIS CODE IS BAD. it should be replaced by somethine better. */
+void eDVBDB::loadServicelist(const char *file)
 {
 	eDebug("---- opening lame channel db");
-	FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "rt");
-	if (!f)
+	FILE *f=fopen(file, "rt");
+	if (!f && strcmp(file, CONFIGDIR"/enigma2/lamedb") == 0)
 	{
 		struct stat s;
 		if ( !stat("lamedb", &s) )
-- 
cgit v1.2.3