2.1.0: Fixed missing and unnecessary create_destroy_proxy calls.

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

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 8ebbfbf5dbbfe356af3bafce0a8e0370af683cee..31f18843f12d2a0e53f1fa994cb68bfe2ee60f5c 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -237,7 +237,7 @@ spl::shared_ptr<core::frame_producer> do_create_producer(const spl::shared_ptr<f
        if(producer == frame_producer::empty())\r
                return producer;\r
                \r
-       return create_destroy_proxy(producer);\r
+       return producer;\r
 }\r
 \r
 spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<frame_factory>& my_frame_factory, const video_format_desc& format_desc, const std::vector<std::wstring>& params)\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index fabe974cb4ca27aa1f4948be3a60a2ea58121d78..c9c47c4bd061ef328441cca2c8c9001d30b0d131 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -391,7 +391,7 @@ spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core
        if(in_format_desc.format == core::video_format::invalid)\r
                in_format_desc = out_format_desc;\r
                        \r
-       return spl::make_shared<decklink_producer_proxy>(in_format_desc, frame_factory, out_format_desc, device_index, filter_str, length);\r
+       return create_destroy_proxy(spl::make_shared<decklink_producer_proxy>(in_format_desc, frame_factory, out_format_desc, device_index, filter_str, length));\r
 }\r
 \r
 }}
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 834794fac8d07a4bb6556acfa2535761d1c16d88..75ab8c7dc8dbbf6733df8282778c77896ba5178d 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -399,7 +399,7 @@ spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core
        auto length             = get_param(L"LENGTH", params, std::numeric_limits<uint32_t>::max());\r
        auto filter_str = get_param(L"FILTER", params, L"");    \r
        \r
-       return spl::make_shared_ptr(std::make_shared<ffmpeg_producer>(frame_factory, format_desc, filename, filter_str, loop, start, length));\r
+       return create_destroy_proxy(spl::make_shared_ptr(std::make_shared<ffmpeg_producer>(frame_factory, format_desc, filename, filter_str, loop, start, 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 6b748ef0948944798c12496c71c50546261ba851..398c9b3ec6ef020fb7bd5ba710bae7df5fe74892 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -506,7 +506,7 @@ spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core
        if(!boost::filesystem::exists(filename))\r
                BOOST_THROW_EXCEPTION(file_not_found() << boost::errinfo_file_name(u8(filename)));      \r
 \r
-       return spl::make_shared<flash_producer>(frame_factory, format_desc, filename, template_host.width, template_host.height);\r
+       return create_destroy_proxy(spl::make_shared<flash_producer>(frame_factory, format_desc, filename, template_host.width, template_host.height));\r
 }\r
 \r
 std::wstring find_template(const std::wstring& template_name)\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 1e7d3ae667d6b0cfddfcaab5e183f2c874fa0854..a27273683df42f6a5426492eb20bbd0d14a7b3be 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -13,7 +13,7 @@
   </flash>\r
   <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>720p5000</video-mode>\r
       <consumers>\r
         <screen>\r
           <auto-deinterlace>false</auto-deinterlace>\r