2.1.0: Don't use 'struct' for interfaces, use 'class'.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2378 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/accelerator/cpu/image/image_mixer.h b/accelerator/cpu/image/image_mixer.h
index 55aa539199a38de3a25659dd171903443342235d..d540b6eb802373cb768c3540a25ae77da6dc8762 100644 (file)
--- a/accelerator/cpu/image/image_mixer.h
+++ b/accelerator/cpu/image/image_mixer.h
@@ -10,10 +10,10 @@
 \r
 FORWARD1(boost, template<typename> class shared_future);\r
 FORWARD1(boost, template<typename> class iterator_range);\r
-FORWARD2(caspar, core, struct write_frame);\r
+FORWARD2(caspar, core, class write_frame);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 FORWARD2(caspar, core, struct video_format_desc);\r
-FORWARD2(caspar, core, struct data_Frame);\r
+FORWARD2(caspar, core, class data_frame);\r
 FORWARD2(caspar, core, struct frame_transform);\r
 \r
 namespace caspar { namespace accelerator { namespace cpu {\r

diff --git a/accelerator/cpu/util/write_frame.h b/accelerator/cpu/util/write_frame.h
index a36ca0677bf9a7ca3d806a3ca2756cbc3071896f..737a88a60e21389b11f5e1920bbb6bda53947481 100644 (file)
--- a/accelerator/cpu/util/write_frame.h
+++ b/accelerator/cpu/util/write_frame.h
@@ -33,7 +33,7 @@
 #include <stdint.h>\r
 #include <vector>\r
 \r
-FORWARD2(caspar, core, struct frame_visitor);\r
+FORWARD2(caspar, core, class frame_visitor);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 \r
 namespace caspar { namespace accelerator { namespace cpu {\r

diff --git a/accelerator/ogl/image/image_mixer.h b/accelerator/ogl/image/image_mixer.h
index 2e88864ce65fdc65e093d0610e829aaa31b81120..ef3b0210aaea5c06e0d9833f4a25a8d241f62453 100644 (file)
--- a/accelerator/ogl/image/image_mixer.h
+++ b/accelerator/ogl/image/image_mixer.h
@@ -30,10 +30,10 @@
 #include <core/frame/frame_visitor.h>\r
 \r
 FORWARD1(boost, template<typename> class unique_future);\r
-FORWARD2(caspar, core, struct write_frame);\r
+FORWARD2(caspar, core, class write_frame);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 FORWARD2(caspar, core, struct video_format_desc);\r
-FORWARD2(caspar, core, struct data_Frame);\r
+FORWARD2(caspar, core, class data_frame);\r
 FORWARD2(caspar, core, struct frame_transform);\r
 \r
 namespace caspar { namespace accelerator { namespace ogl {\r

diff --git a/accelerator/ogl/util/write_frame.h b/accelerator/ogl/util/write_frame.h
index df9093d882150b12e0e1129bf992c54de39eac1a..ea11af96f12b4c8143ac53dcb486d0f58d4fa90d 100644 (file)
--- a/accelerator/ogl/util/write_frame.h
+++ b/accelerator/ogl/util/write_frame.h
@@ -32,7 +32,7 @@
 #include <vector>\r
 \r
 FORWARD1(boost, template <typename> class iterator_range);\r
-FORWARD2(caspar, core, struct frame_visitor);\r
+FORWARD2(caspar, core, class frame_visitor);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 \r
 namespace caspar { namespace accelerator { namespace ogl {\r

diff --git a/common/reactive.h b/common/reactive.h
index 233933405da84e590c45072c9d752b45e1108d94..b4e01e0f01af184576facce7ade623f8e5e794a7 100644 (file)
--- a/common/reactive.h
+++ b/common/reactive.h
@@ -91,8 +91,9 @@ public:
 };\r
 \r
 template<typename I, typename O = I>\r
-struct subject : public observer<I>, public observable<O>\r
+class subject : public observer<I>, public observable<O>\r
 {\r
+public:\r
        typedef typename observable<O>::observer                observer;\r
        typedef typename observable<O>::observer_ptr    observer_ptr;\r
 \r

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index be21724a9877ce1c35168aa7bb675630bc181538..fa8246ebe791294a262eb3eaca0cfe49db472a97 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -76,7 +76,7 @@ public:
                }); \r
        }\r
        \r
-       virtual bool send(const spl::shared_ptr<const struct data_frame>& frame) override                                       {return (*consumer_)->send(frame);}\r
+       virtual bool send(const spl::shared_ptr<const class data_frame>& frame) override                                        {return (*consumer_)->send(frame);}\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) override        {return (*consumer_)->initialize(format_desc, channel_index);}\r
        virtual std::wstring print() const override                                                                                                                     {return (*consumer_)->print();}\r
        virtual boost::property_tree::wptree info() const override                                                                                      {return (*consumer_)->info();}\r
@@ -103,7 +103,7 @@ public:
                CASPAR_LOG(info) << str << L" Uninitialized.";\r
        }\r
        \r
-       virtual bool send(const spl::shared_ptr<const struct data_frame>& frame) override                                       {return consumer_->send(frame);}\r
+       virtual bool send(const spl::shared_ptr<const class data_frame>& frame) override                                        {return consumer_->send(frame);}\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) override        {return consumer_->initialize(format_desc, channel_index);}\r
        virtual std::wstring print() const override                                                                                                                     {return consumer_->print();}\r
        virtual boost::property_tree::wptree info() const override                                                                                      {return consumer_->info();}\r
@@ -123,7 +123,7 @@ public:
        {\r
        }\r
        \r
-       virtual bool send(const spl::shared_ptr<const struct data_frame>& frame)                                        \r
+       virtual bool send(const spl::shared_ptr<const class data_frame>& frame)                                 \r
        {\r
                try\r
                {\r
@@ -238,8 +238,9 @@ spl::shared_ptr<core::frame_consumer> create_consumer(const std::vector<std::wst
 \r
 const spl::shared_ptr<frame_consumer>& frame_consumer::empty()\r
 {\r
-       struct empty_frame_consumer : public frame_consumer\r
+       class empty_frame_consumer : public frame_consumer\r
        {\r
+       public:\r
                virtual bool send(const spl::shared_ptr<const data_frame>&) override {return false;}\r
                virtual void initialize(const video_format_desc&, int) override{}\r
                virtual std::wstring print() const override {return L"empty";}\r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 9a301ff329a8b261c852cdf93cb49b120fcaefdf..4a0a777dcf253bea292977ca37364893e6f83ee9 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -32,12 +32,13 @@
 \r
 namespace caspar { namespace core {\r
        \r
-struct frame_consumer : boost::noncopyable\r
+class frame_consumer : boost::noncopyable\r
 {\r
+public:\r
        frame_consumer(){}\r
        virtual ~frame_consumer() {}\r
        \r
-       virtual bool send(const spl::shared_ptr<const struct data_frame>& frame) = 0;\r
+       virtual bool send(const spl::shared_ptr<const class data_frame>& frame) = 0;\r
        virtual void initialize(const struct video_format_desc& format_desc, int channel_index) = 0;\r
        virtual std::wstring print() const = 0;\r
        virtual boost::property_tree::wptree info() const = 0;\r

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 2cfba5a1affed3913358d74e640739ee741a37cf..534efbab6818a39f9a70e55ea378081a7b3a4869 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -40,11 +40,11 @@ public:
        \r
        // output\r
 \r
-       void operator()(spl::shared_ptr<const struct data_frame> frame, const struct video_format_desc& format_desc);\r
+       void operator()(spl::shared_ptr<const class data_frame> frame, const struct video_format_desc& format_desc);\r
        \r
-       void add(const spl::shared_ptr<struct frame_consumer>& consumer);\r
-       void add(int index, const spl::shared_ptr<struct frame_consumer>& consumer);\r
-       void remove(const spl::shared_ptr<struct frame_consumer>& consumer);\r
+       void add(const spl::shared_ptr<class frame_consumer>& consumer);\r
+       void add(int index, const spl::shared_ptr<class frame_consumer>& consumer);\r
+       void remove(const spl::shared_ptr<class frame_consumer>& consumer);\r
        void remove(int index);\r
        \r
        boost::unique_future<boost::property_tree::wptree> info() const;\r

diff --git a/core/frame/data_frame.cpp b/core/frame/data_frame.cpp
index 222a02ca0ab224752d42a03eed2755282a06d3c9..146941a384b9900c764801921f42986d46c90bb5 100644 (file)
--- a/core/frame/data_frame.cpp
+++ b/core/frame/data_frame.cpp
@@ -8,8 +8,9 @@ namespace caspar { namespace core {
        \r
 spl::shared_ptr<data_frame> data_frame::empty()\r
 {\r
-       struct empty_frame : public data_frame\r
+       class empty_frame : public data_frame\r
        {\r
+       public:\r
                empty_frame(){}\r
                virtual const struct pixel_format_desc& get_pixel_format_desc() const override\r
                {\r

diff --git a/core/frame/data_frame.h b/core/frame/data_frame.h
index 062f9a8e8240a40d21afc46ca40151f10b3c7c61..12dfdad7e3f309218c831503d66d0f502367c7f6 100644 (file)
--- a/core/frame/data_frame.h
+++ b/core/frame/data_frame.h
@@ -15,8 +15,9 @@ namespace caspar { namespace core {
        \r
 typedef std::vector<int32_t, tbb::cache_aligned_allocator<int32_t>> audio_buffer;\r
 \r
-struct data_frame\r
+class data_frame\r
 {\r
+public:\r
        data_frame(){}\r
        virtual ~data_frame(){}\r
 \r

diff --git a/core/frame/frame_factory.h b/core/frame/frame_factory.h
index fc0329284b44f2ba856c2a77f5765031a0cdbf80..98c096d5eb7d6cf4e0e6e35f28a207f9ba597ed0 100644 (file)
--- a/core/frame/frame_factory.h
+++ b/core/frame/frame_factory.h
@@ -29,11 +29,12 @@
 \r
 namespace caspar { namespace core {\r
                        \r
-struct frame_factory : boost::noncopyable\r
+class frame_factory : boost::noncopyable\r
 {\r
+public:\r
        virtual ~frame_factory(){}\r
 \r
-       virtual spl::shared_ptr<struct write_frame> create_frame(const void* video_stream_tag, const struct pixel_format_desc& desc) = 0;               \r
+       virtual spl::shared_ptr<class write_frame> create_frame(const void* video_stream_tag, const struct pixel_format_desc& desc) = 0;                \r
        virtual struct video_format_desc video_format_desc() const = 0; // nothrow\r
 };\r
 \r

diff --git a/core/frame/frame_visitor.h b/core/frame/frame_visitor.h
index 511848de0aafd64dfefadc8ea73ca883dce928f1..1e1cb121505b0dfb370d476c80b378aba765697a 100644 (file)
--- a/core/frame/frame_visitor.h
+++ b/core/frame/frame_visitor.h
@@ -25,11 +25,12 @@
 \r
 namespace caspar { namespace core {\r
        \r
-struct frame_visitor : boost::noncopyable\r
+class frame_visitor : boost::noncopyable\r
 {\r
+public:\r
        virtual ~frame_visitor(){}\r
        virtual void push(const struct frame_transform& transform) = 0;\r
-       virtual void visit(const struct data_frame& frame) = 0;\r
+       virtual void visit(const class data_frame& frame) = 0;\r
        virtual void pop() = 0;\r
 };\r
 \r

diff --git a/core/frame/write_frame.h b/core/frame/write_frame.h
index 538859c8db6e54299fa59e064bdba448f9170be9..7a813c5f47d496cf3a60bfb624dc2f90778d47f8 100644 (file)
--- a/core/frame/write_frame.h
+++ b/core/frame/write_frame.h
@@ -26,7 +26,7 @@
 \r
 namespace caspar { namespace core {\r
        \r
-struct write_frame : public draw_frame, public data_frame\r
+class write_frame : public draw_frame, public data_frame\r
 {\r
 };\r
 \r

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index bf71a1dbb67f660d85c036c919cf3deb40b1dd5e..ff976e502ec1681cfb54ec731bfc64b7d35a4e5e 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -42,7 +42,7 @@ public:
        audio_mixer();\r
 \r
        virtual void push(const struct frame_transform& transform);\r
-       virtual void visit(const struct data_frame& frame);\r
+       virtual void visit(const class data_frame& frame);\r
        virtual void pop();\r
 \r
        audio_buffer operator()(const struct video_format_desc& format_desc);\r

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index 3fc060db5bb81aab421865f1caaeff2c4cb47e7b..15b5806d742bf1101d4f0117d0a8875a4653fcd9 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -33,17 +33,18 @@
 #include <stdint.h>\r
 \r
 FORWARD1(boost, template<typename> class shared_future);\r
-FORWARD2(caspar, core, struct write_frame);\r
+FORWARD2(caspar, core, class write_frame);\r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
 \r
 namespace caspar { namespace core {\r
        \r
-struct image_mixer : public frame_visitor\r
+class image_mixer : public frame_visitor\r
 {\r
+public:\r
        virtual ~image_mixer(){}\r
        \r
        virtual void push(const struct frame_transform& frame) = 0;\r
-       virtual void visit(const struct data_frame& frame) = 0;\r
+       virtual void visit(const class data_frame& frame) = 0;\r
        virtual void pop() = 0;\r
 \r
        virtual void begin_layer(blend_mode blend_mode) = 0;\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 6739eeaa2d260626b5577953cd617abb6be5045c..6ae0a6381630fef600b129d5959b4459926299f6 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -53,7 +53,7 @@
 \r
 namespace caspar { namespace core {\r
 \r
-struct mixed_frame : public data_frame\r
+class mixed_frame : public data_frame\r
 {\r
        mutable boost::shared_future<boost::iterator_range<const uint8_t*>>     image_data_;\r
        const audio_buffer                                                                                                      audio_data_;\r
@@ -140,7 +140,7 @@ public:
        \r
        spl::shared_ptr<const data_frame> operator()(std::map<int, spl::shared_ptr<draw_frame>> frames, const video_format_desc& format_desc)\r
        {               \r
-               return executor_.invoke([=]() mutable -> spl::shared_ptr<const struct data_frame>\r
+               return executor_.invoke([=]() mutable -> spl::shared_ptr<const class data_frame>\r
                {               \r
                        try\r
                        {       \r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index e6c96eaf3895bb2325155c0b129a51d52beebb75..b47ce4ed186ab8de897e161e61bd2f0a7bf7344a 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -40,15 +40,15 @@ namespace caspar { namespace core {
 class mixer sealed : boost::noncopyable\r
 {\r
 public:        \r
-       explicit mixer(spl::shared_ptr<diagnostics::graph> graph, spl::unique_ptr<struct image_mixer> image_mixer);\r
+       explicit mixer(spl::shared_ptr<diagnostics::graph> graph, spl::unique_ptr<class image_mixer> image_mixer);\r
                                        \r
-       spl::shared_ptr<const struct data_frame> operator()(std::map<int, spl::shared_ptr<class draw_frame>> frames, const struct video_format_desc& format_desc);\r
+       spl::shared_ptr<const class data_frame> operator()(std::map<int, spl::shared_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
-       spl::shared_ptr<struct write_frame> create_frame(const void* tag, const struct pixel_format_desc& desc);\r
+       spl::shared_ptr<class write_frame> create_frame(const void* tag, const struct pixel_format_desc& desc);\r
 private:\r
        struct impl;\r
        spl::shared_ptr<impl> impl_;\r

diff --git a/core/producer/color/color_producer.h b/core/producer/color/color_producer.h
index 8b4277e417e01a0d6155201feda5a33c77b06430..cec986dddb3354d668e7a71cd14bb6cbb4411f28 100644 (file)
--- a/core/producer/color/color_producer.h
+++ b/core/producer/color/color_producer.h
@@ -28,7 +28,7 @@
 \r
 namespace caspar { namespace core {\r
        \r
-spl::shared_ptr<struct frame_producer> create_color_producer(const spl::shared_ptr<struct frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
-spl::shared_ptr<struct write_frame> create_color_frame(void* tag, const spl::shared_ptr<struct frame_factory>& frame_factory, const std::wstring& color);\r
+spl::shared_ptr<class frame_producer> create_color_producer(const spl::shared_ptr<class frame_factory>& frame_factory, const std::vector<std::wstring>& params);\r
+spl::shared_ptr<class write_frame> create_color_frame(void* tag, const spl::shared_ptr<class frame_factory>& frame_factory, const std::wstring& color);\r
 \r
 }}\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 4379100ed0faa6794905a1dfda68257b71880850..9164d93bf9849423013f9de11e454d695c618880 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -51,25 +51,25 @@ boost::unique_future<std::wstring> frame_producer::call(const std::wstring&)
 \r
 const spl::shared_ptr<frame_producer>& frame_producer::empty() // nothrow\r
 {\r
-\r
-struct empty_frame_producer : public frame_producer\r
-{\r
-       virtual spl::shared_ptr<draw_frame> receive(int){return draw_frame::empty();}\r
-       virtual spl::shared_ptr<draw_frame> last_frame() const{return draw_frame::empty();}\r
-       virtual void set_frame_factory(const spl::shared_ptr<frame_factory>&){}\r
-       virtual uint32_t nb_frames() const {return 0;}\r
-       virtual std::wstring print() const { return L"empty";}\r
-       virtual void subscribe(const monitor::observable::observer_ptr& o){}\r
-       virtual void unsubscribe(const monitor::observable::observer_ptr& o){}  \r
-       virtual std::wstring name() const {return L"empty";}\r
-       \r
-       virtual boost::property_tree::wptree info() const override\r
+       class empty_frame_producer : public frame_producer\r
        {\r
-               boost::property_tree::wptree info;\r
-               info.add(L"type", L"empty-producer");\r
-               return info;\r
-       }\r
-};\r
+       public:\r
+               virtual spl::shared_ptr<draw_frame> receive(int){return draw_frame::empty();}\r
+               virtual spl::shared_ptr<draw_frame> last_frame() const{return draw_frame::empty();}\r
+               virtual void set_frame_factory(const spl::shared_ptr<frame_factory>&){}\r
+               virtual uint32_t nb_frames() const {return 0;}\r
+               virtual std::wstring print() const { return L"empty";}\r
+               virtual void subscribe(const monitor::observable::observer_ptr& o){}\r
+               virtual void unsubscribe(const monitor::observable::observer_ptr& o){}  \r
+               virtual std::wstring name() const {return L"empty";}\r
+       \r
+               virtual boost::property_tree::wptree info() const override\r
+               {\r
+                       boost::property_tree::wptree info;\r
+                       info.add(L"type", L"empty-producer");\r
+                       return info;\r
+               }\r
+       };\r
 \r
        static spl::shared_ptr<frame_producer> producer = spl::make_shared<empty_frame_producer>();\r
        return producer;\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 9afa06dffd0980916c533647ba11e0387e1199e3..fa074fff173e40e958bb0736925ef38a5d21c764 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -42,9 +42,10 @@ FORWARD1(boost, template<typename T> class unique_future);
 \r
 namespace caspar { namespace core {\r
        \r
-struct frame_producer : public monitor::observable\r
+class frame_producer : public monitor::observable\r
                                          , boost::noncopyable\r
 {\r
+public:\r
        struct flags_def\r
        {\r
                enum type\r
@@ -79,7 +80,7 @@ struct frame_producer : public monitor::observable
        virtual void unsubscribe(const monitor::observable::observer_ptr& o) {}\r
 };\r
 \r
-typedef std::function<spl::shared_ptr<core::frame_producer>(const spl::shared_ptr<struct frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;\r
+typedef std::function<spl::shared_ptr<core::frame_producer>(const spl::shared_ptr<class frame_factory>&, const std::vector<std::wstring>&)> producer_factory_t;\r
 void register_producer_factory(const producer_factory_t& factory); // Not thread-safe.\r
 \r
 spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<frame_factory>&, const std::vector<std::wstring>& params);\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 8e9fef61b3b2de60ed2431aa564fdee1b86b7708..540182d7d34a1b675671a86e0a02acb7aba7407e 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -46,13 +46,13 @@ public:
 \r
        void swap(layer& other); // nothrow \r
                \r
-       void load(spl::shared_ptr<struct frame_producer> producer, const boost::optional<int32_t>& auto_play_delta = nullptr); // nothrow\r
+       void load(spl::shared_ptr<class frame_producer> producer, const boost::optional<int32_t>& auto_play_delta = nullptr); // nothrow\r
        void play(); // nothrow\r
        void pause(); // nothrow\r
        void stop(); // nothrow\r
                \r
-       spl::shared_ptr<struct frame_producer> foreground() const; // nothrow\r
-       spl::shared_ptr<struct frame_producer> background() const; // nothrow\r
+       spl::shared_ptr<class frame_producer> foreground() const; // nothrow\r
+       spl::shared_ptr<class frame_producer> background() const; // nothrow\r
 \r
        spl::shared_ptr<class draw_frame> receive(frame_producer::flags flags, const struct video_format_desc& format_desc); // nothrow\r
 \r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index ba861cc483b75b605cac9ba1128334ac03cfe7fb..bdf3814c5636abab3ff4978a0ea3ec82e7411518 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -30,7 +30,7 @@
 \r
 namespace caspar { namespace core {    \r
 \r
-struct separated_producer : public frame_producer\r
+class separated_producer : public frame_producer\r
 {              \r
        spl::shared_ptr<frame_producer> fill_producer_;\r
        spl::shared_ptr<frame_producer> key_producer_;\r
@@ -38,6 +38,7 @@ struct separated_producer : public frame_producer
        spl::shared_ptr<draw_frame>             key_;\r
        spl::shared_ptr<draw_frame>             last_frame_;\r
                        \r
+public:\r
        explicit separated_producer(const spl::shared_ptr<frame_producer>& fill, const spl::shared_ptr<frame_producer>& key) \r
                : fill_producer_(fill)\r
                , key_producer_(key)\r

diff --git a/core/producer/separated/separated_producer.h b/core/producer/separated/separated_producer.h
index 58987e30eab8e76b3af0a3406cff8988333c5a3c..48afe6cea405db364b8316e725fe9464fef27151 100644 (file)
--- a/core/producer/separated/separated_producer.h
+++ b/core/producer/separated/separated_producer.h
@@ -27,6 +27,6 @@
 \r
 namespace caspar { namespace core {\r
        \r
-spl::shared_ptr<struct frame_producer> create_separated_producer(const spl::shared_ptr<struct frame_producer>& fill, const spl::shared_ptr<struct frame_producer>& key);\r
+spl::shared_ptr<class frame_producer> create_separated_producer(const spl::shared_ptr<class frame_producer>& fill, const spl::shared_ptr<class frame_producer>& key);\r
 \r
 }}
\ No newline at end of file

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 2fddec0c23f7f1dd83af68d0fbe9b6775ffd19f2..0b8c770a455c2453cadd85aa0b351373c7b2141f 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -58,7 +58,7 @@ public:
        void clear_transforms(int index);\r
        void clear_transforms();\r
                                \r
-       void load(int index, const spl::shared_ptr<struct frame_producer>& producer, const boost::optional<int32_t>& auto_play_delta = nullptr);\r
+       void load(int index, const spl::shared_ptr<class frame_producer>& producer, const boost::optional<int32_t>& auto_play_delta = nullptr);\r
        void pause(int index);\r
        void play(int index);\r
        void stop(int index);\r
@@ -68,8 +68,8 @@ public:
        void swap_layer(int index, int other_index);\r
        void swap_layer(int index, int other_index, stage& other);\r
        \r
-       boost::unique_future<spl::shared_ptr<struct frame_producer>>    foreground(int index);\r
-       boost::unique_future<spl::shared_ptr<struct frame_producer>>    background(int index);\r
+       boost::unique_future<spl::shared_ptr<class frame_producer>>     foreground(int index);\r
+       boost::unique_future<spl::shared_ptr<class frame_producer>>     background(int index);\r
 \r
        boost::unique_future<boost::property_tree::wptree> info() const;\r
        boost::unique_future<boost::property_tree::wptree> info(int index) const;\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 25022de5a77e115ad1a84fad47321c49077f3406..561a64fa2ef10319d5ef766b9845ee89657d911f 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -32,7 +32,7 @@
 \r
 namespace caspar { namespace core {    \r
 \r
-struct transition_producer : public frame_producer\r
+class transition_producer : public frame_producer\r
 {      \r
        monitor::basic_subject                          event_subject_;\r
        const field_mode                                        mode_;\r
@@ -45,6 +45,7 @@ struct transition_producer : public frame_producer
        spl::shared_ptr<frame_producer>         dest_producer_;\r
        spl::shared_ptr<frame_producer>         source_producer_;\r
                \r
+public:\r
        explicit transition_producer(const field_mode& mode, const spl::shared_ptr<frame_producer>& dest, const transition_info& info) \r
                : mode_(mode)\r
                , current_frame_(0)\r

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index 30d5deadf2205bf94c78ae8db970eef7addde2e4..67ce0ad7fde6a1377da588342cf84eef25f5f1fe 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -70,6 +70,6 @@ struct transition_info
        tweener                                 tweener;\r
 };\r
 \r
-spl::shared_ptr<struct frame_producer> create_transition_producer(const field_mode& mode, const spl::shared_ptr<struct frame_producer>& destination, const transition_info& info);\r
+spl::shared_ptr<class frame_producer> create_transition_producer(const field_mode& mode, const spl::shared_ptr<class frame_producer>& destination, const transition_info& info);\r
 \r
 }}
\ No newline at end of file

diff --git a/core/video_channel.h b/core/video_channel.h
index 915766e824467e38de5b05e515a52b9ab24fcd8a..621d72f3f94e1aea7fb9722751a472ed0d1b50db 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -33,13 +33,13 @@ FORWARD3(caspar, core, ogl, class accelerator);
 FORWARD2(caspar, core, class stage);\r
 FORWARD2(caspar, core, class mixer);\r
 FORWARD2(caspar, core, class output);\r
-FORWARD2(caspar, core, struct image_mixer);\r
+FORWARD2(caspar, core, class image_mixer);\r
 FORWARD2(caspar, core, struct video_format_desc);\r
-FORWARD2(caspar, core, struct frame_factory);\r
+FORWARD2(caspar, core, class frame_factory);\r
 \r
 namespace caspar { namespace core {\r
        \r
-typedef reactive::observable<spl::shared_ptr<const struct data_frame>> frame_observable;\r
+typedef reactive::observable<spl::shared_ptr<const class data_frame>>  frame_observable;\r
 \r
 class video_channel sealed : public frame_observable\r
                                                   , public monitor::observable\r
@@ -63,7 +63,7 @@ public:
 \r
        boost::property_tree::wptree info() const;\r
 \r
-       // observable<spl::shared_ptr<const struct data_frame>>\r
+       // observable<spl::shared_ptr<const class data_frame>>\r
        \r
        virtual void subscribe(const frame_observable::observer_ptr& o) override;\r
        virtual void unsubscribe(const frame_observable::observer_ptr& o) override;\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.h b/modules/bluefish/consumer/bluefish_consumer.h
index b1dad9a1535dadf790a4958918cacacb6c7d6be3..c5cb86761b62fafa3b42be6e7d418e4667d6e717 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.h
+++ b/modules/bluefish/consumer/bluefish_consumer.h
@@ -30,7 +30,7 @@
 namespace caspar { \r
 \r
 namespace core {\r
-       struct frame_consumer;\r
+       class frame_consumer;\r
 }\r
         \r
 namespace bluefish {\r

diff --git a/modules/decklink/consumer/decklink_consumer.h b/modules/decklink/consumer/decklink_consumer.h
index 4996f335aa35dd5978c97cd09035fbcf87289a0b..e0e6fd07421357ba1841df07985781eba1a7c87f 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.h
+++ b/modules/decklink/consumer/decklink_consumer.h
@@ -33,7 +33,7 @@
 namespace caspar {\r
 \r
 namespace core {\r
-       struct frame_consumer;\r
+       class frame_consumer;\r
 }\r
 \r
 namespace decklink {\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.h b/modules/ffmpeg/consumer/ffmpeg_consumer.h
index 24d29d2a8394e6f66c06cf8419b7621f6097b2e1..1a6873ac12f89c8f29b840ccfec9f7c782e126ff 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.h
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.h
@@ -31,7 +31,7 @@
 namespace caspar { \r
 \r
 namespace core {\r
-       struct frame_consumer;\r
+       class frame_consumer;\r
 }\r
 \r
 namespace ffmpeg {\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index df203a6ec8cb0507ffb96f3c31160cc6da3473fd..1c695188e68d57940e3656c7ecdb875325e581da 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -30,8 +30,8 @@ namespace caspar {
 \r
 namespace core {\r
 \r
-struct frame_producer;\r
-struct frame_factory;\r
+class frame_producer;\r
+class frame_factory;\r
 \r
 }\r
        \r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.h b/modules/ffmpeg/producer/muxer/frame_muxer.h
index 982d7eb76a87f56d847f622d08a8231f7743dcff..6eae65b9b6b2432b6ca7e5716c43c8c6006f15f5 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.h
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.h
@@ -35,8 +35,8 @@
 struct AVFrame;\r
 \r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
-FORWARD2(caspar, core, struct write_frame);\r
-FORWARD2(caspar, core, struct frame_factory);\r
+FORWARD2(caspar, core, class write_frame);\r
+FORWARD2(caspar, core, class frame_factory);\r
 FORWARD2(caspar, core, class draw_frame);\r
 \r
 namespace caspar { namespace ffmpeg {\r

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 06d843c836d7a28b31d6a6ff2a3da1c95e6bd2a8..98525aab13aede7e7cf5bf7bc3f9d44d1becd90e 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -38,9 +38,9 @@ struct AVRational;
 struct AVCodecContext;\r
 \r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
-FORWARD2(caspar, core, struct write_frame);\r
-FORWARD2(caspar, core, struct data_frame);\r
-FORWARD2(caspar, core, struct frame_factory);\r
+FORWARD2(caspar, core, class write_frame);\r
+FORWARD2(caspar, core, class data_frame);\r
+FORWARD2(caspar, core, class frame_factory);\r
 \r
 namespace caspar { namespace ffmpeg {\r
                \r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index c1d368090ec4315344f78447684226c26941d4af..07e1bec7e9c83fdc0e4bc00b8d95268132dc2338 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -32,8 +32,8 @@ struct AVFormatContext;
 struct AVFrame;\r
 struct AVPacket;\r
 \r
-FORWARD2(caspar, core, struct write_frame);\r
-FORWARD2(caspar, core, struct frame_factory);\r
+FORWARD2(caspar, core, class write_frame);\r
+FORWARD2(caspar, core, class frame_factory);\r
 \r
 namespace caspar { namespace ffmpeg {\r
 \r

diff --git a/modules/image/consumer/image_consumer.h b/modules/image/consumer/image_consumer.h
index 972202faa32013550e36e6a1b86cfab2f0f7388c..6f11392c03d407a20423bc59174d9f67149cdf85 100644 (file)
--- a/modules/image/consumer/image_consumer.h
+++ b/modules/image/consumer/image_consumer.h
@@ -33,7 +33,7 @@
 namespace caspar { \r
 \r
 namespace core {\r
-       struct frame_consumer;\r
+       class frame_consumer;\r
 }\r
 \r
 namespace image {\r

diff --git a/modules/oal/consumer/oal_consumer.h b/modules/oal/consumer/oal_consumer.h
index 993208f049f6799ec62c374e671cc038c4e3e2cd..87e755835a87ae4b89c844ec812914ea0c80a312 100644 (file)
--- a/modules/oal/consumer/oal_consumer.h
+++ b/modules/oal/consumer/oal_consumer.h
@@ -30,7 +30,7 @@
 namespace caspar { \r
 \r
 namespace core {\r
-       struct frame_consumer;\r
+       class frame_consumer;\r
 }      \r
 \r
 namespace oal {\r

diff --git a/modules/screen/consumer/screen_consumer.h b/modules/screen/consumer/screen_consumer.h
index 6e6731200a24c4e36409741361c0fea8c7560f64..5a2c4d7e0996766964af384c553108f755e6e7b0 100644 (file)
--- a/modules/screen/consumer/screen_consumer.h
+++ b/modules/screen/consumer/screen_consumer.h
@@ -29,7 +29,7 @@
 namespace caspar { \r
        \r
 namespace core {\r
-       struct frame_consumer;\r
+       class frame_consumer;\r
 }\r
 \r
 namespace screen {\r