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

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index c580fa4df6a12148cab4aaf70330dfdfcb04f2a6..689d6f3f7824694fc5981c269e5fbb0b9130b747 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -103,7 +103,7 @@ std::wstring ListMedia()
                        {               \r
                                auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
 \r
-                               auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size(), itr->path().file_string().size()));\r
+                               auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size()-1, itr->path().file_string().size()));\r
 \r
                                auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(itr->path())));\r
                                writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end());\r
@@ -112,19 +112,16 @@ std::wstring ListMedia()
                                auto sizeStr = boost::lexical_cast<std::wstring>(boost::filesystem::file_size(itr->path()));\r
                                sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end());\r
                                auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end());\r
-\r
-                               std::wstring dir = relativePath.parent_path().external_directory_string();\r
-                               std::wstring file = boost::to_upper_copy(relativePath.filename());\r
-                               relativePath = boost::filesystem::wpath(dir + L"/" + file);\r
-                                               \r
+                               \r
                                auto str = relativePath.replace_extension(TEXT("")).external_file_string();\r
                                if(str[0] == '\\' || str[0] == '/')\r
                                        str = std::wstring(str.begin() + 1, str.end());\r
 \r
                                replyString << TEXT("\"") << str\r
-                                                       << TEXT("\" ") << sizeWStr\r
+                                                       << TEXT("\" ") << clipttype \r
+                                                       << TEXT(" ") << sizeStr\r
                                                        << TEXT(" ") << writeTimeWStr\r
-                                                       << TEXT("\r\n");                \r
+                                                       << TEXT("\r\n");        \r
                        }       \r
                }\r
        }\r