Changeset 2950 for code/branches/sound/src/sound/SoundManager.cc

Timestamp:

May 4, 2009, 3:40:08 PM (15 years ago)

Author:

erwin

Message:

ambient sound loading for levels

File:

• code/branches/sound/src/sound/SoundManager.cc (modified) (3 diffs)

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

@@ -38 +38 @@
 {
     /**
-     * Static function to get the singleton instance of SoundManager.
-     *
-     * @return The singleton instance
-     */
-    SoundManager* SoundManager::instance()
-    {
-        if(SoundManager::singleton_ == NULL)
-        {
-            SoundManager::singleton_ = new SoundManager();
-        }
-
-        return SoundManager::singleton_;
-    }
-
-    /**
      * Default constructor
      */
@@ -58 +43 @@
     {
         if(!alutInit(NULL,NULL)) {
-            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError());
+            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
         }
+
+        COUT(4) << "OpenAL ALUT version:" << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
+        COUT(4) << "OpenAL ALUT supported MIME types:" << alutGetMIMETypes(ALUT_LOADER_BUFFER) << std::endl;
     }
 
@@ -98 +86 @@
         // update listener position
         Camera* camera = CameraManager::getInstance().getActiveCamera();
+        if(camera == NULL) return;
         Vector3 pos = camera->getPosition();
         alListener3f(AL_POSITION, pos.x, pos.y, pos.z);