From 54ac5eaaab8065473fb023c713e383b7fe5d15a9 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sat, 21 Jun 2008 01:22:21 +0200 Subject: Changed the definition of tntversion in the LIVE source files. Now there is a define TNTVERSION set to a number that can be compared in C oreprocessor 'if' statements. This allows for adding support for tntnet specific features with evolving tntnet version. --- setup.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'setup.h') diff --git a/setup.h b/setup.h index cc1d853..c341a5e 100644 --- a/setup.h +++ b/setup.h @@ -14,6 +14,9 @@ namespace vdrlive { +// SSL-Support works from tntnet version 1.6.1 onwards. +#define TNTSSLSUPPORT TNTVERSION >= 1610 + // forward declaration, see below class cMenuSetupLive; @@ -28,7 +31,7 @@ class Setup // commandline int GetServerPort() const { return m_serverPort; } -#ifdef TNTVERS7 +#if TNTSSLSUPPORT int GetServerSslPort() const { return m_serverSslPort; } std::string GetServerSslCert() const { return m_serverSslCert; } #endif @@ -98,7 +101,7 @@ class Setup mutable std::string m_helpString; // commandline options int m_serverPort; -#ifdef TNTVERS7 +#if TNTSSLSUPPORT int m_serverSslPort; std::string m_serverSslCert; static std::string m_configDirectory; @@ -130,7 +133,7 @@ class Setup bool CheckServerPort(); bool CheckServerIps(); -#ifdef TNTVERS7 +#if TNTSSLSUPPORT bool CheckServerSslPort(); #endif }; -- cgit v1.2.3