From 61e31de98b97f556cfb2a0cafa172bde673e7859 Mon Sep 17 00:00:00 2001 From: Sascha Volkenandt Date: Thu, 4 Jan 2007 17:42:33 +0000 Subject: - removed thread-unsafe call of cPlugin::ConfigDirectory and replaced it with Plugin::GetConfigDirectory - implemented proper shutdown of server thread on vdr termination --- live.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'live.h') diff --git a/live.h b/live.h index ac1188b..eba7108 100644 --- a/live.h +++ b/live.h @@ -2,6 +2,7 @@ #define VDR_LIVE_LIVE_H #include +#include #include #include "thread.h" @@ -40,10 +41,14 @@ public: virtual Setup& GetLiveSetup(); virtual TimerManager& GetLiveTimerManager(); + static std::string const& GetConfigDirectory() { return m_configDirectory; } + private: static const char *VERSION; static const char *DESCRIPTION; + static std::string m_configDirectory; + std::auto_ptr< ServerThread > m_thread; }; -- cgit v1.2.3