2.0.0.2:

[casparcg] / core / protocol / media.cpp

diff --git a/core/protocol/media.cpp b/core/protocol/media.cpp
index a2ad3fd4e1dd3a50143f28da2fdc71eae9ed8c65..8a10e22b4ab4667f67622d4a30b7c26a2345ef12 100644 (file)
--- a/core/protocol/media.cpp
+++ b/core/protocol/media.cpp
@@ -18,11 +18,11 @@ using namespace boost::assign;
 \r
 namespace caspar { namespace core { \r
        \r
-frame_producer_ptr load_media(const std::vector<std::wstring>& params, const frame_format_desc& format_desc)\r
+frame_producer_ptr load_media(const std::vector<std::wstring>& params)\r
 {              \r
-       typedef std::function<frame_producer_ptr(const std::vector<std::wstring>&, const frame_format_desc&)> ProducerFactory;\r
+       typedef std::function<frame_producer_ptr(const std::vector<std::wstring>&)> producer_factory;\r
 \r
-       const auto producerFactories = list_of<ProducerFactory>\r
+       const auto producer_factories = list_of<producer_factory>\r
                (&flash::create_flash_producer)\r
                (&flash::create_ct_producer)\r
                (&image::create_image_producer)\r
@@ -33,21 +33,21 @@ frame_producer_ptr load_media(const std::vector<std::wstring>& params, const fra
        if(params.empty())\r
                BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));\r
 \r
-       frame_producer_ptr pProducer;\r
-       std::any_of(producerFactories.begin(), producerFactories.end(), [&](const ProducerFactory& producerFactory) -> bool\r
+       frame_producer_ptr producer;\r
+       std::any_of(producer_factories.begin(), producer_factories.end(), [&](const producer_factory& factory) -> bool\r
                {\r
                        try\r
                        {\r
-                               pProducer = producerFactory(params, format_desc);\r
+                               producer = factory(params);\r
                        }\r
                        catch(...)\r
                        {\r
                                CASPAR_LOG_CURRENT_EXCEPTION();\r
                        }\r
-                       return pProducer != nullptr;\r
+                       return producer != nullptr;\r
                });\r
 \r
-       return pProducer;\r
+       return producer;\r
 }\r
 \r
 }}\r