aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/db.cpp
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2008-04-30 00:40:12 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2008-04-30 00:40:12 +0000
commit44f52e5a73ba45c4a2ba31a91db4239de91ec60a (patch)
treee4603421a067d2ebab2e54769b7c2f21a6628ca0 /lib/dvb/db.cpp
parentafdb23adeccba916f1b17a5e643a43bb1699a365 (diff)
downloadenigma2-44f52e5a73ba45c4a2ba31a91db4239de91ec60a.tar.gz
enigma2-44f52e5a73ba45c4a2ba31a91db4239de91ec60a.zip
use e2 functions to merge config and services
Diffstat (limited to 'lib/dvb/db.cpp')
-rw-r--r--lib/dvb/db.cpp11
1 files changed, 8 insertions, 3 deletions
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) )