2.0. Updated namespaces.

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

diff --git a/modules/flash/producer/cg_producer.h b/modules/flash/producer/cg_producer.h
index 20985c7de9498e9d3ce3d9fe382f020aeaaeb63d..e631a6475dbc92aff13249c108b0c30254702091 100644 (file)
--- a/modules/flash/producer/cg_producer.h
+++ b/modules/flash/producer/cg_producer.h
@@ -20,22 +20,28 @@
 #pragma once\r
 \r
 #include <core/producer/frame_producer.h>\r
-#include <core/producer/frame_producer_device.h>\r
+#include <core/producer/stage.h>\r
 #include <core/video_format.h>\r
-#include <core/channel.h>\r
+#include <core/video_channel.h>\r
 \r
 #include <string>\r
 \r
-namespace caspar {\r
+namespace caspar { namespace flash {\r
                \r
 class cg_producer : public core::frame_producer\r
 {\r
 public:\r
        static const unsigned int DEFAULT_LAYER = 9999;\r
 \r
-       explicit cg_producer(const safe_ptr<core::frame_factory>& frame_factory);\r
+       explicit cg_producer(const safe_ptr<core::frame_producer>& producer);\r
        cg_producer(cg_producer&& other);\r
        \r
+       // frame_producer\r
+       virtual safe_ptr<core::basic_frame> receive(int);\r
+       virtual safe_ptr<core::basic_frame> last_frame() const;\r
+       virtual std::wstring print() const;\r
+\r
+       //cg_producer\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
        void remove(int layer);\r
        void play(int layer);\r
@@ -43,17 +49,13 @@ public:
        void next(int layer);\r
        void update(int layer, const std::wstring& data);\r
        void invoke(int layer, const std::wstring& label);\r
-       \r
-       // frame_producer\r
-       virtual safe_ptr<core::basic_frame> receive();\r
-       virtual std::wstring print() const;\r
 \r
 private:\r
        struct implementation;\r
        std::shared_ptr<implementation> impl_;\r
 };\r
-safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::channel>& channel, int layer_index = cg_producer::DEFAULT_LAYER);\r
+safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel>& video_channel, int layer_index = cg_producer::DEFAULT_LAYER);\r
 \r
 safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_factory> frame_factory, const std::vector<std::wstring>& params);\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file