diff options
| author | Henri Herscher <henri@oreka.org> | 2006-07-05 01:59:32 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2006-07-05 01:59:32 +0000 |
| commit | c27745d1b387606b7e1a5869b7fe4b566410720d (patch) | |
| tree | 978a3e5176ff6db2f6b0856d8031e662b68ff03d /orkbasecxx/ConfigManager.h | |
| parent | 0d758fbcf5a581ca5909245cef65c00652219283 (diff) | |
* Tape processor interface becomes usable and used
* Reporting and BatchProcessing become "standard" tape processors
* Imediate processing kicks off the tape processor chain
* Object now references Serializer
* ConfigManager singleton not an ACE singleton anymore because ACE singletons are not unique across DLL boundaries.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@296 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx/ConfigManager.h')
| -rw-r--r-- | orkbasecxx/ConfigManager.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/orkbasecxx/ConfigManager.h b/orkbasecxx/ConfigManager.h index 538dfbf..47efcae 100644 --- a/orkbasecxx/ConfigManager.h +++ b/orkbasecxx/ConfigManager.h @@ -15,25 +15,26 @@ #define __CONFIGMANAGER_H__ #include <list> -#include "ace/Singleton.h" #include "Config.h" #include "AudioCapturePlugin.h" +class ConfigManager; + class DLL_IMPORT_EXPORT_ORKBASE ConfigManager { public: + static ConfigManager* Instance(); void Initialize(); void AddConfigureFunction(ConfigureFunction); Config m_config; private: + static ConfigManager m_singleton; std::list<ConfigureFunction> m_configureFunctions; DOMNode* m_configTopNode; }; -typedef ACE_Singleton<ConfigManager, ACE_Thread_Mutex> ConfigManagerSingleton; - -#define CONFIG ConfigManagerSingleton::instance()->m_config +#define CONFIG ConfigManager::Instance()->m_config #endif |