Changeset 5878 for code/branches/core5/src/orxonox

Timestamp:

Oct 5, 2009, 1:36:33 AM (15 years ago)

Author:

rgrieder

Message:

Added GameMode::playsSound(). This function checks whether sound is available. You MUST NEVER assume that the SoundManager exists and ALWAYS check it (even if graphics is all loaded).
Also cleaned SoundManager c'tor to use Exceptions.

Location:

code/branches/core5/src/orxonox

Files:

• gamestates/GSMainMenu.cc (modified) (2 diffs)
• sound/SoundManager.cc (modified) (2 diffs)

code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc

@@ -59 +59 @@
         // and a Camera
         this->camera_ = this->scene_->getSceneManager()->createCamera("mainMenu/Camera");
-        // Load sound
-        this->ambient_ = new SoundMainMenu();
+        if (GameMode::playsSound())
+        {
+            // Load sound
+            this->ambient_ = new SoundMainMenu();
+        }
     }
 
     GSMainMenu::~GSMainMenu()
     {
+        if (GameMode::playsSound())
+        {
+            this->ambient_->destroy();
+        }
+
         InputManager::getInstance().destroyState("mainMenu");
 
@@ -87 +95 @@
         InputManager::getInstance().enterState("mainMenu");
 
-        this->ambient_->play(true);
+        if (GameMode::playsSound())
+        {
+            this->ambient_->play(true);
+        }
     }
 
     void GSMainMenu::deactivate()
     {
-        this->ambient_->stop();
+        if (GameMode::playsSound())
+        {
+            this->ambient_->stop();
+        }
 
         InputManager::getInstance().leaveState("mainMenu");

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

@@ -31 +31 @@
 #include <AL/alut.h>
 
+#include "util/Exception.h"
 #include "util/Math.h"
+#include "util/ScopeGuard.h"
+#include "core/GameMode.h"
 #include "core/ScopedSingletonManager.h"
 #include "CameraManager.h"
@@ -42 +45 @@
     ManageScopedSingleton(SoundManager, ScopeID::Graphics, true);
 
-    /**
-     * Default constructor
-     */
     SoundManager::SoundManager()
     {
-        this->device_ = NULL;
-        this->soundavailable_ = true;
-        if(!alutInitWithoutContext(NULL,NULL))
-        {
-            COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
-            this->soundavailable_ = false;
-        }
+        if (!alutInitWithoutContext(NULL,NULL))
+            ThrowException(InitialisationFailed, "OpenAL ALUT error: " << alutGetErrorString(alutGetError()));
+        Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);
+
+        COUT(3) << "OpenAL: Opening sound device..." << std::endl;
+        this->device_ = alcOpenDevice(NULL);
+        if (this->device_ == NULL)
+            ThrowException(InitialisationFailed, "OpenAL error: Could not open sound device.");
+        Loki::ScopeGuard closeDeviceGuard = Loki::MakeGuard(&alcCloseDevice, this->device_);
+
+        COUT(3) << "OpenAL: Sound device opened" << std::endl;
+        this->context_ = alcCreateContext(this->device_, NULL);
+        if (this->context_ == NULL)
+            ThrowException(InitialisationFailed, "OpenAL error: Could not create sound context");
+        Loki::ScopeGuard desroyContextGuard = Loki::MakeGuard(&alcDestroyContext, this->context_);
+
+        if (alcMakeContextCurrent(this->context_) == AL_TRUE)
+            COUT(3) << "OpenAL: Context " << this->context_ << " loaded" << std::endl;
+
+        COUT(4) << "Sound: OpenAL ALUT version: " << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
+
+        const char* str = alutGetMIMETypes(ALUT_LOADER_BUFFER);
+        if (str == NULL)
+            COUT(2) << "OpenAL ALUT error: " << alutGetErrorString(alutGetError()) << std::endl;
         else
-        {
-            assert(this->device_ == NULL);
-            COUT(3) << "Sound: OpenAL: Open sound device..." << std::endl;
-            this->device_ = alcOpenDevice(NULL);
+            COUT(4) << "OpenAL ALUT supported MIME types: " << str << std::endl;
+        ThrowException(InitialisationFailed, "Just testing");
 
-            if(this->device_ == NULL)
-            {
-                COUT(2) << "Sound: OpenAL: Could not open sound device" << std::endl;
-                this->soundavailable_ = false;
-            }
-            else
-            {
-                COUT(3) << "Sound: OpenAL: Sound device opened" << std::endl;
-                this->context_ = alcCreateContext(this->device_, NULL);
-                if(this->context_ == NULL)
-                {
-                    COUT(2) << "Sound: OpenAL: Could not create sound context" << std::endl;
-                    this->soundavailable_ = false;
-                }
-                else
-                {
-                    if(alcMakeContextCurrent(this->context_) == AL_TRUE)
-                        COUT(3) << "Sound: OpenAL: Context " << this->context_ << " loaded" << std::endl;
-
-                    COUT(4) << "Sound: OpenAL ALUT version: " << alutGetMajorVersion() << "." << alutGetMinorVersion() << std::endl;
-                    const char* str = alutGetMIMETypes(ALUT_LOADER_BUFFER);
-                    if (str == NULL)
-                        COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
-                    else
-                        COUT(4) << "Sound: OpenAL ALUT supported MIME types: " << str << std::endl;
-                }
-            }
-        }
+        GameMode::setPlaysSound(true);
+        // Disarm guards
+        alutExitGuard.Dismiss();
+        closeDeviceGuard.Dismiss();
+        desroyContextGuard.Dismiss();
     }
 
     SoundManager::~SoundManager()
     {
+        GameMode::setPlaysSound(false);
         alcDestroyContext(this->context_);
         alcCloseDevice(this->device_);