]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 29 Nov 2011 22:17:39 +0000 (22:17 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 29 Nov 2011 22:17:39 +0000 (22:17 +0000)
core/mixer/audio/audio_mixer.cpp

index 17850909b3eaeb30b78c4a98e3d49524699a2b1e..b8b2b98790782d0b1df094f91536bb0b65ebb117 100644 (file)
@@ -138,7 +138,7 @@ public:
                        auto alpha = (next_volume-prev_volume)/static_cast<float>(item.audio_data.size()/format_desc.audio_channels);\r
                        \r
                        for(size_t n = 0; n < item.audio_data.size(); ++n)\r
-                               next_audio.push_back(item.audio_data[n] * (prev_volume + static_cast<float>(n)/static_cast<float>(format_desc_.audio_channels) * alpha));\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