From 8edd4eb02751bbf45ab2833102dee3707fbbd499 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sun, 20 Jun 2010 18:17:42 +0200
Subject: Reaction to a patch sent by Jan Willies for an other problem with
 tntnet version string. Jan's patch resolved the immediate problem with regard
 to the updated version but was not backwards compatible for older tntnet
 version. My changes to the code adressed that problem and added an
 enhancement how to deal with that problem in the future.

---
 tntconfig.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tntconfig.cpp')

diff --git a/tntconfig.cpp b/tntconfig.cpp
index d35dad4..4f0df22 100644
--- a/tntconfig.cpp
+++ b/tntconfig.cpp
@@ -20,12 +20,12 @@ namespace vdrlive {
 
 	TntConfig::TntConfig()
 	{
-#if TNTVERSION < 1606
+#if ! TNT_CONFIG_INTERNAL
 		WriteConfig();
 #endif
 	}
 
-#if TNTVERSION < 1606
+#if ! TNT_CONFIG_INTERNAL
 	void TntConfig::WriteConfig()
 	{
 		WriteProperties();
@@ -131,7 +131,7 @@ namespace vdrlive {
 	}
 #endif
 
-#if TNTVERSION < 1606
+#if ! TNT_CONFIG_INTERNAL
 	void TntConfig::WriteProperties()
 	{
 		ostringstream builder;
@@ -151,7 +151,7 @@ namespace vdrlive {
 	}
 #endif
 
-#if TNTVERSION >= 1606
+#if TNT_CONFIG_INTERNAL
 	void TntConfig::Configure(tnt::Tntnet& app) const
 	{
 		string const configDir(Plugin::GetConfigDirectory());
@@ -267,7 +267,7 @@ namespace vdrlive {
 			}
 		}
 
-#if TNTSSLSUPPORT
+#if TNT_SSL_SUPPORT
 		int s_port = LiveSetup().GetServerSslPort();
 		string s_cert = LiveSetup().GetServerSslCert();
 		string s_key = LiveSetup().GetServerSslKey();
@@ -288,7 +288,7 @@ namespace vdrlive {
 		else {
 			esyslog( "ERROR: Unable to load cert/key (%s/%s): %s", s_cert.c_str(), s_key.c_str(), strerror( errno ) );
 		}
-#endif // TNTSSLSUPPORT
+#endif // TNT_SSL_SUPPORT
 
 		std::istringstream logConf(
 			"rootLogger=" + LiveSetup().GetTntnetLogLevel() + "\n"
-- 
cgit v1.2.3