diff --git a/HISTORY b/HISTORY index ed82be5..560c950 100644 --- a/HISTORY +++ b/HISTORY @@ -93,3 +93,4 @@ VDR Plugin 'satip' Revision History - Updated the command-line help and README. - Fixed the server teardown. +- Removed the unnecessary config directory definition. diff --git a/config.c b/config.c index 8786626..57e3bce 100644 --- a/config.c +++ b/config.c @@ -21,7 +21,6 @@ cSatipConfig::cSatipConfig(void) disabledSourcesM[i] = cSource::stNone; for (unsigned int i = 0; i < ARRAY_SIZE(disabledFiltersM); ++i) disabledFiltersM[i] = -1; - memset(configDirectoryM, 0, sizeof(configDirectoryM)); } unsigned int cSatipConfig::GetDisabledSourcesCount(void) const @@ -61,9 +60,3 @@ void cSatipConfig::SetDisabledFilters(unsigned int indexP, int numberP) if (indexP < ARRAY_SIZE(disabledFiltersM)) disabledFiltersM[indexP] = numberP; } - -void cSatipConfig::SetConfigDirectory(const char *directoryP) -{ - debug1("%s (%s)", __PRETTY_FUNCTION__, directoryP); - ERROR_IF(!realpath(directoryP, configDirectoryM), "Cannot canonicalize configuration directory"); -} diff --git a/config.h b/config.h index 7b96704..8fb775f 100644 --- a/config.h +++ b/config.h @@ -20,7 +20,6 @@ private: unsigned int useBytesM; int disabledSourcesM[MAX_DISABLED_SOURCES_COUNT]; int disabledFiltersM[SECTION_FILTER_TABLE_SIZE]; - char configDirectoryM[PATH_MAX]; public: enum eOperatingMode { @@ -61,7 +60,6 @@ public: bool IsTraceMode(eTraceMode modeP) const { return (traceModeM & modeP); } unsigned int GetEITScan(void) const { return eitScanM; } unsigned int GetUseBytes(void) const { return useBytesM; } - const char *GetConfigDirectory(void) const { return configDirectoryM; } unsigned int GetDisabledSourcesCount(void) const; int GetDisabledSources(unsigned int indexP) const; unsigned int GetDisabledFiltersCount(void) const; @@ -71,7 +69,6 @@ public: void SetTraceMode(unsigned int modeP) { traceModeM = (modeP & eTraceModeMask); } void SetEITScan(unsigned int onOffP) { eitScanM = onOffP; } void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; } - void SetConfigDirectory(const char *directoryP); void SetDisabledSources(unsigned int indexP, int sourceP); void SetDisabledFilters(unsigned int indexP, int numberP); }; diff --git a/satip.c b/satip.c index d4e756d..1da6d39 100644 --- a/satip.c +++ b/satip.c @@ -122,7 +122,6 @@ bool cPluginSatip::Initialize(void) // Initialize any background activities the plugin shall perform. if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) error("Unable to initialize CURL"); - SatipConfig.SetConfigDirectory(cPlugin::ResourceDirectory(PLUGIN_NAME_I18N)); cSatipPoller::GetInstance()->Initialize(); cSatipDiscover::GetInstance()->Initialize(serversM); return cSatipDevice::Initialize(deviceCountM);