2.0.2: audio_mixer: Fixed incorrect naming.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1724 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index f6c016e4a7b79430148d33271de786d10e1f6838..a3f99b876e9346bb55a38442dd4ffb968eb1a1aa 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -113,7 +113,7 @@ public:
                        format_desc_ = format_desc;\r
                }               \r
                \r
-               std::map<const void*, audio_stream>     next_audio_streams_;\r
+               std::map<const void*, audio_stream>     next_audio_streams;\r
 \r
                BOOST_FOREACH(auto& item, items_)\r
                {                       \r
@@ -140,13 +140,13 @@ public:
                        for(size_t n = 0; n < item.audio_data.size(); ++n)\r
                                next_audio.push_back(item.audio_data[n] * (prev_volume + (n/format_desc_.audio_channels) * alpha));\r
                                                                                \r
-                       next_audio_streams_[item.tag].transform  = std::move(next_transform); // Store all active tags, inactive tags will be removed at the end.\r
-                       next_audio_streams_[item.tag].audio_data = std::move(next_audio);                       \r
+                       next_audio_streams[item.tag].transform  = std::move(next_transform); // Store all active tags, inactive tags will be removed at the end.\r
+                       next_audio_streams[item.tag].audio_data = std::move(next_audio);                        \r
                }                               \r
 \r
                items_.clear();\r
 \r
-               audio_streams_ = std::move(next_audio_streams_);\r
+               audio_streams_ = std::move(next_audio_streams);\r
                \r
                if(audio_streams_.empty())              \r
                        audio_streams_[nullptr].audio_data = audio_buffer_ps(audio_cadence_.front(), 0.0f);\r