From 8edd4eb02751bbf45ab2833102dee3707fbbd499 Mon Sep 17 00:00:00 2001 From: Dieter Hametner 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. --- setup.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'setup.h') diff --git a/setup.h b/setup.h index dd315c1..498540e 100644 --- a/setup.h +++ b/setup.h @@ -6,6 +6,7 @@ #include #include #include "live.h" +#include "tntfeatures.h" #include #define LIVEVERSION "0.2.0" @@ -14,9 +15,6 @@ namespace vdrlive { -// SSL-Support works from tntnet version 1.6.1 onwards. -#define TNTSSLSUPPORT TNTVERSION >= 1610 - // forward declaration, see below class cMenuSetupLive; @@ -31,7 +29,7 @@ class Setup // commandline int GetServerPort() const { return m_serverPort; } -#if TNTSSLSUPPORT +#if TNT_SSL_SUPPORT int GetServerSslPort() const { return m_serverSslPort; } std::string GetServerSslCert() const { return m_serverSslCert; } std::string GetServerSslKey() const { return m_serverSslKey; } @@ -104,7 +102,7 @@ class Setup mutable std::string m_helpString; // commandline options int m_serverPort; -#if TNTSSLSUPPORT +#if TNT_SSL_SUPPORT int m_serverSslPort; std::string m_serverSslCert; std::string m_serverSslKey; @@ -138,7 +136,7 @@ class Setup bool CheckServerPort(); bool CheckServerIps(); -#if TNTSSLSUPPORT +#if TNT_SSL_SUPPORT bool CheckServerSslPort(); #endif }; -- cgit v1.2.3