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

[casparcg] / modules / oal / consumer / oal_consumer.cpp

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index cb727f62905b54c5189abdbcd2066b8543fd2926..7186dc74c3db129e6432a822b059b2e922d033e4 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -27,6 +27,7 @@
 #include <common/utility/string.h>\r
 \r
 #include <core/consumer/frame_consumer.h>\r
+#include <core/mixer/audio/audio_util.h>\r
 #include <core/video_format.h>\r
 \r
 #include <core/mixer/read_frame.h>\r
@@ -91,11 +92,7 @@ public:
                        Play();         \r
                }\r
 \r
-               std::vector<int16_t> audio16(frame->audio_data().size());\r
-               for(size_t n = 0; n < audio16.size(); ++n)              \r
-                       audio16[n] = (frame->audio_data()[n] >> 16) & 0xffff;           \r
-\r
-               input_.push(std::make_shared<std::vector<int16_t>>(std::move(audio16)));\r
+               input_.push(std::make_shared<std::vector<int16_t>>(core::audio_32_to_16(frame->audio_data())));\r
 \r
                return true;\r
        }\r
@@ -128,7 +125,7 @@ public:
 \r
 safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)\r
 {\r
-       if(params.size() < 1 || params[0] != L"OAL")\r
+       if(params.size() < 1 || params[0] != L"AUDIO")\r
                return core::frame_consumer::empty();\r
 \r
        return make_safe<oal_consumer>();\r