Changeset 2932 for code/branches

Timestamp:

Apr 27, 2009, 3:30:34 PM (16 years ago)

Author:

erwin

Message:

Sound: implemented sample file loading via alut

Location:

code/branches/sound/src/sound

Files:

• SoundBase.cc (modified) (1 diff)
• SoundBase.h (modified) (2 diffs)
• SoundManager.cc (modified) (2 diffs)
• SoundManager.h (modified) (2 diffs)

code/branches/sound/src/sound/SoundBase.cc

@@ -113 +113 @@
     }
 
+    bool SoundBase::loadFile(std::string filename) {
+        this->buffer_ = alutCreateBufferFromFile(filename.c_str());
+        if(this->buffer_ == AL_NONE) {
+            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError());
+            return false;
+        }
+
+        alGenSources(1, &this->source_);
+        alSourcei(this->source_, AL_BUFFER, this->buffer_);
+        if(alGetError() != AL_NO_ERROR) {
+            COUT(2) << "OpenAL: Error loading sample file";
+            return false;
+        }
+        return true;
+    }
+
     ALint SoundBase::getSourceState() {
         ALint state;

code/branches/sound/src/sound/SoundBase.h

@@ -29 +29 @@
 #define _SOUNDBASE_H__
 
-#include <al.h>
+#include <AL/al.h>
+#include <AL/alut.h>
 #include <string>
 
@@ -57 +58 @@
         bool isStopped();
 
-        virtual void loadFile(std::string filename) = 0;
+        bool loadFile(std::string filename);
 
     private:

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

@@ -27 +27 @@
  */
 
-#include <OgreSceneNode.h>
+#include <AL/alut.h>
 
 #include "orxonox/CameraManager.h"
@@ -57 +57 @@
     SoundManager::SoundManager()
     {
-        // OpenAL device and context creation
-        this->device_ = alcOpenDevice(NULL); // we operate on the default sound device
-        if(this->device_)
-            COUT(2) << "OpenAL: Could not create sound device, there will be no sound!" << std::endl;
-
-        this->context_ = alcCreateContext(this->device_, NULL);
-        alcMakeContextCurrent(this->context_);
-        ALenum error = alcGetError(this->device_);
-        if(error != ALC_NO_ERROR)
-            COUT(2) << "OpenAL: Could not create sound context." << std::endl;
-
+        if(!alutInit(NULL,NULL)) {
+            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError());
+        }
     }
 

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

@@ -28 +28 @@
 #define _SOUNDMANGER_H__
 
-#include <al.h>
-#include <alc.h>
+#include <AL/al.h>
+#include <AL/alc.h>
 
 #include <orxonox/objects/Tickable.h>
@@ -57 +57 @@
         static SoundManager* singleton_;
 
-        ALCcontext* context_;
-        ALCdevice* device_;
-
         std::list<SoundBase*> soundlist_;