Merged most recent OSC changes

[casparcg] / core / video_channel.h

diff --git a/core/video_channel.h b/core/video_channel.h
index e93bc1d073135780d41ad03755e86ee19f3ac39e..a0bd94eb17995871349ced82393b8a3d8c29cdf1 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -54,7 +54,7 @@ public:
 
        // Methods
                        
-       monitor::source& monitor_output();
+       monitor::subject& monitor_output();
 
        // Properties