From af54bd8bc8fde95cdb379bd0d2673ede234a0645 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
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.

---
 i18n.h           |  9 ---------
 live.cpp         | 11 -----------
 live.h           |  4 ----
 pages/setup.ecpp |  4 ----
 recman.cpp       |  4 ----
 recman.h         |  3 +--
 tntconfig.cpp    |  5 -----
 7 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/i18n.h b/i18n.h
index ce5421f..e584d17 100644
--- a/i18n.h
+++ b/i18n.h
@@ -23,15 +23,6 @@ class I18n
 
 I18n& LiveI18n();
 
-#if APIVERSNUM < 10507
-extern const tI18nPhrase Phrases[];
-#define trNOOP(s) (s)
-#endif
-
-#if APIVERSNUM < 10509
-#define trVDR(s) tr(s)
-#endif
-
 } // namespace vdrlive
 
 #endif // VDR_LIVE_I18N_H
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);
diff --git a/live.h b/live.h
index 2b224a1..3239bc7 100644
--- a/live.h
+++ b/live.h
@@ -24,18 +24,14 @@ public:
 	virtual bool SetupParse(const char *Name, const char *Value);
 
 	static std::string const& GetConfigDirectory() { return m_configDirectory; }
-#if APIVERSNUM > 10729
 	static std::string const& GetResourceDirectory() { return m_resourceDirectory; }
-#endif
 
 private:
 	static const char *VERSION;
 	static const char *DESCRIPTION;
 
 	static std::string m_configDirectory;
-#if APIVERSNUM > 10729
 	static std::string m_resourceDirectory;
-#endif
 
 	std::auto_ptr< ServerThread > m_thread;
 };
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 9bb2261..695b26d 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -265,11 +265,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 						<td class="rightcol"><select name="theme" size="1" id="theme">
 <%cpp>
 {
-#if APIVERSNUM > 10729
 	const string dirPath(Plugin::GetResourceDirectory() + "/themes");
-#else
-	const string dirPath(Plugin::GetConfigDirectory() + "/themes");
-#endif
 	cReadDir d(dirPath.c_str());
 	struct dirent* e;
 	string parent("..");
diff --git a/recman.cpp b/recman.cpp
index ade3d93..f1cc9bc 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -669,11 +669,9 @@ namespace vdrlive {
 		}
 
 		m_pDirVec->push_back(""); // always add root directory
-#if APIVERSNUM >= 10712
 		for (cNestedItem* item = Folders.First(); item; item = Folders.Next(item)) { // add folders.conf entries
 			InjectFoldersConf(item);
 		}
-#endif
 		for (cRecording* recording = Recordings.First(); recording; recording = Recordings.Next(recording)) {
 			string name = recording->Name();
 			size_t found = name.find_last_of("~");
@@ -693,7 +691,6 @@ namespace vdrlive {
 		}
 	}
 
-#if APIVERSNUM >= 10712
 	void DirectoryList::InjectFoldersConf(cNestedItem * folder, string parent)
 	{
 		if (!folder) {
@@ -711,7 +708,6 @@ namespace vdrlive {
 			InjectFoldersConf(item, dir);
 		}
 	}
-#endif
 
 	/**
 	 *  Implementation of class DirectoryListPtr:
diff --git a/recman.h b/recman.h
index e239b0b..abc5359 100644
--- a/recman.h
+++ b/recman.h
@@ -357,9 +357,8 @@ namespace vdrlive {
 
 		private:
 			DirectoryList(RecordingsManagerPtr recManPtr);
-#if APIVERSNUM >= 10712
 			void InjectFoldersConf(cNestedItem * folder, std::string parent = "");
-#endif
+
 		public:
 			typedef std::list< std::string > DirVecType;
 
diff --git a/tntconfig.cpp b/tntconfig.cpp
index e4937ec..123ee78 100644
--- a/tntconfig.cpp
+++ b/tntconfig.cpp
@@ -31,13 +31,8 @@ namespace vdrlive {
 	namespace {
 		std::string GetResourcePath()
 		{
-#if APIVERSNUM > 10729
 			string resourceDir(Plugin::GetResourceDirectory());
 			return resourceDir;
-#else
-			string configDir(Plugin::GetConfigDirectory());
-			return configDir;
-#endif
 		}
 
 		void MapUrl(tnt::Tntnet & app, const char *rule, const char * component, std::string const & instPath, const char * pathInfo, const char * mime_type)
-- 
cgit v1.2.3