]> 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>
Sun, 5 Feb 2012 00:23:31 +0000 (00:23 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 5 Feb 2012 00:23:31 +0000 (00:23 +0000)
core/mixer/audio/audio_mixer.cpp

index fced349553ef351b295d5a1f8263a1d1b076a06a..91a2105dc60258952aba54a9a237578d40c2b718 100644 (file)
@@ -158,7 +158,7 @@ public:
                        });\r
 \r
                        if(nb_invalid_streams > 0)              \r
-                               CASPAR_LOG(trace) << "[audio_mixer] Incorrect frame audio cadence detected.";                   \r
+                               CASPAR_LOG(trace) << "[audio_mixer] Incorrect frame audio cadence detected. Appending empty samples.";                  \r
                }\r
 \r
                std::vector<float> result_ps(audio_cadence_.front(), 0.0f);\r
@@ -167,10 +167,7 @@ public:
                        //CASPAR_LOG(debug) << stream.audio_data.size() << L" : " << result_ps.size();\r
 \r
                        if(stream.audio_data.size() < result_ps.size())\r
-                       {\r
                                stream.audio_data.resize(result_ps.size(), 0.0f);\r
-                               CASPAR_LOG(trace) << L"[audio_mixer] Appended zero samples";\r
-                       }\r
 \r
                        auto out = boost::range::transform(result_ps, stream.audio_data, std::begin(result_ps), std::plus<float>());\r
                        stream.audio_data.erase(std::begin(stream.audio_data), std::begin(stream.audio_data) + std::distance(std::begin(result_ps), out));\r