Merge branch 'master' of https://github.com/ronag/Server into master

[casparcg] / core / producer / frame_producer.cpp

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 02cc30f3a3bf409a33dfd257a64dd97d84cacd92..0a1341f4d61122c818911f4a3edb05aed78c97d4 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -26,7 +26,6 @@
 #include "frame/frame_transform.h"\r
 \r
 #include "color/color_producer.h"\r
-#include "playlist/playlist_producer.h"\r
 #include "separated/separated_producer.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
@@ -105,6 +104,7 @@ public:
        virtual safe_ptr<frame_producer>                                                        get_following_producer() const override                                                                 {return (*producer_)->get_following_producer();}\r
        virtual void                                                                                            set_leading_producer(const safe_ptr<frame_producer>& producer) override {(*producer_)->set_leading_producer(producer);}\r
        virtual uint32_t                                                                                        nb_frames() const override                                                                                              {return (*producer_)->nb_frames();}\r
+       virtual monitor::source&                                                                        monitor_output()                                                                                                                {return (*producer_)->monitor_output();}\r
 };\r
 \r
 safe_ptr<core::frame_producer> create_producer_destroy_proxy(safe_ptr<core::frame_producer> producer)\r
@@ -139,6 +139,7 @@ public:
        virtual safe_ptr<frame_producer>                                                        get_following_producer() const override                                                                 {return (producer_)->get_following_producer();}\r
        virtual void                                                                                            set_leading_producer(const safe_ptr<frame_producer>& producer) override {(producer_)->set_leading_producer(producer);}\r
        virtual uint32_t                                                                                        nb_frames() const override                                                                                              {return (producer_)->nb_frames();}\r
+       virtual monitor::source&                                                                        monitor_output()                                                                                                                {return (producer_)->monitor_output();}\r
 };\r
 \r
 safe_ptr<core::frame_producer> create_producer_print_proxy(safe_ptr<core::frame_producer> producer)\r
@@ -170,6 +171,11 @@ public:
                info.add(L"type", L"last-frame-producer");\r
                return info;\r
        }\r
+       virtual monitor::source& monitor_output()\r
+       {\r
+               static monitor::subject monitor_subject("");\r
+               return monitor_subject;\r
+       }\r
 };\r
 \r
 struct empty_frame_producer : public frame_producer\r
@@ -186,6 +192,12 @@ struct empty_frame_producer : public frame_producer
                info.add(L"type", L"empty-producer");\r
                return info;\r
        }\r
+\r
+       virtual monitor::source& monitor_output()\r
+       {\r
+               static monitor::subject monitor_subject("");\r
+               return monitor_subject;\r
+       }\r
 };\r
 \r
 const safe_ptr<frame_producer>& frame_producer::empty() // nothrow\r
@@ -229,9 +241,9 @@ void register_thumbnail_producer_factory(const producer_factory_t& factory)
        g_thumbnail_factories.push_back(factory);\r
 }\r
 \r
-safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params, const std::vector<const producer_factory_t>& factories, bool throw_on_fail = false)\r
+safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& upper_case_params, const std::vector<std::wstring>& original_case_params, const std::vector<const producer_factory_t>& factories, bool throw_on_fail = false)\r
 {\r
-       if(params.empty())\r
+       if(upper_case_params.empty())\r
                BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));\r
        \r
        auto producer = frame_producer::empty();\r
@@ -239,7 +251,7 @@ safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>&
                {\r
                        try\r
                        {\r
-                               producer = factory(my_frame_factory, params);\r
+                               producer = factory(my_frame_factory, upper_case_params, original_case_params);\r
                        }\r
                        catch(...)\r
                        {\r
@@ -252,30 +264,30 @@ safe_ptr<core::frame_producer> do_create_producer(const safe_ptr<frame_factory>&
                });\r
 \r
        if(producer == frame_producer::empty())\r
-               producer = create_color_producer(my_frame_factory, params);\r
-       \r
-       if(producer == frame_producer::empty())\r
-               producer = create_playlist_producer(my_frame_factory, params);\r
-       \r
+               producer = create_color_producer(my_frame_factory, upper_case_params, original_case_params);\r
        return producer;\r
 }\r
 \r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::vector<std::wstring>& upper_case_params, const std::vector<std::wstring>& original_case_params)\r
 {      \r
-       auto producer = do_create_producer(my_frame_factory, params, g_factories);\r
+       auto producer = do_create_producer(my_frame_factory, upper_case_params, original_case_params, g_factories);\r
        auto key_producer = frame_producer::empty();\r
        \r
        try // to find a key file.\r
        {\r
-               auto params_copy = params;\r
-               if(params_copy.size() > 0)\r
+               auto upper_params_copy = upper_case_params;\r
+               auto original_params_copy = original_case_params;\r
+\r
+               if(upper_case_params.size() > 0)\r
                {\r
-                       params_copy[0] += L"_A";\r
-                       key_producer = do_create_producer(my_frame_factory, params_copy, g_factories);                  \r
+                       upper_params_copy[0] += L"_A";\r
+                       original_params_copy[0] += L"_A";\r
+                       key_producer = do_create_producer(my_frame_factory, upper_params_copy, original_params_copy, g_factories);                      \r
                        if(key_producer == frame_producer::empty())\r
                        {\r
-                               params_copy[0] += L"LPHA";\r
-                               key_producer = do_create_producer(my_frame_factory, params_copy, g_factories);  \r
+                               upper_params_copy[0] += L"LPHA";\r
+                               original_params_copy[0] += L"LPHA";\r
+                               key_producer = do_create_producer(my_frame_factory, upper_params_copy, original_params_copy, g_factories);      \r
                        }\r
                }\r
        }\r
@@ -287,7 +299,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
        if(producer == frame_producer::empty())\r
        {\r
                std::wstring str;\r
-               BOOST_FOREACH(auto& param, params)\r
+               BOOST_FOREACH(auto& param, original_case_params)\r
                        str += param + L" ";\r
                BOOST_THROW_EXCEPTION(file_not_found() << msg_info("No match found for supplied commands. Check syntax.") << arg_value_info(narrow(str)));\r
        }\r
@@ -300,7 +312,7 @@ safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<frame_fa
        std::vector<std::wstring> params;\r
        params.push_back(media_file);\r
 \r
-       auto producer = do_create_producer(my_frame_factory, params, g_thumbnail_factories, true);\r
+       auto producer = do_create_producer(my_frame_factory, params, params, g_thumbnail_factories, true);\r
        auto key_producer = frame_producer::empty();\r
        \r
        try // to find a key file.\r
@@ -309,11 +321,11 @@ safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<frame_fa
                if (params_copy.size() > 0)\r
                {\r
                        params_copy[0] += L"_A";\r
-                       key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
+                       key_producer = do_create_producer(my_frame_factory, params_copy, params_copy, g_thumbnail_factories, true);\r
                        if (key_producer == frame_producer::empty())\r
                        {\r
                                params_copy[0] += L"LPHA";\r
-                               key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
+                               key_producer = do_create_producer(my_frame_factory, params_copy, params_copy, g_thumbnail_factories, true);\r
                        }\r
                }\r
        }\r
@@ -331,7 +343,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& fa
        std::vector<std::wstring> tokens;\r
        typedef std::istream_iterator<std::wstring, wchar_t, std::char_traits<wchar_t> > iterator;\r
        std::copy(iterator(iss),  iterator(), std::back_inserter(tokens));\r
-       return create_producer(factory, tokens);\r
+       return create_producer(factory, tokens, tokens);\r
 }\r
 \r
 }}
\ No newline at end of file