/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
*\r
* This file is part of CasparCG (www.casparcg.com).\r
*\r
#include "frame/basic_frame.h"\r
#include "frame/frame_transform.h"\r
\r
+#include "../parameters/parameters.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
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
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
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
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
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 core::parameters& params, const std::vector<const producer_factory_t>& factories, bool throw_on_fail = false)\r
{\r
if(params.empty())\r
BOOST_THROW_EXCEPTION(invalid_argument() << arg_name_info("params") << arg_value_info(""));\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
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 core::parameters& params)\r
{ \r
auto producer = do_create_producer(my_frame_factory, params, g_factories);\r
auto key_producer = frame_producer::empty();\r
\r
+ std::wstring resource_name = L"";\r
+ auto tokens = parameters::protocol_split(params.at_original(0));\r
+ if (tokens[0].empty())\r
+ {\r
+ resource_name = params.at_original(0);\r
+ }\r
+\r
+ if(!resource_name.empty()) {\r
try // to find a key file.\r
{\r
auto params_copy = params;\r
if(params_copy.size() > 0)\r
{\r
- params_copy[0] += L"_A";\r
+ auto resource_name = params_copy.at_original(0);\r
+ params_copy.set(0, resource_name + L"_A");\r
key_producer = do_create_producer(my_frame_factory, params_copy, g_factories); \r
if(key_producer == frame_producer::empty())\r
{\r
- params_copy[0] += L"LPHA";\r
+ params_copy.set(0, resource_name + L"_ALPHA");\r
key_producer = do_create_producer(my_frame_factory, params_copy, g_factories); \r
}\r
}\r
}\r
catch(...){}\r
+ }\r
\r
if(producer != frame_producer::empty() && key_producer != frame_producer::empty())\r
return create_separated_producer(producer, key_producer);\r
\r
if(producer == frame_producer::empty())\r
{\r
- std::wstring str;\r
- BOOST_FOREACH(auto& param, params)\r
- str += param + L" ";\r
+ std::wstring str = params.get_original_string();\r
BOOST_THROW_EXCEPTION(file_not_found() << msg_info("No match found for supplied commands. Check syntax.") << arg_value_info(narrow(str)));\r
}\r
\r
\r
safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::wstring& media_file)\r
{\r
- std::vector<std::wstring> params;\r
+ core::parameters params;\r
params.push_back(media_file);\r
\r
auto producer = do_create_producer(my_frame_factory, params, g_thumbnail_factories, true);\r
auto params_copy = params;\r
if (params_copy.size() > 0)\r
{\r
- params_copy[0] += L"_A";\r
+ auto resource_name = params_copy.at_original(0);\r
+ params_copy.set(0, resource_name + L"_A");\r
key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
if (key_producer == frame_producer::empty())\r
{\r
- params_copy[0] += L"LPHA";\r
+ params_copy.set(0, resource_name + L"_ALPHA");\r
key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);\r
}\r
}\r
return producer;\r
}\r
\r
-safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& factory, const std::wstring& params)\r
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& factory, const std::wstring& param)\r
{\r
- std::wstringstream iss(params);\r
- 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
+ parameters params;\r
+ params.push_back(param);\r
+ return create_producer(factory, params);\r
}\r
\r
}}
\ No newline at end of file
projects / casparcg / blobdiff