Changeset 5867 for code/branches/core5/src/orxonox/sound

Timestamp:

Oct 4, 2009, 12:02:28 AM (15 years ago)

Author:

rgrieder

Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

Location:

code/branches/core5/src/orxonox/sound

Files:

• SoundManager.cc (modified) (2 diffs)
• SoundManager.h (modified) (2 diffs)

code/branches/core5/src/orxonox/sound/SoundManager.cc

@@ -32 +32 @@
 
 #include "util/Math.h"
+#include "core/ScopedSingletonManager.h"
 #include "CameraManager.h"
 #include "graphics/Camera.h"
@@ -39 +40 @@
 {
     SoundManager* SoundManager::singletonPtr_s = NULL;
+    ManageScopedSingleton(SoundManager, ScopeID::Graphics);
 
     /**

code/branches/core5/src/orxonox/sound/SoundManager.h

@@ -32 +32 @@
 #include <cassert>
 #include <list>
-#include "util/ScopedSingleton.h"
+#include "util/Singleton.h"
 #include "tools/interfaces/Tickable.h"
 
@@ -43 +43 @@
      *
      */
-    class _OrxonoxExport SoundManager : public ScopedSingleton<SoundManager, ScopeID::Graphics>, public Tickable
+    class _OrxonoxExport SoundManager : public Singleton<SoundManager>, public Tickable
     {
-        friend class ScopedSingleton<SoundManager, ScopeID::Graphics>;
+        friend class Singleton<SoundManager>;
     public:
         SoundManager();