Changeset 2950 for code/branches/sound/src/sound/SoundBase.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/SoundBase.cc (modified) (7 diffs)

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

@@ -34 +34 @@
 namespace orxonox 
 {
+    SoundBase::SoundBase()
+    {
+        this->source_ = 0;
+        this->buffer_ = 0;
+        this->entity_ = NULL;
+    }
     SoundBase::SoundBase(WorldEntity* entity)
     {
@@ -39 +45 @@
         this->buffer_ = 0;
         this->entity_ = entity;
-
-        if(SoundBase::soundmanager_s == NULL)
-            SoundBase::soundmanager_s = SoundManager::instance();
     }
 
@@ -51 +54 @@
 
     void SoundBase::update() {
-        if(alIsSource(this->source_)) {
+        if(this->entity_ != NULL && alIsSource(this->source_)) {
             Vector3 pos = this->entity_->getPosition();
             alSource3f(this->source_, AL_POSITION, pos.x, pos.y, pos.z);
@@ -99 +102 @@
             return getSourceState() == AL_PLAYING;
         }
+        return false;
     }
 
@@ -105 +109 @@
             return getSourceState() == AL_PAUSED;
         }
+        return true;
     }
 
@@ -111 +116 @@
             return getSourceState() == AL_INITIAL || getSourceState() == AL_STOPPED;
         }
+        return true;
     }
 
     bool SoundBase::loadFile(std::string filename) {
+        COUT(3) << "OpenAL ALUT: loading file " << filename << std::endl;
         this->buffer_ = alutCreateBufferFromFile(filename.c_str());
         if(this->buffer_ == AL_NONE) {
-            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError());
+            COUT(2) << "OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
             return false;
         }
@@ -123 +130 @@
         alSourcei(this->source_, AL_BUFFER, this->buffer_);
         if(alGetError() != AL_NO_ERROR) {
-            COUT(2) << "OpenAL: Error loading sample file";
+            COUT(2) << "OpenAL: Error loading sample file" << std::endl;
             return false;
         }