* Upgraded to Visual Studio 2013

[casparcg] / core / producer / frame_producer.h

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index cbec012bbcbd080b64cb2aad40a7424e96fdbc48..f07852feb5d8cabdd9a896d53fcdd4dbac17d967 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -56,7 +56,7 @@ struct constraints
 };
        
 // Interface
-class frame_producer : public monitor::observable, public interaction_sink
+class frame_producer : public interaction_sink
 {
        frame_producer(const frame_producer&);
        frame_producer& operator=(const frame_producer&);
@@ -74,14 +74,13 @@ public:
        // Methods      
 
        virtual class draw_frame                                        receive() = 0;
-       virtual boost::unique_future<std::wstring>      call(const std::vector<std::wstring>& params) = 0;
+       virtual std::future<std::wstring>                       call(const std::vector<std::wstring>& params) = 0;
        virtual variable&                                                       get_variable(const std::wstring& name) = 0;
        virtual const std::vector<std::wstring>&        get_variables() const = 0;
        
        // monitor::observable
 
-       virtual void subscribe(const monitor::observable::observer_ptr& o) = 0;
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o) = 0;
+       virtual monitor::subject& monitor_output() = 0;
 
        // interaction_sink
        virtual void on_interaction(const interaction_event::ptr& event) override { }
@@ -110,7 +109,7 @@ public:
 
        // Methods      
 
-       virtual boost::unique_future<std::wstring>      call(const std::vector<std::wstring>& params) override;
+       virtual std::future<std::wstring>                       call(const std::vector<std::wstring>& params) override;
        virtual variable&                                                       get_variable(const std::wstring& name) override;
        virtual const std::vector<std::wstring>&        get_variables() const override;