diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 253d335d1..f989516be 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -1569,7 +1569,7 @@ void CFrameBuffer::Clear() //never used void CFrameBuffer::showFrame(const std::string & filename) { - std::string varpath = "/var/tuxbox/config/neutrino/icons/"; + std::string varpath = CONFIGDIR "/neutrino/icons/"; if(!access((varpath + filename).c_str(), F_OK)) videoDecoder->ShowPicture((varpath + filename).c_str()); else diff --git a/src/eitd/SIlanguage.cpp b/src/eitd/SIlanguage.cpp index e6ec07ae8..44db9a74d 100644 --- a/src/eitd/SIlanguage.cpp +++ b/src/eitd/SIlanguage.cpp @@ -32,7 +32,7 @@ #include "SIlanguage.hpp" -#define LANGUAGEFILE "/var/tuxbox/config/epglanguages.conf" +#define LANGUAGEFILE CONFIGDIR "/epglanguages.conf" std::vector SIlanguage::languages; pthread_mutex_t SIlanguage::languages_lock = PTHREAD_MUTEX_INITIALIZER; diff --git a/src/eitd/edvbstring.cpp b/src/eitd/edvbstring.cpp index 24882425e..010c3eaa3 100644 --- a/src/eitd/edvbstring.cpp +++ b/src/eitd/edvbstring.cpp @@ -17,7 +17,7 @@ std::set TransponderUseTwoCharMapping; int readEncodingFile() { - FILE *f = fopen("/var/tuxbox/config/encoding.conf", "rt"); + FILE *f = fopen(CONFIGDIR "/encoding.conf", "rt"); if (f) { CountryCodeDefaultMapping.clear(); TransponderDefaultMapping.clear(); diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 137cbf1e1..8ff854ed4 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -92,7 +92,7 @@ static bool messaging_zap_detected = false; /*static*/ bool dvb_time_update = false; //NTP-Config -#define CONF_FILE "/var/tuxbox/config/neutrino.conf" +#define CONF_FILE CONFIGDIR "/neutrino.conf" #ifdef USE_BB_NTPD const std::string ntp_system_cmd_prefix = "/sbin/ntpd -q -p "; @@ -1629,7 +1629,7 @@ void CEitThread::beforeSleep() messaging_zap_detected = false; unlockMessaging(); if(notify_complete) - system("/var/tuxbox/config/epgdone.sh"); + system(CONFIGDIR "/epgdone.sh"); } /********************************************************************************/ diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp index b700011f3..424dc38ed 100644 --- a/src/eitd/xmlutil.cpp +++ b/src/eitd/xmlutil.cpp @@ -47,8 +47,8 @@ extern bool reader_ready; extern pthread_rwlock_t eventsLock; extern bool dvb_time_update; -std::string epg_filter_dir = "/var/tuxbox/config/zapit/epgfilter.xml"; -std::string dvbtime_filter_dir = "/var/tuxbox/config/zapit/dvbtimefilter.xml"; +std::string epg_filter_dir = CONFIGDIR "/zapit/epgfilter.xml"; +std::string dvbtime_filter_dir = CONFIGDIR "/zapit/dvbtimefilter.xml"; bool epg_filter_is_whitelist = false; bool epg_filter_except_current_next = false; diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 478602188..376452cb2 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -91,7 +91,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey) CFileFilter fileFilter; fileFilter.addFilter("conf"); fileBrowser.Filter = &fileFilter; - if (fileBrowser.exec("/var/tuxbox/config") == true) { + if (fileBrowser.exec(CONFIGDIR "") == true) { CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str()); printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str()); } diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 7aec3d37d..0266b79dc 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -163,7 +163,7 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup) struct dirent **namelist; int n; // printf("scanning locale dir now....(perhaps)\n"); - char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) "/var/tuxbox/config/locale"}; + char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) CONFIGDIR "/locale"}; osdl_setup->addIntroItems(); diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 9bb4f3c60..c001f18a0 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -71,7 +71,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey) { fileFilter.addFilter("conf"); fileBrowser.Filter = &fileFilter; - if (fileBrowser.exec("/var/tuxbox/config") == true) + if (fileBrowser.exec(CONFIGDIR "") == true) { CNeutrinoApp::getInstance()->loadSetup(fileBrowser.getSelectedFile()->Name.c_str()); CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier; diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp index 25b21e0c3..bd78c0a6d 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -101,7 +101,7 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) } bool init_settings = false; if (CFEManager::getInstance()->haveSat()) - init_settings = file_exists("/var/tuxbox/config/initial/"); + init_settings = file_exists(CONFIGDIR "/initial/"); if(init_settings && (res != menu_return::RETURN_EXIT_ALL)) { diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index f212fab5f..c416e4cfc 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -514,14 +514,14 @@ void CControlAPI::GetTimeCGI(CyhookHandler *hh) // send services.xml void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh) { - hh->SendFile("/var/tuxbox/config/zapit/services.xml"); + hh->SendFile(CONFIGDIR "/zapit/services.xml"); } //----------------------------------------------------------------------------- // send bouquets.xml void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh) { - hh->SendFile("/var/tuxbox/config/zapit/bouquets.xml"); + hh->SendFile(CONFIGDIR "/zapit/bouquets.xml"); } //----------------------------------------------------------------------------- diff --git a/src/nhttpd/tuxboxapi/dbox/controlapi.cpp b/src/nhttpd/tuxboxapi/dbox/controlapi.cpp index 9b39fbce9..af2dd1b62 100644 --- a/src/nhttpd/tuxboxapi/dbox/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/dbox/controlapi.cpp @@ -524,14 +524,14 @@ void CControlAPI::SettingsCGI(CyhookHandler *hh) // send services.xml void CControlAPI::GetServicesxmlCGI(CyhookHandler *hh) { - hh->SendFile("/var/tuxbox/config/zapit/services.xml"); + hh->SendFile(CONFIGDIR "/zapit/services.xml"); } //----------------------------------------------------------------------------- // send bouquets.xml void CControlAPI::GetBouquetsxmlCGI(CyhookHandler *hh) { - hh->SendFile("/var/tuxbox/config/zapit/bouquets.xml"); + hh->SendFile(CONFIGDIR "/zapit/bouquets.xml"); } //----------------------------------------------------------------------------- diff --git a/src/system/localize.cpp b/src/system/localize.cpp index bed4a433a..21558ad7f 100644 --- a/src/system/localize.cpp +++ b/src/system/localize.cpp @@ -111,7 +111,7 @@ CLocaleManager::~CLocaleManager() delete[] defaultData; } -const char * path[2] = {"/var/tuxbox/config/locale/", DATADIR "/neutrino/locale/"}; +const char * path[2] = {CONFIGDIR "/locale/", DATADIR "/neutrino/locale/"}; CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const locale, bool asdefault) {