From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Mon, 28 Nov 2011 11:19:26 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.2~94
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=904fe8a87701b092eb81e4d4e99678f38452125f;p=casparcg

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

diff --git a/modules/flash/util/swf.cpp b/modules/flash/util/swf.cpp
index d278a5557..b8cf015f6 100644
--- a/modules/flash/util/swf.cpp
+++ b/modules/flash/util/swf.cpp
@@ -29,7 +29,7 @@ std::vector<char> decompress_one_file(const std::vector<char>& in_data, uLong bu
 	return out_data;
 }
 
-std::wstring read_swf_meta_info(const std::wstring& filename)
+std::wstring read_template_meta_info(const std::wstring& filename)
 {
 	auto file = std::fstream(filename, std::ios::in | std::ios::binary);
 
diff --git a/modules/flash/util/swf.h b/modules/flash/util/swf.h
index fb09527bc..9cbfb3996 100644
--- a/modules/flash/util/swf.h
+++ b/modules/flash/util/swf.h
@@ -4,6 +4,6 @@
 
 namespace caspar { namespace flash {
 
-std::wstring read_swf_meta_info(const std::wstring& filename);
+std::wstring read_template_meta_info(const std::wstring& filename);
 
 }}
\ No newline at end of file
diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 6477c6f82..e7f538f0a 100644
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1327,7 +1327,7 @@ bool InfoCommand::DoExecute()
 
 			std::wstringstream ss;
 			ss << L"201 INFO OK\r\n";
-			ss << flash::read_swf_meta_info(filename) << L"\r\n";
+			ss << flash::read_template_meta_info(filename) << L"\r\n";
 
 			SetReplyString(ss.str());
 			return true;