Added channel_id to logging of accelerator initialization

[casparcg] / accelerator / accelerator.cpp

diff --git a/accelerator/accelerator.cpp b/accelerator/accelerator.cpp
index a632315d41493048cbf20ad4093f3ffed20af0f2..6f685589a96c432081a828a6348f0b3e8c3f4491 100644 (file)
--- a/accelerator/accelerator.cpp
+++ b/accelerator/accelerator.cpp
@@ -26,7 +26,7 @@ struct accelerator::impl
        {
        }
 
-       std::unique_ptr<core::image_mixer> create_image_mixer()
+       std::unique_ptr<core::image_mixer> create_image_mixer(int channel_id)
        {
                try
                {
@@ -40,7 +40,8 @@ struct accelerator::impl
                                return std::unique_ptr<core::image_mixer>(new ogl::image_mixer(
                                                spl::make_shared_ptr(ogl_device_),
                                                env::properties().get(L"configuration.mixer.blend-modes", false),
-                                               env::properties().get(L"configuration.mixer.straight-alpha", false)));
+                                               env::properties().get(L"configuration.mixer.straight-alpha", false),
+                                               channel_id));
                        }
                }
                catch(...)
@@ -49,7 +50,7 @@ struct accelerator::impl
                                CASPAR_LOG_CURRENT_EXCEPTION();
                }
 #ifdef _MSC_VER
-               return std::unique_ptr<core::image_mixer>(new cpu::image_mixer());
+               return std::unique_ptr<core::image_mixer>(new cpu::image_mixer(channel_id));
 #else
                CASPAR_THROW_EXCEPTION(not_supported());
 #endif
@@ -65,9 +66,9 @@ accelerator::~accelerator()
 {
 }
 
-std::unique_ptr<core::image_mixer> accelerator::create_image_mixer()
+std::unique_ptr<core::image_mixer> accelerator::create_image_mixer(int channel_id)
 {
-       return impl_->create_image_mixer();
+       return impl_->create_image_mixer(channel_id);
 }
 
 }}