2.0. - read/write-frame: Doesn't need to dispatch gpu buffer destruction to ogl...

      - blue_velvet: fixed typo.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@884 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/read_frame.cpp b/core/mixer/read_frame.cpp
index 559331be2d7a8733b0a33f5af312be785a8e4cb7..9664ad83b7fcd950c47664dd3a3ed410ec660f59 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/read_frame.cpp
@@ -37,16 +37,7 @@ public:
                : image_data_(std::move(image_data))\r
                , audio_data_(std::move(audio_data))\r
                , ogl_(ogl){}   \r
-\r
-       ~implementation()\r
-       {\r
-               auto image_data = image_data_;\r
-               ogl_.begin_invoke([=]() mutable\r
-               {\r
-                       image_data.reset();\r
-               }, high_priority);\r
-       }\r
-\r
+       \r
        const boost::iterator_range<const uint8_t*> image_data()\r
        {\r
                if(!image_data_)\r

diff --git a/core/mixer/write_frame.cpp b/core/mixer/write_frame.cpp
index ec401bd72f5786124be743cdec2b4f270cadbbce..57e04229f70646da62641862e3dac94088751100 100644 (file)
--- a/core/mixer/write_frame.cpp
+++ b/core/mixer/write_frame.cpp
@@ -57,18 +57,7 @@ public:
                        });\r
                }, high_priority);\r
        }\r
-\r
-       ~implementation()\r
-       {\r
-               auto buffers = buffers_;\r
-               auto textures = textures_;\r
-               ogl_.begin_invoke([=]() mutable\r
-               {\r
-                       buffers.clear();\r
-                       textures.clear();\r
-               }, high_priority);\r
-       }\r
-       \r
+               \r
        void accept(write_frame& self, core::frame_visitor& visitor)\r
        {\r
                visitor.begin(self);\r

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index 1525d3d7722b26d1fb58dcff592f46bc5ebfb257..eb9f3a429ea7e9aae2a661b83e6da8b539afd130 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -141,7 +141,7 @@ EVideoMode get_video_mode(CBlueVelvet4& blue, const core::video_format_desc& for
                        vid_fmt = videoMode;                    \r
        }\r
        if(vid_fmt == VID_FMT_INVALID)\r
-               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("vide-omode not supported.") << arg_value_info(narrow(format_desc.name)));\r
+               BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("video-mode not supported.") << arg_value_info(narrow(format_desc.name)));\r
 \r
        return vid_fmt;\r
 }\r