Changeset 6726

Timestamp:

Apr 14, 2010, 2:19:32 PM (14 years ago)

Author:

erwin

Message:

Some more atempts to fix maybe it's platform specific…

Location:

code/branches/sound5/src/orxonox/sound

Files:

• BaseSound.cc (modified) (1 diff)
• BaseSound.h (modified) (1 diff)
• SoundStreamer.cc (modified) (5 diffs)

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

@@ -142 +142 @@
         if (ALint error = alGetError())
             COUT(2) << "Sound: Warning: Setting source parameters to 0 failed: " << getALErrorString(error) << std::endl;
-        assert(this->soundBuffer_ != NULL);
-        alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
+        if(this->soundBuffer_ != NULL) {
+            alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
+        }
         if (ALuint error = alGetError())
             COUT(1) << "Sound: Error: Could not set buffer \"" << this->source_ << "\": " << getALErrorString(error) << std::endl;

code/branches/sound5/src/orxonox/sound/BaseSound.h

@@ -86 +86 @@
         virtual ~BaseSound();
 
-        void doPlay();
-        void doStop();
-        void doPause();
+        virtual void doPlay();
+        virtual void doStop();
+        virtual void doPause();
 
         // network callbacks

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

@@ -68 +68 @@
 
         char inbuffer[4096];
-        ALuint initbuffers[20];
-        alGenBuffers(20, initbuffers);
+        ALuint initbuffers[5];
+        alGenBuffers(5, initbuffers);
         if (ALint error = alGetError()) {
             COUT(2) << "Sound: Streamer: Could not generate buffer:" << getALErrorString(error) << std::endl;
@@ -76 +76 @@
         int current_section;
 
-        for(int i = 0; i < 20; i++)
+        for(int i = 0; i < 5; i++)
         {
             long ret = ov_read(&vf, inbuffer, sizeof(inbuffer), 0, 2, 1, &current_section);
@@ -99 +99 @@
                  COUT(2) << "Sound: Warning: Couldn't queue buffers: " << getALErrorString(error) << std::endl;
              }
-             COUT(4) << "Sound: " << ret << std::endl;
         }
 
@@ -116 +115 @@
                 COUT(2) << "Sound: Warning: Couldn't get number of processed buffers: " << getALErrorString(error) << std::endl;
 
-            COUT(2) << "Sound: Blub: " << processed << std::endl;
             if(processed > 0)
             {
@@ -130 +128 @@
                     if (ret == 0)
                     {
-                        break;
+                        return;
                     }
                     else if (ret < 0)