print_producer_proxy changes.

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

diff --git a/core/producer/channel/channel_producer.cpp b/core/producer/channel/channel_producer.cpp
index 770b5a0efd0420bb7973075e542c440d66549656..7fcd28a9e168cf63b8f1e196685ab452e749c7fe 100644 (file)
--- a/core/producer/channel/channel_producer.cpp
+++ b/core/producer/channel/channel_producer.cpp
@@ -210,7 +210,8 @@ public:
 \r
 safe_ptr<frame_producer> create_channel_producer(const safe_ptr<core::frame_factory>& frame_factory, const safe_ptr<video_channel>& channel)\r
 {\r
-       return make_safe<channel_producer>(frame_factory, channel);\r
+       return create_producer_print_proxy(\r
+                       make_safe<channel_producer>(frame_factory, channel));\r
 }\r
 \r
 }}
\ No newline at end of file

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index f91c1072783dd4af92c8ad9105a6007324386b7e..8582a27417dd87de1e79d1987cd10aac924b9071 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -122,7 +122,8 @@ safe_ptr<frame_producer> create_color_producer(const safe_ptr<core::frame_factor
        if(color2.length() != 9 || color2[0] != '#')\r
                return core::frame_producer::empty();\r
 \r
-       return make_safe<color_producer>(frame_factory, color2);\r
+       return create_producer_print_proxy(\r
+                       make_safe<color_producer>(frame_factory, color2));\r
 }\r
 safe_ptr<core::write_frame> create_color_frame(void* tag, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& color)\r
 {\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 3fd5676965f1258c96e372b71a0d2b0fe1831388..ed27c816b5a2fbaf79a815c72fec992c366c42eb 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -74,9 +74,9 @@ public:
                                try\r
                                {\r
                                        if(!producer->unique())\r
-                                               CASPAR_LOG(trace) << str << L" Not destroyed on safe asynchronous destruction thread: " << producer->use_count();\r
+                                               CASPAR_LOG(trace) << str << L" Not destroyed on asynchronous destruction thread: " << producer->use_count();\r
                                        else\r
-                                               CASPAR_LOG(trace) << str << L" Destroying on safe asynchronous destruction thread.";\r
+                                               CASPAR_LOG(trace) << str << L" Destroying on asynchronous destruction thread.";\r
                                }\r
                                catch(...){}\r
                                                                \r
@@ -240,9 +240,6 @@ safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>&
        if(producer == frame_producer::empty())\r
                producer = create_playlist_producer(my_frame_factory, params);\r
        \r
-       if(producer != frame_producer::empty())\r
-               producer = create_producer_print_proxy(producer);\r
-\r
        return producer;\r
 }\r
 \r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index ffd05d1161acb5fe64b5449d1b3ebd014f56d0e0..5a4f92649bb3c796c476661814b2b5b50903cef3 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -83,5 +83,6 @@ void register_producer_factory(const producer_factory_t& factory); // Not thread
 safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::vector<std::wstring>& params);\r
 safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>&, const std::wstring& params);\r
 safe_ptr<core::frame_producer> create_producer_destroy_proxy(safe_ptr<core::frame_producer> producer);\r
+safe_ptr<core::frame_producer> create_producer_print_proxy(safe_ptr<core::frame_producer> producer);\r
 \r
 }}\r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index f52789f11bd266efd34d8e5366243b9262d35431..9d12fdeb9022433ee5f36d8348ea9d9cc79bee29 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -103,7 +103,8 @@ struct separated_producer : public frame_producer
 \r
 safe_ptr<frame_producer> create_separated_producer(const safe_ptr<frame_producer>& fill, const safe_ptr<frame_producer>& key)\r
 {\r
-       return make_safe<separated_producer>(fill, key);\r
+       return create_producer_print_proxy(\r
+                       make_safe<separated_producer>(fill, key));\r
 }\r
 \r
 }}\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 2b14faaf7d89ba4ea9c69421750878c3772909b0..c6a7f3fa2875682e3bb747707c3ef290d7fac45b 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -185,7 +185,8 @@ struct transition_producer : public frame_producer
 \r
 safe_ptr<frame_producer> create_transition_producer(const field_mode::type& mode, const safe_ptr<frame_producer>& destination, const transition_info& info)\r
 {\r
-       return make_safe<transition_producer>(mode, destination, info);\r
+       return create_producer_print_proxy(\r
+                       make_safe<transition_producer>(mode, destination, info));\r
 }\r
 \r
 }}\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 9bc14716d143a1b631933999de7365d1f0f2c6c9..e4c8d9c8b9ea33183dbcf0772437ff322cd09625 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -328,7 +328,9 @@ 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 create_producer_destroy_proxy(make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str, length));\r
+       return create_producer_print_proxy(\r
+                  create_producer_destroy_proxy(\r
+                       make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str, length)));\r
 }\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index fc0c227fb5fd1b714c956a046bf3f2ecad7a917b..5e92b710a6f69a70519c7f72e125e93ef0e82235 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -479,7 +479,9 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factor
        if(!boost::filesystem::exists(filename))\r
                BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(narrow(filename)));  \r
 \r
-       return create_producer_destroy_proxy(make_safe<flash_producer>(frame_factory, filename, template_host.width, template_host.height));\r
+       return create_producer_print_proxy(\r
+                  create_producer_destroy_proxy(\r
+                       make_safe<flash_producer>(frame_factory, filename, template_host.width, template_host.height)));\r
 }\r
 \r
 std::wstring find_template(const std::wstring& template_name)\r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index be9336bd965a6363c699d8f444fd3ab7bf0adb29..bae34e38ca3d41b11fe57c7baee36dd1cbfa7772 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -103,7 +103,8 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factor
        if(ext == extensions.end())\r
                return core::frame_producer::empty();\r
 \r
-       return make_safe<image_producer>(frame_factory, filename + L"." + *ext);\r
+       return create_producer_print_proxy(\r
+                       make_safe<image_producer>(frame_factory, filename + L"." + *ext));\r
 }\r
 \r
 \r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index a084c0d86713abd1c58cc2c0c3e8f2068dde0b10..d7a11f65e44480105a75c2b23f852e15f00d114e 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -253,7 +253,8 @@ safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame
        if(speed == 0)\r
                return core::frame_producer::empty();\r
 \r
-       return make_safe<image_scroll_producer>(frame_factory, filename + L"." + *ext, speed);\r
+       return create_producer_print_proxy(\r
+                       make_safe<image_scroll_producer>(frame_factory, filename + L"." + *ext, speed));\r
 }\r
 \r
 }}
\ No newline at end of file