2.0.0.2:

[casparcg] / core / producer / flash / cg_producer.h

diff --git a/core/producer/flash/cg_producer.h b/core/producer/flash/cg_producer.h
index 1fdb7428a134f182b60e3fdb486f32c4a3439528..997f5cd311847f93214822af4d947e0708c1325f 100644 (file)
--- a/core/producer/flash/cg_producer.h
+++ b/core/producer/flash/cg_producer.h
@@ -1,17 +1,17 @@
 #pragma once\r
 \r
 #include "../frame_producer.h"\r
-#include "../../frame/frame_fwd.h"\r
-#include "../../renderer/render_device.h"\r
+#include "../../video/video_format.h"\r
+#include "../../channel.h"\r
 \r
 namespace caspar { namespace core { namespace flash{\r
                \r
 class cg_producer : public frame_producer\r
 {\r
 public:\r
-       cg_producer(const frame_format_desc& format_desc);\r
+       cg_producer();\r
        \r
-       gpu_frame_ptr render_frame();\r
+       frame_ptr render_frame();\r
 \r
        void clear();\r
        void add(int layer, const std::wstring& template_name,  bool play_on_load, const std::wstring& start_from_label = TEXT(""), const std::wstring& data = TEXT(""));\r
@@ -22,8 +22,8 @@ public:
        void update(int layer, const std::wstring& data);\r
        void invoke(int layer, const std::wstring& label);\r
 \r
-       const frame_format_desc& get_frame_format_desc() const;\r
-       void initialize(const frame_factory_ptr& factory);\r
+       const video_format_desc& get_video_format_desc() const;\r
+       void initialize(const frame_processor_device_ptr& frame_processor);\r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r
@@ -32,6 +32,6 @@ typedef std::shared_ptr<cg_producer> cg_producer_ptr;
 \r
 static const unsigned int CG_DEFAULT_LAYER = 5000;\r
 \r
-cg_producer_ptr get_default_cg_producer(const renderer::render_device_ptr& render_device, unsigned int layer_index = CG_DEFAULT_LAYER);\r
+cg_producer_ptr get_default_cg_producer(const channel_ptr& channel, unsigned int layer_index = CG_DEFAULT_LAYER);\r
 \r
 }}}
\ No newline at end of file