ObjectFactory becomes a home brewed singleton instead of an ACE singleton. ACE singletons have the problem of not being unique across DLL.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@398 09dcff7a-b715-0410-9601-b79a96267cd0

1 files changed, 9 insertions, 9 deletions

diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp
index 6e712ff..3cfa931 100644
--- a/orkaudio/OrkAudio.cpp
+++ b/orkaudio/OrkAudio.cpp
@@ -118,7 +118,7 @@ void Transcode(CStdString &file)
 {
 	OrkLogManager::Instance()->Initialize();
 
-	ObjectFactorySingleton::instance()->Initialize();
+	ObjectFactory::GetSingleton()->Initialize();
 
 	ConfigManager::Instance()->Initialize();
 
@@ -170,23 +170,23 @@ void MainThread()
 	LOG4CXX_INFO(LOG.rootLog, CStdString("\n\nOrkAudio service starting\n"));
 
 	// Initialize object factory and register existing objects
-	ObjectFactorySingleton::instance()->Initialize();
+	ObjectFactory::GetSingleton()->Initialize();
 
 	ObjectRef objRef;
 	objRef.reset(new PingMsg);
-	ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	ObjectFactory::GetSingleton()->RegisterObject(objRef);
 	objRef.reset(new TapeMsg);
-	ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	ObjectFactory::GetSingleton()->RegisterObject(objRef);
 	objRef.reset(new TapeResponse);
-	ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	ObjectFactory::GetSingleton()->RegisterObject(objRef);
 	objRef.reset(new SimpleResponseMsg);
-	ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	ObjectFactory::GetSingleton()->RegisterObject(objRef);
 	objRef.reset(new DeleteTapeMsg);
-	ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	ObjectFactory::GetSingleton()->RegisterObject(objRef);
 	objRef.reset(new CaptureMsg);
-	ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	ObjectFactory::GetSingleton()->RegisterObject(objRef);
 	//objRef.reset(new TestMsg);
-	//ObjectFactorySingleton::instance()->RegisterObject(objRef);
+	//ObjectFactory::GetSingleton()->RegisterObject(objRef);
 
 	ConfigManager::Instance()->Initialize();