From 879d60c88e24c2c3f2aab9dff73192c901f63f31 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Thu, 28 Oct 2010 20:29:01 +0200
Subject: use eEnv::resolve() / eEnv.resolve()

---
 lib/dvb/db.cpp   | 15 ++++++++-------
 lib/dvb/scan.cpp |  6 ++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'lib/dvb')

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 38be6359..522035eb 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -3,6 +3,7 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/epgcache.h>
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
 #include <lib/base/estring.h>
 #include <xmlccwrap/xmlccwrap.h>
@@ -73,7 +74,7 @@ RESULT eBouquet::moveService(const eServiceReference &ref, unsigned int pos)
 
 RESULT eBouquet::flushChanges()
 {
-	FILE *f=fopen((CONFIGDIR"/enigma2/"+m_filename).c_str(), "w");
+	FILE *f=fopen(eEnv::resolve("${sysconfdir}/enigma2/" + m_filename).c_str(), "w");
 	if (!f)
 		return -1;
 	if ( fprintf(f, "#NAME %s\r\n", m_bouquet_name.c_str()) < 0 )
@@ -280,7 +281,7 @@ DEFINE_REF(eDVBDB);
 
 void eDVBDB::reloadServicelist()
 {
-	loadServicelist(CONFIGDIR"/enigma2/lamedb");
+	loadServicelist(eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str());
 }
 
 void eDVBDB::parseServiceData(ePtr<eDVBService> s, std::string str)
@@ -324,14 +325,14 @@ void eDVBDB::loadServicelist(const char *file)
 {
 	eDebug("---- opening lame channel db");
 	FILE *f=fopen(file, "rt");
-	if (!f && strcmp(file, CONFIGDIR"/enigma2/lamedb") == 0)
+	if (!f && strcmp(file, eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str()) == 0)
 	{
 		struct stat s;
 		if ( !stat("lamedb", &s) )
 		{
-			if ( !stat(CONFIGDIR"/enigma2", &s) )
+			if ( !stat(eEnv::resolve("${sysconfdir}/enigma2").c_str(), &s) )
 			{
-				rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
+				rename("lamedb", eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str());
 				reloadServicelist();
 			}
 		}
@@ -594,7 +595,7 @@ void eDVBDB::saveServicelist(const char *file)
 
 void eDVBDB::saveServicelist()
 {
-	saveServicelist(CONFIGDIR"/enigma2/lamedb");
+	saveServicelist(eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str());
 }
 
 void eDVBDB::loadBouquet(const char *path)
@@ -618,7 +619,7 @@ void eDVBDB::loadBouquet(const char *path)
 	std::list<eServiceReference> &list = bouquet.m_services;
 	list.clear();
 
-	std::string p = CONFIGDIR"/enigma2/";
+	std::string p = eEnv::resolve("${sysconfdir}/enigma2/");
 	p+=path;
 	eDebug("loading bouquet... %s", p.c_str());
 	FILE *fp=fopen(p.c_str(), "rt");
diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index b37aa714..d559614c 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -10,6 +10,7 @@
 #include <lib/dvb/esection.h>
 #include <lib/dvb/scan.h>
 #include <lib/dvb/frontend.h>
+#include <lib/base/eenv.h>
 #include <lib/base/eerror.h>
 #include <lib/base/estring.h>
 #include <lib/python/python.h>
@@ -29,7 +30,8 @@ eDVBScan::eDVBScan(iDVBChannel *channel, bool usePAT, bool debug)
 	if (m_channel->getDemux(m_demux))
 		SCAN_eDebug("scan: failed to allocate demux!");
 	m_channel->connectStateChange(slot(*this, &eDVBScan::stateChange), m_stateChanged_connection);
-	FILE *f = fopen("/etc/enigma2/scan_tp_valid_check.py", "r");
+	std::string filename = eEnv::resolve("${sysconfdir}/scan_tp_valid_check.py");
+	FILE *f = fopen(filename.c_str(), "r");
 	if (f)
 	{
 		char code[16384];
@@ -37,7 +39,7 @@ eDVBScan::eDVBScan(iDVBChannel *channel, bool usePAT, bool debug)
 		if (rd)
 		{
 			code[rd]=0;
-			m_additional_tsid_onid_check_func = Py_CompileString(code, "/etc/enigma2/scan_tp_valid_check.py", Py_file_input);
+			m_additional_tsid_onid_check_func = Py_CompileString(code, filename.c_str(), Py_file_input);
 		}
 		fclose(f);
 	}
-- 
cgit v1.2.3