Changeset 6388 for code/branches/presentation2/src/orxonox/sound

Timestamp:

Dec 21, 2009, 1:28:10 PM (15 years ago)

Author:

rgrieder

Message:

Found some end of line leftover spaces.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (2 diffs)
• BaseSound.cc (modified) (2 diffs)
• SoundManager.cc (modified) (4 diffs)
• WorldSound.cc (modified) (1 diff)

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

@@ -118 +118 @@
                 this->setSource(path);
             else
-                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;       
+                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
         }
     }
@@ -134 +134 @@
         if (this->isActive())
             this->play();
-        else 
+        else
             this->stop();
     }

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

@@ -177 +177 @@
             pitch = pitch > 2 ? 2 : pitch;
             pitch = pitch < 0.5 ? 0.5 : pitch;
-        }        
+        }
         this->pitch_ = pitch;
         if (alIsSource(this->audioSource_))
@@ -224 +224 @@
         if (alIsSource(this->audioSource_)) // already playing or paused
         {
-            // Set new buffer 
+            // Set new buffer
             alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
             if (ALuint error = alGetError())

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

@@ -254 +254 @@
     }
 
-    float SoundManager::getVolume(SoundType::Value type) 
+    float SoundManager::getVolume(SoundType::Value type)
     {
         if (type < 0 || type > SoundType::Effects)
@@ -261 +261 @@
     }
 
-    float SoundManager::getRealVolume(SoundType::Value type) 
+    float SoundManager::getRealVolume(SoundType::Value type)
     {
         if (type != SoundType::Music && type != SoundType::Effects)
@@ -339 +339 @@
             }
 
-            if (!this->ambientSounds_.empty()) 
+            if (!this->ambientSounds_.empty())
             {
                 this->fadeOut(ambientSounds_.front().first);
@@ -354 +354 @@
             return;
 
-        if (this->ambientSounds_.front().first == oldAmbient) 
+        if (this->ambientSounds_.front().first == oldAmbient)
         {
             this->fadeOut(oldAmbient);

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

@@ -110 +110 @@
     }
 
-    void WorldSound::changedActivity() 
+    void WorldSound::changedActivity()
     {
         SUPER(WorldSound, changedActivity);
         if (this->isActive())
             this->play();
-        else 
+        else
             this->stop();
     }