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

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index a3f99b876e9346bb55a38442dd4ffb968eb1a1aa..9d0019c17563d61888c172f01db0037f9687904c 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -57,7 +57,7 @@ typedef std::vector<float, tbb::cache_aligned_allocator<float>> audio_buffer_ps;
        \r
 struct audio_stream\r
 {\r
-       frame_transform         transform;\r
+       frame_transform         prev_transform;\r
        audio_buffer_ps         audio_data;\r
 };\r
 \r
@@ -125,7 +125,7 @@ public:
                        const auto it = audio_streams_.find(item.tag);\r
                        if(it != audio_streams_.end())\r
                        {       \r
-                               prev_transform  = it->second.transform;\r
+                               prev_transform  = it->second.prev_transform;\r
                                next_audio              = std::move(it->second.audio_data);\r
                        }\r
 \r
@@ -140,8 +140,8 @@ 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].prev_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