Fixed bug with monitor subject lifetime

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

diff --git a/core/producer/scene/scene_producer.h b/core/producer/scene/scene_producer.h
index 718dabfcf99db1dbc5281f37236f7ebda3aabc9b..32e8e2c3102575704c8fa91aed78663adffded1f 100644 (file)
--- a/core/producer/scene/scene_producer.h
+++ b/core/producer/scene/scene_producer.h
@@ -94,8 +94,8 @@ 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;
-       void subscribe(const monitor::observable::observer_ptr& o) override;
-       void unsubscribe(const monitor::observable::observer_ptr& o) override;
+       monitor::source& monitor_output();
+
        layer& create_layer(
                        const spl::shared_ptr<frame_producer>& producer, int x, int y, const std::wstring& name);
        layer& create_layer(
@@ -166,7 +166,7 @@ public:
 
                                        to_affect.set(tweened);
                                        
-                                       CASPAR_LOG(info) << relative_frame << L" " << *start_value << L" " << duration << L" " << tweened;
+                                       //CASPAR_LOG(info) << relative_frame << L" " << *start_value << L" " << duration << L" " << tweened;
                                };
 
                store_keyframe(to_affect.identity(), k);
@@ -191,7 +191,8 @@ public:
                store_keyframe(to_affect.identity(), k);
        }
 
-       core::variable& get_variable(const std::wstring& name);
+       core::variable& get_variable(const std::wstring& name) override;
+       const std::vector<std::wstring>& get_variables() const override;
 private:
        void store_keyframe(void* timeline_identity, const keyframe& k);
        void store_variable(