2.0.2: flash_producer: Fixed very minor problem with destruction order.

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

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 224efcd6bc2bbb2cb495b14ec4782086dd441c81..4239e1be783912639e29123acd2ef13a616c8a98 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -280,30 +280,31 @@ public:
 \r
 struct flash_producer : public core::frame_producer\r
 {      \r
-       const std::wstring filename_;   \r
-       const safe_ptr<core::frame_factory> frame_factory_;\r
+       const std::wstring                                                                                      filename_;      \r
+       const safe_ptr<core::frame_factory>                                                     frame_factory_;\r
 \r
-       tbb::atomic<int> fps_;\r
+       tbb::atomic<int>                                                                                        fps_;\r
 \r
        safe_ptr<diagnostics::graph> graph_;\r
 \r
-       tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>> frame_buffer_;\r
+       tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>>      frame_buffer_;\r
 \r
-       mutable tbb::spin_mutex         last_frame_mutex_;\r
-       safe_ptr<core::basic_frame>     last_frame_;\r
-                               \r
-       com_context<flash_renderer> context_;   \r
+       mutable tbb::spin_mutex                                                                         last_frame_mutex_;\r
+       safe_ptr<core::basic_frame>                                                                     last_frame_;\r
+               \r
+       int                                                                                                                     width_;\r
+       int                                                                                                                     height_;\r
+\r
+       com_context<flash_renderer>                                                                     context_;       \r
 \r
-       int width_;\r
-       int height_;\r
 public:\r
        flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filename, size_t width, size_t height) \r
                : filename_(filename)           \r
                , frame_factory_(frame_factory)\r
-               , context_(L"flash_producer")\r
                , last_frame_(core::basic_frame::empty())\r
                , width_(width > 0 ? width : frame_factory->get_video_format_desc().width)\r
                , height_(height > 0 ? height : frame_factory->get_video_format_desc().height)\r
+               , context_(L"flash_producer")\r
        {       \r
                if(!boost::filesystem::exists(filename))\r
                        BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename)));  \r