Changeset 6769 for code

Timestamp:

Apr 22, 2010, 3:32:45 PM (15 years ago)

Author:

erwin

Message:

Fixed a possible source for future problems. but still no sounds. Try everything in one thread with the same result

Location:

code/branches/sound5/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (2 diffs)
• SoundStreamer.cc (modified) (1 diff)

code/branches/sound5/src/orxonox/sound/AmbientSound.cc

@@ -155 +155 @@
         }
 
-        this->audioSource_ = SoundManager::getInstance().getSoundSource(this);
+        if(!alIsSource(this->audioSource_))
+            this->audioSource_ = SoundManager::getInstance().getSoundSource(this);
+
         if (this->source_ == source)
         {
@@ -183 +185 @@
         if(this->soundstreamthread_ == boost::thread())
             COUT(2) << "Sound: Failed to create thread." << std::endl;
-       
+        //SoundStreamer streamer;
+        //streamer(this->audioSource_, dataStream);
+
         alSource3f(this->audioSource_, AL_POSITION,  0, 0, 0);
         alSource3f(this->audioSource_, AL_VELOCITY,  0, 0, 0);

code/branches/sound5/src/orxonox/sound/SoundStreamer.cc

@@ -104 +104 @@
         }
 
-        alSourcei(audioSource, AL_LOOPING, AL_TRUE);
+        //alSourcei(audioSource, AL_LOOPING, AL_TRUE);
 
         alSourcePlay(audioSource);
         if(ALint error = alGetError())
-            COUT(2) << "Sound: Could not start ambient sound" << std::endl;
+            COUT(2) << "Sound: Could not start ambient sound" << getALErrorString(error) << std::endl;
 
         while(true) // Stream forever, control through thread control