From af54bd8bc8fde95cdb379bd0d2673ede234a0645 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Fri, 13 Feb 2015 21:28:25 +0100 Subject: Only VDR versions which have an APIVERSION greater than 10729 are supported from now on. This drop some conditional compilations and thus simplyfies overall maintanance. --- live.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'live.cpp') diff --git a/live.cpp b/live.cpp index 653c6a6..234e66a 100644 --- a/live.cpp +++ b/live.cpp @@ -24,9 +24,7 @@ const char *Plugin::VERSION = LIVEVERSION; const char *Plugin::DESCRIPTION = LIVESUMMARY; std::string Plugin::m_configDirectory; -#if APIVERSNUM > 10729 std::string Plugin::m_resourceDirectory; -#endif cUsers Users; @@ -47,22 +45,13 @@ bool Plugin::ProcessArgs(int argc, char *argv[]) bool Plugin::Start(void) { m_configDirectory = canonicalize_file_name(cPlugin::ConfigDirectory( PLUGIN_NAME_I18N )); -#if APIVERSNUM > 10729 m_resourceDirectory = canonicalize_file_name(cPlugin::ResourceDirectory( PLUGIN_NAME_I18N )); -#endif -#if VDRVERSNUM < 10507 - RegisterI18n( vdrlive::Phrases ); -#endif // force status monitor startup LiveStatusMonitor(); // preload files into file Cache -#if APIVERSNUM > 10729 PreLoadFileCache(m_resourceDirectory); -#else - PreLoadFileCache(m_configDirectory); -#endif // load users Users.Load(AddDirectory(m_configDirectory.c_str(), "users.conf"), true); -- cgit v1.2.3