git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index c4a7ed9fea858759b57eaa9fe8a3f245d007f3dd..b691edd11788ca470c5637b57a9e5c423ca1a1db 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -43,17 +43,12 @@ class mixer sealed : boost::noncopyable
 {\r
 public:        \r
        explicit mixer(const safe_ptr<gpu::accelerator>& ogl);\r
-                               \r
-       // mixer\r
-                       \r
+                                       \r
+       safe_ptr<const struct data_frame> operator()(std::map<int, safe_ptr<class draw_frame>> frames, const struct video_format_desc& format_desc);\r
+       \r
        void set_blend_mode(int index, blend_mode value);\r
 \r
        boost::unique_future<boost::property_tree::wptree> info() const;\r
-       \r
-       // subject\r
-\r
-       safe_ptr<const struct data_frame> operator()(std::map<int, safe_ptr<class draw_frame>> frames, const struct video_format_desc& format_desc);\r
-\r
 private:\r
        struct impl;\r
        safe_ptr<impl> impl_;\r