summaryrefslogtreecommitdiff
path: root/tntconfig.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tntconfig.cpp')
-rw-r--r--tntconfig.cpp12
1 files changed, 6 insertions, 6 deletions
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"