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

[casparcg] / core / mixer / audio / audio_mixer.cpp

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index a241ad39773fde6378eeb8c7841319dda8e03839..a899d949c0275db7077ae3d95adb1033fd30e8a0 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -40,14 +40,10 @@ struct audio_item
        \r
 struct audio_mixer::implementation\r
 {\r
-       std::stack<core::frame_transform> transform_stack_;\r
-\r
-       std::map<const void*, core::frame_transform> prev_frame_transforms_;\r
-       std::map<const void*, core::frame_transform> next_frame_transforms_;\r
-\r
-       const core::video_format_desc format_desc_;\r
-\r
-       std::vector<audio_item> items;\r
+       std::stack<core::frame_transform>                               transform_stack_;\r
+       std::map<const void*, core::frame_transform>    prev_frame_transforms_;\r
+       const core::video_format_desc                                   format_desc_;\r
+       std::vector<audio_item>                                                 items;\r
 \r
 public:\r
        implementation(const core::video_format_desc& format_desc)\r
@@ -96,6 +92,8 @@ public:
        {\r
                auto result = std::vector<int16_t>(format_desc_.audio_samples_per_frame);\r
 \r
+               std::map<const void*, core::frame_transform> next_frame_transforms;\r
+\r
                BOOST_FOREACH(auto& item, items)\r
                {                               \r
                        const auto next = item.transform;\r
@@ -105,7 +103,7 @@ public:
                        if(it != prev_frame_transforms_.end())\r
                                prev = it->second;\r
                                \r
-                       next_frame_transforms_[item.tag] = next; // Store all active tags, inactive tags will be removed at the end.\r
+                       next_frame_transforms[item.tag] = next; // Store all active tags, inactive tags will be removed at the end.\r
                                \r
                        if(next.volume < 0.001 && prev.volume < 0.001)\r
                                continue;\r
@@ -139,7 +137,7 @@ public:
                }\r
 \r
                items.clear();\r
-               prev_frame_transforms_ = std::move(next_frame_transforms_);     \r
+               prev_frame_transforms_ = std::move(next_frame_transforms);      \r
 \r
                return std::move(result);\r
        }\r