Changeset 10916 for code/branches/cpp11_v2/src/orxonox/sound

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

Location:

code/branches/cpp11_v2/src/orxonox/sound

Files:

• SoundManager.cc (modified) (1 diff)
• SoundStreamer.cc (modified) (1 diff)

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

@@ -407 +407 @@
         if (ambient != nullptr)
         {
-            for (auto & elem : this->ambientSounds_)
-            {
-                if (elem.first == ambient)
+            for (std::pair<AmbientSound*, bool>& pair : this->ambientSounds_)
+            {
+                if (pair.first == ambient)
                 {
-                    elem.second = true;
-                    this->fadeOut(elem.first);
+                    pair.second = true;
+                    this->fadeOut(pair.first);
                     return;
                 }

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

@@ -68 +68 @@
         int current_section;
 
-        for(auto & initbuffer : initbuffers)
+        for(ALuint& initbuffer : initbuffers)
         {
             long ret = ov_read(&vf, inbuffer, sizeof(inbuffer), 0, 2, 1, &current_section);