2.1.0: Fixed CLS and CINF whitespace.

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

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 95ce208f4a13f1b27fa45caadb7d9b6f906852d4..1d30dfaf22bcc577cc9c6935fc25601dc707597b 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -101,19 +101,19 @@ std::wstring MediaInfo(const boost::filesystem::path& path)
 {\r
        if(boost::filesystem::is_regular_file(path))\r
        {\r
-               std::wstring clipttype = TEXT(" N/A ");\r
+               std::wstring clipttype = TEXT("N/A");\r
                std::wstring extension = boost::to_upper_copy(path.extension().wstring());\r
                if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" ||\r
                        extension == L"GIF" || extension == L"BMP")\r
-                       clipttype = TEXT(" STILL ");\r
+                       clipttype = TEXT("STILL");\r
                else if(extension == TEXT(".WAV") || extension == TEXT(".MP3"))\r
-                       clipttype = TEXT(" STILL ");\r
+                       clipttype = TEXT("STILL");\r
                else if(extension == L".MOV" || extension == L".DV"  || extension == L".CT" || extension == L".AVI" || extension == L".FLV" || extension == L".F4V" ||\r
                            extension == L".MP4" || extension == L".WAV" || extension == L".MP4" || extension == L".MPG" || extension == L".H264" ||\r
                                caspar::ffmpeg::is_valid_file(path.wstring()))\r
-                       clipttype = TEXT(" MOVIE ");\r
+                       clipttype = TEXT("MOVIE");\r
 \r
-               if(clipttype != TEXT(" N/A "))\r
+               if(clipttype != TEXT("N/A"))\r
                {               \r
                        auto is_not_digit = [](char c){ return std::isdigit(c) == 0; };\r
 \r
@@ -1312,7 +1312,7 @@ bool CinfCommand::DoExecute()
        try\r
        {\r
                std::wstring info;\r
-               for (boost::filesystem::recursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr)\r
+               for (boost::filesystem::recursive_directory_iterator itr(env::media_folder()), end; itr != end && info.empty(); ++itr)\r
                {\r
                        auto path = itr->path();\r
                        auto file = path.replace_extension(L"").filename();\r