2.0.2: output: Destroy consumers on calling thread instead of pipeline thread.

[casparcg] / modules / oal / consumer / oal_consumer.cpp

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 41826d8da3f5e775638af76b2f747cafba42d9a5..e554e2b5d263884b0dd53439846e2dc7768bf655 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -50,7 +50,7 @@ struct oal_consumer : public core::frame_consumer,  public sf::SoundStream
        int                                                                                                     channel_index_;\r
 \r
        tbb::concurrent_bounded_queue<std::shared_ptr<audio_buffer_16>> input_;\r
-       boost::circular_buffer<audio_buffer_16>                 container_;\r
+       boost::circular_buffer<audio_buffer_16>                         container_;\r
        tbb::atomic<bool>                                                                       is_running_;\r
        core::audio_buffer                                                                      temp;\r
 \r
@@ -62,7 +62,6 @@ public:
        {\r
                graph_->add_guide("tick-time", 0.5);\r
                graph_->set_color("tick-time", diagnostics::color(0.0f, 0.6f, 0.9f));   \r
-               graph_->set_text(print());\r
                diagnostics::register_graph(graph_);\r
 \r
                is_running_ = true;\r
@@ -87,6 +86,8 @@ public:
        {\r
                format_desc_    = format_desc;          \r
                channel_index_  = channel_index;\r
+               graph_->set_text(print());\r
+\r
                if(Status() != Playing)\r
                {\r
                        sf::SoundStream::Initialize(2, 48000);\r