From d2252d26cc4b0d98aa7ba20aace06ee08b279a6b Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 11 Jul 2013 14:46:44 -0400
Subject: [PATCH] * #26839: audiobuffer: fix warnings

---
 daemon/src/audio/audiobuffer.cpp | 26 ++++++++------------------
 daemon/src/audio/audiobuffer.h   |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/daemon/src/audio/audiobuffer.cpp b/daemon/src/audio/audiobuffer.cpp
index dfd06ea0f..5aa46cf2c 100644
--- a/daemon/src/audio/audiobuffer.cpp
+++ b/daemon/src/audio/audiobuffer.cpp
@@ -54,13 +54,11 @@ AudioBuffer::AudioBuffer(const AudioBuffer& other, bool copy_content /* = false
        channels_(other.channels_),
        samples_(channels_, std::vector<SFLAudioSample>())
 {
-    unsigned i;
-
     if (copy_content) {
-        for (i = 0; i < channels_; i++)
+        for (unsigned i = 0; i < channels_; i++)
             samples_[i] = other.samples_[i]; // std::vector copy
     } else {
-        for (i = 0; i < channels_; i++)
+        for (unsigned i = 0; i < channels_; i++)
             samples_[i].resize(sampleNum_, 0);
     }
 }
@@ -97,9 +95,7 @@ void AudioBuffer::resize(size_t sample_num)
 
 void AudioBuffer::clear()
 {
-    unsigned i, j;
-
-    for (i = 0; i < channels_; i++)
+    for (unsigned i = 0; i < channels_; i++)
         samples_[i].assign(sampleNum_, 0);
 }
 
@@ -129,19 +125,15 @@ void AudioBuffer::applyGain(double gain)
 {
     if (gain == 1.0) return;
 
-    unsigned i, j;
-
-    for (i = 0; i < channels_; i++)
-        for (j = 0; j < sampleNum_; j++)
+    for (unsigned i = 0; i < channels_; i++)
+        for (unsigned j = 0; j < sampleNum_; j++)
             samples_[i][j] *= gain;
 }
 
 size_t AudioBuffer::interleave(SFLAudioSample* out) const
 {
-    unsigned i, j;
-
-    for (i = 0; i < sampleNum_; i++)
-        for (j = 0; j < channels_; j++)
+    for (unsigned i = 0; i < sampleNum_; i++)
+        for (unsigned j = 0; j < channels_; j++)
             *out++ = samples_[j][i];
 
     return sampleNum_ * channels_;
@@ -205,9 +197,7 @@ size_t AudioBuffer::copy(AudioBuffer& in, int sample_num /* = -1 */, size_t pos_
     sampleRate_ = in.sampleRate_;
     //setChannelNum(chan_num);
 
-    unsigned i;
-
-    for (i = 0; i < chan_num; i++) {
+    for (unsigned i = 0; i < chan_num; i++) {
         unsigned src_chan = upmix ? std::min(i, in.channels_ - 1) : i;
         std::copy(in.samples_[src_chan].begin() + pos_in, in.samples_[src_chan].begin() + pos_in + to_copy, samples_[i].begin() + pos_out);
     }
diff --git a/daemon/src/audio/audiobuffer.h b/daemon/src/audio/audiobuffer.h
index d16290976..7c6b19b03 100644
--- a/daemon/src/audio/audiobuffer.h
+++ b/daemon/src/audio/audiobuffer.h
@@ -205,8 +205,8 @@ class AudioBuffer {
 
     private:
         int sampleRate_;
-        unsigned channels_; // should allways be the same as samples_.size()
         size_t sampleNum_;
+        unsigned channels_; // should allways be the same as samples_.size()
 
         // main buffers holding data for each channels
         std::vector<std::vector<SFLAudioSample> > samples_;