X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=core%2Fproducer%2Fframe_producer.cpp;h=066f7fce618b4764c2b4e39fb6d034adde925be1;hb=eb37f0bb33d71f459e8691f74a85ff1f8d98e78d;hp=194080ddb9a8e8771d37fa28af5e9cf11da00efb;hpb=fbce4ecebbc910dfcec88568b18fd82d1ad95f0f;p=casparcg

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 194080ddb..066f7fce6 100644
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -288,7 +288,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
 		auto params_copy = params;
 		if(params_copy.size() > 0)
 		{
-			auto resource_name = params_copy[0];
+			auto resource_name = params_copy.at_original(0);
 			params_copy.set(0, resource_name + L"_A");
 			key_producer = do_create_producer(my_frame_factory, params_copy, g_factories);			
 			if(key_producer == frame_producer::empty())
@@ -306,7 +306,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
 	
 	if(producer == frame_producer::empty())
 	{
-		std::wstring str = params.get_original();
+		std::wstring str = params.get_original_string();
 		BOOST_THROW_EXCEPTION(file_not_found() << msg_info("No match found for supplied commands. Check syntax.") << arg_value_info(narrow(str)));
 	}
 
@@ -315,7 +315,7 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& my
 
 safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<frame_factory>& my_frame_factory, const std::wstring& media_file)
 {
-	std::vector<std::wstring> params;
+	core::parameters params;
 	params.push_back(media_file);
 
 	auto producer = do_create_producer(my_frame_factory, params, g_thumbnail_factories, true);
@@ -326,11 +326,12 @@ safe_ptr<core::frame_producer> create_thumbnail_producer(const safe_ptr<frame_fa
 		auto params_copy = params;
 		if (params_copy.size() > 0)
 		{
-			params_copy[0] += L"_A";
+			auto resource_name = params_copy.at_original(0);
+			params_copy.set(0, resource_name + L"_A");
 			key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);
 			if (key_producer == frame_producer::empty())
 			{
-				params_copy[0] += L"LPHA";
+				params_copy.set(0, resource_name + L"_ALPHA");
 				key_producer = do_create_producer(my_frame_factory, params_copy, g_thumbnail_factories, true);
 			}
 		}
@@ -350,21 +351,4 @@ safe_ptr<core::frame_producer> create_producer(const safe_ptr<frame_factory>& fa
 	return create_producer(factory, params);
 }
 
-std::vector<std::wstring> protocol_split(std::wstring const& s)
-{
-  std::vector<std::wstring> result;
-  size_t pos;
-  if ((pos = s.find_first_of(L"://")) != std::wstring::npos)
-  {
-    result.push_back(s.substr(0, pos));
-    result.push_back(s.substr(pos + 3));
-  } else
-  {
-    result.push_back(L"");
-    result.push_back(s);
-  }
-  return result;
-}
-
-
 }}
\ No newline at end of file