* Merged MIXER MIPMAP support from 2.0. Implemented as a setting in frame_transform...

[casparcg] / core / consumer / output.h

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 00e69cbc5440cc60009d12e098028bf3adcf6274..b6dc929ad2c53260d3a888486a1881148b3e2ed5 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -34,7 +34,7 @@ FORWARD2(caspar, diagnostics, class graph);
 
 namespace caspar { namespace core {
        
-class output sealed : public monitor::observable
+class output final
 {
        output(const output&);
        output& operator=(const output&);
@@ -55,14 +55,11 @@ public:
        void remove(const spl::shared_ptr<class frame_consumer>& consumer);
        void remove(int index);
        
-       // monitor::observable
-
-       void subscribe(const monitor::observable::observer_ptr& o) override;
-       void unsubscribe(const monitor::observable::observer_ptr& o) override;
+       monitor::subject& monitor_output();
 
        // Properties
 
-       boost::unique_future<boost::property_tree::wptree> info() const;
+       std::future<boost::property_tree::wptree> info() const;
 
 private:
        struct impl;