summaryrefslogtreecommitdiff
path: root/thread.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'thread.cpp')
-rw-r--r--thread.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/thread.cpp b/thread.cpp
index 515e113..972b155 100644
--- a/thread.cpp
+++ b/thread.cpp
@@ -11,19 +11,6 @@ namespace vdrlive {
using namespace std;
using namespace tnt;
-#if ! TNT_CONFIG_INTERNAL
-class ProtectedCString
-{
-public:
- ProtectedCString( char const* string ): m_string( strdup( string ) ) {}
- ~ProtectedCString() { free( m_string ); }
-
- operator char*() { return m_string; }
-
-private:
- char* m_string;
-};
-#endif // ! TNT_CONFIG_INTERNAL
ServerThread::ServerThread()
{
@@ -45,17 +32,8 @@ void ServerThread::Stop()
void ServerThread::Action()
{
try {
-#if TNT_CONFIG_INTERNAL
m_server.reset(new Tntnet());
TntConfig::Get().Configure(*m_server);
-#else
- ProtectedCString configPath(TntConfig::Get().GetConfigPath().c_str());
-
- char* argv[] = { const_cast< char* >( "tntnet" ), const_cast< char* >( "-c" ), configPath };
- int argc = sizeof( argv ) / sizeof( argv[0] );
-
- m_server.reset(new Tntnet( argc, argv ));
-#endif // TNT_CONFIG_INTERNAL
m_server->run();
m_server.reset(0);
} catch (exception const& ex) {