Merged most recent OSC changes

[casparcg] / core / producer / scene / scene_producer.h

diff --git a/core/producer/scene/scene_producer.h b/core/producer/scene/scene_producer.h
index 32e8e2c3102575704c8fa91aed78663adffded1f..a34836bbef2aa777390d6b7aec8cefcd68becd2a 100644 (file)
--- a/core/producer/scene/scene_producer.h
+++ b/core/producer/scene/scene_producer.h
@@ -94,7 +94,7 @@ public:
        std::wstring name() const override;
        boost::unique_future<std::wstring>      call(const std::vector<std::wstring>& params) override;
        boost::property_tree::wptree info() const override;
-       monitor::source& monitor_output();
+       monitor::subject& monitor_output();
 
        layer& create_layer(
                        const spl::shared_ptr<frame_producer>& producer, int x, int y, const std::wstring& name);