diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2010-06-20 18:17:42 +0200 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2010-06-20 18:17:42 +0200 |
| commit | 8edd4eb02751bbf45ab2833102dee3707fbbd499 (patch) | |
| tree | cbfbebe9c403d896b1788f8fad124ee4d770002d /tntconfig.cpp | |
| parent | a5f3edc89393f869bfc6cbcadff5b727562df88a (diff) | |
| download | vdr-plugin-live-8edd4eb02751bbf45ab2833102dee3707fbbd499.tar.gz vdr-plugin-live-8edd4eb02751bbf45ab2833102dee3707fbbd499.tar.bz2 | |
Reaction to a patch sent by Jan Willies for an other problem withcvs-commit-370
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.
Diffstat (limited to 'tntconfig.cpp')
| -rw-r--r-- | tntconfig.cpp | 12 |
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" |