]> git.sesse.net Git - casparcg/commitdiff
2.0.2: STATUS command returns xml.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 25 Nov 2011 22:50:32 +0000 (22:50 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 25 Nov 2011 22:50:32 +0000 (22:50 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1664 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

protocol/amcp/AMCPCommandsImpl.cpp

index bf9eadf3c41eabdd60b03c350ce505ae95606a05..4793033f714edb5d8d1a2f99a490560a29e9bddd 100644 (file)
@@ -803,12 +803,16 @@ bool StatusCommand::DoExecute()
                auto status = GetChannel()->stage()->get_status(GetLayerIndex());\r
                std::wstringstream status_text;\r
                status_text\r
-                       << L"200 STATUS OK\r\n"\r
-                       << L"FOREGROUND:"               << status.foreground << L"\r\n"\r
-                       << L"BACKGROUND:"               << status.background << L"\r\n"\r
-                       << L"STATUS:"                   << (status.is_paused ? L"PAUSED" : L"PLAYING") << L"\r\n"\r
-                       << L"TOTAL FRAMES:"             << (status.total_frames == std::numeric_limits<int64_t>::max() ? 0 : status.total_frames) << L"\r\n"\r
-                       << L"CURRENT FRAME:"    << status.current_frame << L"\r\n\r\n";\r
+                       << L"201 STATUS OK\r\n"\r
+                       << L"<layer>"\r
+                       << L"\n\t<index>"                       << GetLayerIndex() << L"</index>"\r
+                       << L"\n\t<foreground>"          << status.foreground << L"</foreground>"\r
+                       << L"\n\t<background>"          << status.background << L"</background>"\r
+                       << L"\n\t<status>"                      << (status.is_paused ? L"paused" : L"playing") << L"</status>"\r
+                       << L"\n\t<total-frames>"        << (status.total_frames == std::numeric_limits<int64_t>::max() ? 0 : status.total_frames) << L"</total-frames>"\r
+                       << L"\n\t<current-frame>"       << status.current_frame << L"</current-frame>"\r
+                       << L"\n</layer>"\r
+                       << L"\r\n";\r
 \r
                SetReplyString(status_text.str());\r
                return true;\r