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

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index e7688bb85e5f3a09892cc1a74c3c43bdcd2cd084..c7ae3a6e047f81a321ecc490ed55fbc04918631c 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -75,7 +75,7 @@ namespace caspar { namespace decklink {
                \r
 typedef std::pair<CComPtr<IDeckLinkVideoInputFrame>, CComPtr<IDeckLinkAudioInputPacket>> frame_packet;\r
 \r
-class decklink_producer : boost::noncopyable, public IDeckLinkInputCallback\r
+class decklink_input : boost::noncopyable, public IDeckLinkInputCallback\r
 {      \r
        Concurrency::ITarget<frame_packet>&     target_;\r
 \r
@@ -91,7 +91,7 @@ class decklink_producer : boost::noncopyable, public IDeckLinkInputCallback
        boost::timer                                            frame_timer_;\r
 \r
 public:\r
-       decklink_producer(Concurrency::ITarget<frame_packet>& target, const core::video_format_desc& format_desc, size_t device_index)\r
+       decklink_input(Concurrency::ITarget<frame_packet>& target, const core::video_format_desc& format_desc, size_t device_index)\r
                : target_(target)\r
                , decklink_(get_device(device_index))\r
                , input_(decklink_)\r
@@ -136,7 +136,7 @@ public:
                CASPAR_LOG(info) << print() << L" Successfully Initialized.";\r
        }\r
 \r
-       ~decklink_producer()\r
+       ~decklink_input()\r
        {\r
                Concurrency::scoped_oversubcription_token oversubscribe;\r
                if(input_ != nullptr) \r
@@ -169,7 +169,7 @@ public:
        }\r
 };\r
        \r
-class decklink_producer_proxy : public Concurrency::agent, public core::frame_producer\r
+class decklink_producer : public Concurrency::agent, public core::frame_producer\r
 {              \r
        safe_ptr<diagnostics::graph>                                                                                            graph_;\r
 \r
@@ -191,7 +191,7 @@ class decklink_producer_proxy : public Concurrency::agent, public core::frame_pr
        tbb::atomic<bool> is_running_;\r
 public:\r
 \r
-       explicit decklink_producer_proxy(const safe_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, size_t device_index, const std::wstring& filter_str, int64_t length)\r
+       explicit decklink_producer(const safe_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, size_t device_index, const std::wstring& filter_str, int64_t length)\r
                : muxed_frames_(1)\r
                , format_desc_(format_desc)\r
                , device_index_(device_index)\r
@@ -205,7 +205,7 @@ public:
                agent::start();\r
        }\r
 \r
-       ~decklink_producer_proxy()\r
+       ~decklink_producer()\r
        {\r
                is_running_ = false;\r
                agent::wait(this);\r
@@ -260,9 +260,9 @@ public:
                        \r
                        Concurrency::overwrite_buffer<frame_packet> input_buffer;\r
 \r
-                       decklink_producer producer(input_buffer, format_desc_, device_index_);\r
+                       decklink_input input(input_buffer, format_desc_, device_index_);\r
                        \r
-                       Concurrency::send(print_, producer.print());\r
+                       Concurrency::send(print_, input.print());\r
 \r
                        while(is_running_)\r
                        {\r
@@ -328,7 +328,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factor
        if(format_desc.format == core::video_format::invalid)\r
                format_desc = frame_factory->get_video_format_desc();\r
                        \r
-       return make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str, length);\r
+       return make_safe<decklink_producer>(frame_factory, format_desc, device_index, filter_str, length);\r
 }\r
 \r
 }}
\ No newline at end of file