Merged screen consumer improvements from trunk

[casparcg] / core / mixer / mixer.h

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 0874aca482f20eb32ee72631bd8ff49b23e5b575..328b852387743b7300f86138ec9787cba859fac0 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -24,7 +24,8 @@
 #include "image/blend_modes.h"\r
 \r
 #include <common/forward.h>\r
-#include <common/spl/memory.h>\r
+#include <common/future_fwd.h>\r
+#include <common/memory.h>\r
 #include <common/reactive.h>\r
 \r
 #include <core/video_format.h>\r
@@ -33,7 +34,6 @@
 \r
 #include <map>\r
 \r
-FORWARD1(boost, template<typename> class unique_future);\r
 FORWARD2(caspar, diagnostics, class graph);\r
 \r
 namespace caspar { namespace core {\r
@@ -56,7 +56,7 @@ public:
        \r
        void set_blend_mode(int index, blend_mode value);\r
 \r
-       class mutable_frame create_frame(const void* tag, const struct pixel_format_desc& desc, double frame_rate, core::field_mode field_mode);\r
+       class mutable_frame create_frame(const void* tag, const struct pixel_format_desc& desc);\r
 \r
        // Properties\r
 \r