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

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index 4da874b843b65c7935c29407f81a39ba0c9a38fc..b68de7c48590414cceaffcf127fea28b21b018f3 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -142,7 +142,7 @@ private:
                        auto key_data = channel_.ogl().create_host_buffer(frame->image_data().size(), host_buffer::write_only);                         \r
                        fast_memsfhl(key_data->data(), frame->image_data().begin(), frame->image_data().size(), 0x0F0F0F0F, 0x0B0B0B0B, 0x07070707, 0x03030303);\r
                        std::vector<int16_t> audio_data(frame->audio_data().begin(), frame->audio_data().end());\r
-                       return make_safe<read_frame>(channel_.ogl(), std::move(key_data), std::move(audio_data));\r
+                       return make_safe<read_frame>(std::move(key_data), std::move(audio_data));\r
                }\r
                \r
                return make_safe<read_frame>();\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 3adf51bd36dd7520252f5e73ddf722f56d4f4630..4d2e50693f7a09e84c4e93f71a77ae85fefba78d 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -113,7 +113,7 @@ public:
                        auto image = mix_image(frames);\r
                        auto audio = mix_audio(frames);\r
                        \r
-                       return make_safe<read_frame>(channel_.ogl(), std::move(image), std::move(audio));\r
+                       return make_safe<read_frame>(std::move(image), std::move(audio));\r
                }\r
                catch(...)\r
                {\r

diff --git a/core/mixer/read_frame.cpp b/core/mixer/read_frame.cpp
index 9664ad83b7fcd950c47664dd3a3ed410ec660f59..d588155a511054f88f025a0659b076d4c5d7b156 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/read_frame.cpp
@@ -30,13 +30,11 @@ struct read_frame::implementation : boost::noncopyable
 {\r
        std::shared_ptr<host_buffer> image_data_;\r
        std::vector<int16_t> audio_data_;\r
-       ogl_device& ogl_;\r
 \r
 public:\r
-       implementation(ogl_device& ogl, safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data) \r
+       implementation(safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data) \r
                : image_data_(std::move(image_data))\r
-               , audio_data_(std::move(audio_data))\r
-               , ogl_(ogl){}   \r
+               , audio_data_(std::move(audio_data)){}  \r
        \r
        const boost::iterator_range<const uint8_t*> image_data()\r
        {\r
@@ -52,8 +50,8 @@ public:
        }\r
 };\r
 \r
-read_frame::read_frame(ogl_device& ogl, safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data) \r
-       : impl_(new implementation(ogl, std::move(image_data), std::move(audio_data))){}\r
+read_frame::read_frame(safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data) \r
+       : impl_(new implementation(std::move(image_data), std::move(audio_data))){}\r
 read_frame::read_frame(){}\r
 const boost::iterator_range<const uint8_t*> read_frame::image_data() const\r
 {\r

diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index ebb2cacb1b2dfd09bfe1cc9a90bb55558c067088..70fffdc14c878462e07489eea283da22082b328e 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -37,7 +37,7 @@ class read_frame : boost::noncopyable
 {\r
 public:\r
        read_frame();\r
-       read_frame(ogl_device& ogl, safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data);\r
+       read_frame(safe_ptr<host_buffer>&& image_data, std::vector<int16_t>&& audio_data);\r
 \r
        virtual const boost::iterator_range<const uint8_t*> image_data() const;\r
        virtual const boost::iterator_range<const int16_t*> audio_data() const;\r