Changeset 6237 for code/branches/presentation2

Timestamp:

Dec 3, 2009, 10:23:32 PM (15 years ago)

Author:

rgrieder

Message:

Removed (commented) everything related to ALC (OpenAL library part).
This should fix the freeze problems when shutting down orxonox.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• SoundManager.cc (modified) (3 diffs)
• SoundManager.h (modified) (1 diff)

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

@@ -55 +55 @@
         RegisterRootObject(SoundManager);
 
+/*
         if (!alutInitWithoutContext(NULL, NULL))
+*/
+        if (!alutInit(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound: OpenAL ALUT error: " << alutGetErrorString(alutGetError()));
         Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);
 
+        // Note: Everything related to ALC has been commented because there seem to be
+        // very serious problems with the unloading sequence (complete freeze on Linux,
+        // sometimes really everything gone, including response to any signals).
+        // For the moment ALUT can do everything we need so far.
+/*
         COUT(3) << "Sound: OpenAL: Opening sound device..." << std::endl;
         this->device_ = alcOpenDevice(NULL);
@@ -87 +95 @@
         else
             COUT(4) << "Sound: OpenAL ALUT supported MIME types: " << str << std::endl;
+*/
 
         GameMode::setPlaysSound(true);
         // Disarm guards
         alutExitGuard.Dismiss();
+/*
         closeDeviceGuard.Dismiss();
         desroyContextGuard.Dismiss();
+*/
         
         this->setVolumeInternal(1.0, SoundType::none);
@@ -108 +119 @@
     {
         GameMode::setPlaysSound(false);
+/*
         alcDestroyContext(this->context_);
         alcCloseDevice(this->device_);
+*/
         alutExit();
     }

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

@@ -111 +111 @@
         float getVolumeInternal(SoundType::Value type);
 
+/*
         ALCdevice* device_;
         ALCcontext* context_;
+*/
        
         typedef std::list<std::pair<AmbientSound*, bool> > AmbientList;