mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix most hardcoded paths

Browse Source 
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIlanguage.hpp
	src/gui/bookmarkmanager.h
	src/gui/keybind_setup.cpp
	src/gui/settings_manager.cpp
	src/nhttpd/yconfig.h
	src/nhttpd/yhttpd_mods/Makefile.am
	src/system/localize.cpp
This commit is contained in:
Stefan Seyfried
2013-03-10 02:01:52 +01:00
committed by [CST] Focus
parent 0d2c3f3f10
commit 166e403965
11 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -459,7 +459,7 @@ void CPictureViewer::getSize(const char* name, int* width, int *height)
} }
} }
#define LOGO_DIR1 "/share/tuxbox/neutrino/icons/logo" #define LOGO_DIR1 DATADIR "/neutrino/icons/logo"
#define LOGO_FMT ".jpg" #define LOGO_FMT ".jpg"
bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, std::string & name, int *width, int *height) bool CPictureViewer::GetLogoName(uint64_t channel_id, std::string ChannelName, std::string & name, int *width, int *height)

2
src/eitd/SIlanguage.cpp
View File

@@ -36,8 +36,6 @@
#include "SIlanguage.hpp" #include "SIlanguage.hpp"
static const char LANGUAGEFILE[] = CONFIGDIR "/epglanguages.conf";
std::vector<std::string> SIlanguage::languages; std::vector<std::string> SIlanguage::languages;
pthread_mutex_t SIlanguage::languages_lock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t SIlanguage::languages_lock = PTHREAD_MUTEX_INITIALIZER;

2
src/eitd/SIlanguage.hpp
View File

@@ -29,6 +29,8 @@
#include <sectionsdclient/sectionsdclient.h> #include <sectionsdclient/sectionsdclient.h>
#define LANGUAGEFILE CONFIGDIR "/epglanguages.conf"
class SIlanguage { class SIlanguage {
public: public:
static void filter(const std::map<std::string, std::string>& s, int max, std::string& retval); static void filter(const std::map<std::string, std::string>& s, int max, std::string& retval);

2
src/gui/bookmarkmanager.h
View File

@@ -43,7 +43,7 @@
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#define MAXBOOKMARKS 10 #define MAXBOOKMARKS 10
#define BOOKMARKFILE CONFIGDIR"/bookmarks" #define BOOKMARKFILE CONFIGDIR "/bookmarks"
class CBookmark class CBookmark
{ {

2
src/gui/keybind_setup.cpp
View File

@@ -91,7 +91,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
CFileFilter fileFilter; CFileFilter fileFilter;
fileFilter.addFilter("conf"); fileFilter.addFilter("conf");
fileBrowser.Filter = &fileFilter; fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec(CONFIGDIR "") == true) { if (fileBrowser.exec(CONFIGDIR) == true) {
CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str()); CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str());
printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str()); printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str());
} }

2
src/gui/settings_manager.cpp
View File

@@ -71,7 +71,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
fileFilter.addFilter("conf"); fileFilter.addFilter("conf");
fileBrowser.Filter = &fileFilter; fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec(CONFIGDIR "") == true) if (fileBrowser.exec(CONFIGDIR) == true)
{ {
CNeutrinoApp::getInstance()->loadSetup(fileBrowser.getSelectedFile()->Name.c_str()); CNeutrinoApp::getInstance()->loadSetup(fileBrowser.getSelectedFile()->Name.c_str());
CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier; CColorSetupNotifier *colorSetupNotifier = new CColorSetupNotifier;

2
src/nhttpd/yconfig.h
View File

@@ -118,7 +118,7 @@
// switch for Box differences // switch for Box differences
#ifdef CONFIG_SYSTEM_TUXBOX #ifdef CONFIG_SYSTEM_TUXBOX
#define AUTHPASSWORD "dbox2" #define AUTHPASSWORD "dbox2"
#define PRIVATEDOCUMENTROOT DATADIR"/httpd-y" #define PRIVATEDOCUMENTROOT DATADIR "/neutrino/httpd-y"
#endif #endif
#ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM #ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM

2
src/nhttpd/yhttpd_mods/Makefile.am
View File

@@ -1,5 +1,5 @@
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \ -I$(top_builddir) \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
-I$(top_srcdir)/src/zapit/include \ -I$(top_srcdir)/src/zapit/include \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

2
src/nhttpd/yhttpd_mods/mod_yparser.cpp
View File

@@ -3,6 +3,8 @@
// yParser // yParser
//============================================================================= //=============================================================================
// C // C
#include <config.h>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <stdio.h> #include <stdio.h>

2
src/system/localize.cpp
View File

@@ -111,7 +111,7 @@ CLocaleManager::~CLocaleManager()
delete[] defaultData; delete[] defaultData;
} }
const char * path[2] = {CONFIGDIR "/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) CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const locale, bool asdefault)
{ {

4
src/zapit/include/zapit/zapit.h
View File

@@ -21,8 +21,8 @@
#define PAL 0 #define PAL 0
#define NTSC 1 #define NTSC 1
#define AUDIO_CONFIG_FILE "/var/tuxbox/config/zapit/audio.conf" #define AUDIO_CONFIG_FILE CONFIGDIR "/zapit/audio.conf"
#define VOLUME_CONFIG_FILE "/var/tuxbox/config/zapit/volume.conf" #define VOLUME_CONFIG_FILE CONFIGDIR "/zapit/volume.conf"
typedef std::map<t_channel_id, audio_map_set_t> audio_map_t; typedef std::map<t_channel_id, audio_map_set_t> audio_map_t;
typedef audio_map_t::iterator audio_map_iterator_t; typedef audio_map_t::iterator audio_map_iterator_t;