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

Timestamp:

Nov 21, 2015, 7:05:53 PM (9 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

Location:

code/branches/cpp11_v2/src/orxonox/sound

Files:

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

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

@@ -407 +407 @@
         if (ambient != nullptr)
         {
-            for (AmbientList::iterator it = this->ambientSounds_.begin(); it != this->ambientSounds_.end(); ++it)
-            {
-                if (it->first == ambient)
+            for (auto & elem : this->ambientSounds_)
+            {
+                if (elem.first == ambient)
                 {
-                    it->second = true;
-                    this->fadeOut(it->first);
+                    elem.second = true;
+                    this->fadeOut(elem.first);
                     return;
                 }

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

@@ -68 +68 @@
         int current_section;
 
-        for(int i = 0; i < 4; i++)
+        for(auto & initbuffer : initbuffers)
         {
             long ret = ov_read(&vf, inbuffer, sizeof(inbuffer), 0, 2, 1, &current_section);
@@ -82 +82 @@
             }
 
-            alBufferData(initbuffers[i], format, &inbuffer, ret, vorbisInfo->rate);
+            alBufferData(initbuffer, format, &inbuffer, ret, vorbisInfo->rate);
         }
         alSourceQueueBuffers(audioSource, 4, initbuffers);