Merged most recent OSC changes

[casparcg] / core / producer / frame_producer.cpp

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index bfe9223fb866ca91272a58b2ac3e46c991efd6c2..472dfeed917a964bba6d29d4681e0c1fd71f1fda 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -167,7 +167,7 @@ const spl::shared_ptr<frame_producer>& frame_producer::empty()
                void paused(bool value) override{}
                uint32_t nb_frames() const override {return 0;}
                std::wstring print() const override { return L"empty";}
-               monitor::source& monitor_output() override {static monitor::subject monitor_subject(""); return monitor_subject;}                                                                               
+               monitor::subject& monitor_output() override {static monitor::subject monitor_subject(""); return monitor_subject;}                                                                              
                std::wstring name() const override {return L"empty";}
                uint32_t frame_number() const override {return 0;}
                boost::unique_future<std::wstring> call(const std::vector<std::wstring>& params) override{CASPAR_THROW_EXCEPTION(not_supported());}
@@ -249,7 +249,7 @@ public:
        uint32_t                                                                                        nb_frames() const override                                                                                                              {return producer_->nb_frames();}
        class draw_frame                                                                        last_frame()                                                                                                                                    {return producer_->last_frame();}
        draw_frame                                                                                      create_thumbnail_frame()                                                                                                                {return producer_->create_thumbnail_frame();}
-       monitor::source&                                                                        monitor_output() override                                                                                                               {return producer_->monitor_output();}                                                                           
+       monitor::subject&                                                                       monitor_output() override                                                                                                               {return producer_->monitor_output();}                                                                           
        bool                                                                                            collides(double x, double y)                                                                                                    {return producer_->collides(x, y);}
        void                                                                                            on_interaction(const interaction_event::ptr& event)                                                             {return producer_->on_interaction(event);}
        constraints&                                                                            pixel_constraints() override                                                                                                    {return producer_->pixel_constraints();}