Merged most recent OSC changes

[casparcg] / core / producer / layer.h

diff --git a/core/producer/layer.h b/core/producer/layer.h
index eb840782ca9206d322a4675c30ac9e984dde101b..c2d6a6997b6bc7a16f5046f98ae36ef9238b665a 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -65,7 +65,7 @@ public:
        
        // monitor::observable
 
-       monitor::source& monitor_output();
+       monitor::subject& monitor_output();
 
        // interaction_sink