Changeset 9667 for code/trunk/src/orxonox/sound

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/sound/BaseSound.cc (modified) (2 diffs)
• src/orxonox/sound/BaseSound.h (modified) (2 diffs)
• src/orxonox/sound/SoundManager.cc (modified) (2 diffs)
• src/orxonox/sound/SoundManager.h (modified) (2 diffs)
• src/orxonox/sound/WorldAmbientSound.cc (modified) (1 diff)
• src/orxonox/sound/WorldAmbientSound.h (modified) (1 diff)
• src/orxonox/sound/WorldSound.cc (modified) (1 diff)
• src/orxonox/sound/WorldSound.h (modified) (1 diff)

code/trunk/src/orxonox/sound/BaseSound.cc

@@ -43 +43 @@
 namespace orxonox
 {
+    RegisterAbstractClass(BaseSound).inheritsFrom(Class(Listable));
+
     BaseSound::BaseSound()
         : bPooling_(false)
@@ -50 +52 @@
         , pitch_ (1.0)
     {
-        RegisterRootObject(BaseSound);
+        RegisterObject(BaseSound);
 
         // Initialise audioSource_ to a value that is not a source

code/trunk/src/orxonox/sound/BaseSound.h

@@ -35 +35 @@
 #include <boost/shared_ptr.hpp>
 #include <OgreDataStream.h>
-#include "core/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
@@ -43 +43 @@
      * It serves as main interface to the OpenAL library.
      */
-    class _OrxonoxExport BaseSound : virtual public OrxonoxClass
+    class _OrxonoxExport BaseSound : virtual public Listable
     {
     public:

code/trunk/src/orxonox/sound/SoundManager.cc

@@ -39 +39 @@
 #include "util/Clock.h"
 #include "util/ScopedSingletonManager.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
@@ -69 +69 @@
         : effectsPoolSize_(0)
     {
-        RegisterRootObject(SoundManager);
+        RegisterObject(SoundManager);
 
         orxout(user_status) << "Loading sound" << endl;

code/trunk/src/orxonox/sound/SoundManager.h

@@ -39 +39 @@
 
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
-#include "core/SmartPtr.h"
+#include "core/config/Configurable.h"
+#include "core/object/SmartPtr.h"
 
 // tolua_begin
@@ -59 +59 @@
     class _OrxonoxExport SoundManager
     // tolua_end
-        : public Singleton<SoundManager>, public OrxonoxClass
+        : public Singleton<SoundManager>, public Configurable
     { // tolua_export
         friend class Singleton<SoundManager>;

code/trunk/src/orxonox/sound/WorldAmbientSound.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    CreateFactory(WorldAmbientSound);
+    RegisterClass(WorldAmbientSound);
 
-    WorldAmbientSound::WorldAmbientSound(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    WorldAmbientSound::WorldAmbientSound(Context* context) : BaseObject(context), Synchronisable(context)
     {
         RegisterObject(WorldAmbientSound);

code/trunk/src/orxonox/sound/WorldAmbientSound.h

@@ -44 +44 @@
     {
         public:
-            WorldAmbientSound(BaseObject* creator);
+            WorldAmbientSound(Context* context);
             virtual ~WorldAmbientSound();
 

code/trunk/src/orxonox/sound/WorldSound.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    CreateFactory(WorldSound);
+    RegisterClass(WorldSound);
 
-    WorldSound::WorldSound(BaseObject* creator)
-        : StaticEntity(creator)
+    WorldSound::WorldSound(Context* context)
+        : StaticEntity(context)
     {
         RegisterObject(WorldSound);

code/trunk/src/orxonox/sound/WorldSound.h

@@ -45 +45 @@
     {
     public:
-        WorldSound(BaseObject* creator);
+        WorldSound(Context* context);
 
         void XMLPort(Element& xmlelement, XMLPort::Mode mode);