X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fmixer%2Fmixer.h;h=4d51a69e9fde371f0d4e9366e0b911ea75814d40;hb=0a26b5381ff64b6cb1eb5754ddcdf2e21adb7662;hp=6bd6197d53960273640e5b94a684ef415795716d;hpb=c77152657f7864ca78a9638948272193e1a88faf;p=casparcg

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 6bd6197d5..4d51a69e9 100644
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -26,9 +26,9 @@
 #include <common/forward.h>
 #include <common/future_fwd.h>
 #include <common/memory.h>
-#include <common/reactive.h>
 
 #include <core/fwd.h>
+#include <core/monitor/monitor.h>
 
 #include <boost/property_tree/ptree_fwd.hpp>
 
@@ -48,22 +48,26 @@ public:
 					
 	// Constructors
 	
-	explicit mixer(int channel_index, spl::shared_ptr<diagnostics::graph> graph, spl::shared_ptr<image_mixer> image_mixer);
+	explicit mixer(int channel_index, spl::shared_ptr<caspar::diagnostics::graph> graph, spl::shared_ptr<image_mixer> image_mixer);
 
 	// Methods
 		
-	const_frame operator()(std::map<int, draw_frame> frames, const video_format_desc& format_desc);
+	const_frame operator()(std::map<int, draw_frame> frames, const video_format_desc& format_desc, const core::audio_channel_layout& channel_layout);
 
 	void set_master_volume(float volume);
 	float get_master_volume();
+	void set_straight_alpha_output(bool value);
+	bool get_straight_alpha_output();
 
-	mutable_frame create_frame(const void* tag, const pixel_format_desc& desc);
+	mutable_frame create_frame(const void* tag, const pixel_format_desc& desc, const core::audio_channel_layout& channel_layout);
 
 	// Properties
 
 	std::future<boost::property_tree::wptree> info() const;
 	std::future<boost::property_tree::wptree> delay_info() const;
 
+	monitor::subject& monitor_output();
+
 private:
 	struct impl;
 	spl::shared_ptr<impl> impl_;