git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/casparcg.sln b/casparcg.sln
index 36dc0624bc90bf059faffb0769fcc7046735f043..8415d3f1f030fe835e2617fdd4625aad5a7449b5 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -12,7 +12,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{32079541-68ED-4319-91FB-0FF041642679}"\r
        ProjectSection(SolutionItems) = preProject\r
                Casparcg 2.0 Documentation.txt = Casparcg 2.0 Documentation.txt\r
-               ..\CasparCG 2.0 Preliminary Change Log.txt = ..\CasparCG 2.0 Preliminary Change Log.txt\r
                COPYING.txt = COPYING.txt\r
                README.txt = README.txt\r
        EndProjectSection\r

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 7360e5021bfce976d4f6009e40224ea545eeaac4..6d175a2f02823cd37f0e85e80cb28851eaf3f000 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -51,16 +51,16 @@ public:
                if(!transform_stack_.top().get_has_audio())\r
                        return;\r
 \r
-               auto& audio_data = frame.audio_data();\r
-               auto tag = frame.tag(); // Get the identifier for the audio-stream.\r
+               const auto& audio_data = frame.audio_data();\r
+               const auto tag = frame.tag(); // Get the identifier for the audio-stream.\r
 \r
                if(audio_data_.back().empty())\r
                        audio_data_.back().resize(audio_data.size(), 0);\r
                \r
-               auto next = transform_stack_.top();\r
+               const auto next = transform_stack_.top();\r
                auto prev = next;\r
 \r
-               auto it = prev_audio_transforms_.find(tag);\r
+               const auto it = prev_audio_transforms_.find(tag);\r
                if(it != prev_audio_transforms_.end())\r
                        prev = it->second;\r
                                \r
@@ -71,10 +71,10 @@ public:
                \r
                static const int BASE = 1<<15;\r
 \r
-               auto next_gain = static_cast<int>(next.get_gain()*BASE);\r
-               auto prev_gain = static_cast<int>(prev.get_gain()*BASE);\r
+               const auto next_gain = static_cast<int>(next.get_gain()*BASE);\r
+               const auto prev_gain = static_cast<int>(prev.get_gain()*BASE);\r
                \r
-               int n_samples = audio_data_.back().size();\r
+               const int n_samples = audio_data_.back().size();\r
 \r
                tbb::parallel_for\r
                (\r
@@ -83,10 +83,8 @@ public:
                        {\r
                                for(size_t n = r.begin(); n < r.end(); ++n)\r
                                {\r
-                                       int sample_gain = (prev_gain - (prev_gain * n)/n_samples) + (next_gain * n)/n_samples;\r
-                                       \r
-                                       int sample = (static_cast<int>(audio_data[n])*sample_gain)/BASE;\r
-                                       \r
+                                       const int sample_gain = (prev_gain - (prev_gain * n)/n_samples) + (next_gain * n)/n_samples;\r
+                                       const int sample = (static_cast<int>(audio_data[n])*sample_gain)/BASE;\r
                                        audio_data_.back()[n] = static_cast<int16_t>((static_cast<int>(audio_data_.back()[n]) + sample) & 0xFFFF);\r
                                }\r
                        }\r