2.1.0: Seal of appropriate classes.

[casparcg] / core / mixer / mixer.cpp

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index dc130e2a89b6ecf31401fbdce9852f9cfdb64af0..6751375e648a5a79f941f95a50d9444fe4055593 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -79,6 +79,7 @@ public:
                , format_desc_(format_desc)\r
                , ogl_(ogl)\r
                , image_mixer_(ogl)\r
+               , audio_mixer_(graph_)\r
                , executor_(L"mixer")\r
        {                       \r
                graph_->set_color("mix-time", diagnostics::color(1.0f, 0.0f, 0.9f));\r
@@ -111,7 +112,7 @@ public:
 \r
                                graph_->update_value("mix-time", mix_timer_.elapsed()*format_desc_.fps*0.5);\r
 \r
-                               target_->send(std::make_pair(make_safe<read_frame>(ogl_, format_desc_.size, std::move(image.get()), std::move(audio)), packet.second));                                 \r
+                               target_->send(std::make_pair(make_safe<read_frame>(ogl_, format_desc_.width, format_desc_.height, std::move(image.get()), std::move(audio)), packet.second));                                   \r
                        }\r
                        catch(...)\r
                        {\r