2.0: Minor cleanup.

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

diff --git a/common/exception/exceptions.h b/common/exception/exceptions.h
index 5fe033ba86aadaba1c94ba69ca20f142a12e6be5..538cde569700e16f96d656c10afb9f46acc4e508 100644 (file)
--- a/common/exception/exceptions.h
+++ b/common/exception/exceptions.h
@@ -31,7 +31,7 @@ typedef boost::error_info<struct tag_arg_value_info, std::string>             arg_value_inf
 typedef boost::error_info<struct tag_msg_info, std::string>                            msg_info;\r
 typedef boost::error_info<struct tag_errorstr, std::string>                            errorstr;\r
 typedef boost::error_info<struct tag_source_info, std::string>                 source_info;\r
-typedef boost::error_info<struct tag_line_info, size_t>                                line_info;\r
+typedef boost::error_info<struct tag_line_info, size_t>                                        line_info;\r
 typedef boost::error_info<struct errinfo_nested_exception_, std::exception_ptr> errinfo_nested_exception;\r
 \r
 struct caspar_exception                        : virtual boost::exception, virtual std::exception \r

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index b77411770c377ebf563dc8a749a34cb87721742e..84acd9564487449aaf5583b78572238c8f5c41ae 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -78,7 +78,7 @@ safe_ptr<device_buffer> ogl_device::create_device_buffer(size_t width, size_t he
                        \r
        return safe_ptr<device_buffer>(buffer.get(), [=](device_buffer*)\r
        {\r
-               executor_.begin_invoke([=]\r
+               executor_.begin_invoke([=] // Execute in ogl context in order to guarantee destruction of buffer in ogl context.\r
                {\r
                        pool->push(buffer);\r
 \r

diff --git a/core/mixer/write_frame.cpp b/core/mixer/write_frame.cpp
index a9917c119dbbf954cb9638b0d669632b360534f1..2d704141d11dc07e36f9dfad4b988a939ddec277 100644 (file)
--- a/core/mixer/write_frame.cpp
+++ b/core/mixer/write_frame.cpp
@@ -37,10 +37,10 @@ struct write_frame::implementation : boost::noncopyable
        std::vector<safe_ptr<device_buffer>>    textures_;\r
        std::vector<int16_t>                                    audio_data_;\r
        const core::pixel_format_desc                   desc_;\r
-       int32_t                                                                 tag_;\r
+       int                                                                             tag_;\r
 \r
 public:\r
-       implementation(ogl_device& ogl, int32_t tag, const core::pixel_format_desc& desc) \r
+       implementation(ogl_device& ogl, int tag, const core::pixel_format_desc& desc) \r
                : ogl_(ogl)\r
                , desc_(desc)\r
                , tag_(tag)\r
@@ -125,10 +125,9 @@ const boost::iterator_range<const int16_t*> write_frame::audio_data() const
 {\r
        return boost::iterator_range<const int16_t*>(impl_->audio_data_.data(), impl_->audio_data_.data() + impl_->audio_data_.size());\r
 }\r
-int32_t write_frame::tag() const {return impl_->tag_;}\r
+int write_frame::tag() const {return impl_->tag_;}\r
 const core::pixel_format_desc& write_frame::get_pixel_format_desc() const{return impl_->desc_;}\r
 const std::vector<safe_ptr<device_buffer>>& write_frame::get_textures() const{return impl_->textures_;}\r
-const std::vector<safe_ptr<host_buffer>>& write_frame::get_buffers() const{return impl_->buffers_;}\r
 void write_frame::commit(size_t plane_index){impl_->commit(plane_index);}\r
 void write_frame::commit(){impl_->commit();}\r
 }}
\ No newline at end of file

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 05f0204ace40a716d209934436e031f7aa93c9e9..06cdde00d04c28afa48b2dc6e9333947cd409dde 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -61,7 +61,6 @@ private:
 \r
        const core::pixel_format_desc& get_pixel_format_desc() const;\r
        const std::vector<safe_ptr<device_buffer>>& get_textures() const;\r
-       const std::vector<safe_ptr<host_buffer>>& get_buffers() const;\r
 \r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r