git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/flash/util/swf.cpp b/modules/flash/util/swf.cpp
index d278a55573be029cab34da0b8adf37324f95983b..b8cf015f6577858f2665ae339ab94118d19fab59 100644 (file)
--- 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;\r
 }\r
 \r
-std::wstring read_swf_meta_info(const std::wstring& filename)\r
+std::wstring read_template_meta_info(const std::wstring& filename)\r
 {\r
        auto file = std::fstream(filename, std::ios::in | std::ios::binary);\r
 \r

diff --git a/modules/flash/util/swf.h b/modules/flash/util/swf.h
index fb09527bcf4e9b338b801610a6b558e406b921ac..9cbfb399613bc27918fb4a497bc1c54062bac095 100644 (file)
--- a/modules/flash/util/swf.h
+++ b/modules/flash/util/swf.h
@@ -4,6 +4,6 @@
 \r
 namespace caspar { namespace flash {\r
 \r
-std::wstring read_swf_meta_info(const std::wstring& filename);\r
+std::wstring read_template_meta_info(const std::wstring& filename);\r
 \r
 }}
\ No newline at end of file

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 6477c6f8215f2c1cd24ec797cc2c21e6df2333fc..e7f538f0a038b57d853a4362679013e2215443cb 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1327,7 +1327,7 @@ bool InfoCommand::DoExecute()
 \r
                        std::wstringstream ss;\r
                        ss << L"201 INFO OK\r\n";\r
-                       ss << flash::read_swf_meta_info(filename) << L"\r\n";\r
+                       ss << flash::read_template_meta_info(filename) << L"\r\n";\r
 \r
                        SetReplyString(ss.str());\r
                        return true;\r