2.1.0: Fixed incorrect audio.

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

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 1451ae0fb000fff17aaca9c8569f746e21558cfc..1bd4ba0cb2aa17465bf0489ed9d5c5eab4daf69c 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -83,9 +83,6 @@ public:
 \r
        void visit(core::write_frame& frame)\r
        {\r
-               if(transform_stack_.top().volume < 0.002 || frame.audio_data().empty())\r
-                       return;\r
-\r
                audio_item item;\r
                item.tag                = frame.tag();\r
                item.transform  = transform_stack_.top();\r
@@ -128,6 +125,10 @@ public:
                                prev_transform  = it->second.prev_transform;\r
                                next_audio              = std::move(it->second.audio_data);\r
                        }\r
+                       \r
+                       // Skip it if there is no existing audio stream and item has no audio-data.\r
+                       if(it == audio_streams_.end() && item.audio_data.empty()) \r
+                               continue;\r
                                                \r
                        const float prev_volume = static_cast<float>(prev_transform.volume);\r
                        const float next_volume = static_cast<float>(next_transform.volume);\r