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

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 75a621dc96dee7535c388b576ad9cb73be29a566..d5b12ce73395cb56e16c230245f00d607cbfa0cb 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -39,7 +39,7 @@
 \r
 namespace caspar { namespace core {\r
        \r
-class color_producer : public frame_producer_impl\r
+class color_producer : public frame_producer_base\r
 {\r
        monitor::basic_subject  event_subject_;\r
 \r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 94884dff06436728f480683bf568beb57da9fd89..851b500c2c8ece5313e4b26458aa11ab57fe4d8f 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -46,14 +46,14 @@ void register_producer_factory(const producer_factory_t& factory)
        g_factories.push_back(factory);\r
 }\r
 \r
-struct frame_producer_impl::impl\r
+struct frame_producer_base::impl\r
 {\r
        tbb::atomic<uint32_t>   frame_number_;\r
        tbb::atomic<bool>               paused_;\r
-       frame_producer_impl&    self_;\r
+       frame_producer_base&    self_;\r
        draw_frame                              last_frame_;\r
 \r
-       impl(frame_producer_impl& self)\r
+       impl(frame_producer_base& self)\r
                : self_(self)\r
                , last_frame_(draw_frame::empty())\r
        {\r
@@ -84,36 +84,36 @@ struct frame_producer_impl::impl
        }\r
 };\r
 \r
-frame_producer_impl::frame_producer_impl() : impl_(new impl(*this))\r
+frame_producer_base::frame_producer_base() : impl_(new impl(*this))\r
 {\r
 }\r
 \r
-draw_frame frame_producer_impl::receive()\r
+draw_frame frame_producer_base::receive()\r
 {\r
        return impl_->receive();\r
 }\r
 \r
-void frame_producer_impl::paused(bool value)\r
+void frame_producer_base::paused(bool value)\r
 {\r
        impl_->paused(value);\r
 }\r
 \r
-draw_frame frame_producer_impl::last_frame() const\r
+draw_frame frame_producer_base::last_frame() const\r
 {\r
        return impl_->last_frame();\r
 }\r
 \r
-boost::unique_future<std::wstring> frame_producer_impl::call(const std::wstring&) \r
+boost::unique_future<std::wstring> frame_producer_base::call(const std::wstring&) \r
 {\r
        BOOST_THROW_EXCEPTION(not_supported());\r
 }\r
 \r
-uint32_t frame_producer_impl::nb_frames() const\r
+uint32_t frame_producer_base::nb_frames() const\r
 {\r
        return std::numeric_limits<uint32_t>::max();\r
 }\r
 \r
-uint32_t frame_producer_impl::frame_number() const\r
+uint32_t frame_producer_base::frame_number() const\r
 {\r
        return impl_->frame_number_;\r
 }\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index adaee24a37e33e8f9847b25bdae0070208f051cd..2a684a3c3694c9e0ae63bffd9f60a5a3a253cc85 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -81,11 +81,11 @@ public:
        virtual void                                                            leading_producer(const spl::shared_ptr<frame_producer>&) {}  \r
 };\r
 \r
-class frame_producer_impl : public frame_producer\r
+class frame_producer_base : public frame_producer\r
 {\r
 public:\r
-       frame_producer_impl();\r
-       virtual ~frame_producer_impl(){}        \r
+       frame_producer_base();\r
+       virtual ~frame_producer_base(){}        \r
 \r
        // Methods      \r
 \r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index c0536e31f0a9fe09e7d83c40c52589328f61b69d..d689d99a707edacc2c21294a0424d1a61a84e1aa 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -31,7 +31,7 @@
 \r
 namespace caspar { namespace core {    \r
 \r
-class separated_producer : public frame_producer_impl\r
+class separated_producer : public frame_producer_base\r
 {              \r
        monitor::basic_subject                  event_subject_;\r
        monitor::basic_subject                  key_event_subject_;\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index b6fc75f069b524c2013845723a2f0727f6f5e68d..0eaf92b592961fa30f52911a703ae54df87ad944 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
-class transition_producer : public frame_producer_impl\r
+class transition_producer : public frame_producer_base\r
 {      \r
        monitor::basic_subject                          event_subject_;\r
        const field_mode                                        mode_;\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index a3cf66b40d6ab063392962ab703955626b9f7254..886b71014598b9c88598de805ef5c43ff3e6a856 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -302,7 +302,7 @@ public:
        }\r
 };\r
        \r
-class decklink_producer_proxy : public core::frame_producer_impl\r
+class decklink_producer_proxy : public core::frame_producer_base\r
 {              \r
        std::unique_ptr<decklink_producer>      producer_;\r
        const uint32_t                                          length_;\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 4a8faaff57d603b4b7c00534c2b51cce620edf03..9de6c48f30df31bf6bb051804b0b0cb925a5cef1 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -64,7 +64,7 @@
 \r
 namespace caspar { namespace ffmpeg {\r
                                \r
-struct ffmpeg_producer : public core::frame_producer_impl\r
+struct ffmpeg_producer : public core::frame_producer_base\r
 {\r
        monitor::basic_subject                                                  event_subject_;\r
        const std::wstring                                                              filename_;\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 15d3630d87cc0fa6d854147f91d04eb9a2933ea1..6b748ef0948944798c12496c71c50546261ba851 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -320,7 +320,7 @@ public:
        }\r
 };\r
 \r
-struct flash_producer : public core::frame_producer_impl\r
+struct flash_producer : public core::frame_producer_base\r
 {      \r
        monitor::basic_subject                                                  event_subject_;\r
        const std::wstring                                                              filename_;      \r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 9e775a68c87925134ba04b0907e3a352d40a57a3..52793e7cc4c2de1f5d3a44526a77253b13788e0f 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -46,7 +46,7 @@ using namespace boost::assign;
 \r
 namespace caspar { namespace image {\r
 \r
-struct image_producer : public core::frame_producer_impl\r
+struct image_producer : public core::frame_producer_base\r
 {      \r
        monitor::basic_subject  event_subject_;\r
        const std::wstring              filename_;\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index cd0a6bb204670372b8d82fabba4e159d0dd0a32d..7948668e782bf96c653ad69203425cd456b5b668 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -50,7 +50,7 @@ using namespace boost::assign;
 \r
 namespace caspar { namespace image {\r
                \r
-struct image_scroll_producer : public core::frame_producer_impl\r
+struct image_scroll_producer : public core::frame_producer_base\r
 {      \r
        monitor::basic_subject                  event_subject_;\r
 \r