X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2Famcp%2FAMCPCommandsImpl.h;h=d4997fdef03f3681838d457284d732ce5a141fa0;hb=a8574ad240b20f538e6bde57dff4dbffe26e2a5a;hp=ca0cd0b3c42799fc02e3165a64044d0a8f7ea920;hpb=623472e30864f882aa703c04ca916148d33a77cd;p=casparcg

diff --git a/protocol/amcp/AMCPCommandsImpl.h b/protocol/amcp/AMCPCommandsImpl.h
index ca0cd0b3c..d4997fdef 100644
--- a/protocol/amcp/AMCPCommandsImpl.h
+++ b/protocol/amcp/AMCPCommandsImpl.h
@@ -1,22 +1,24 @@
 /*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
 *
-*  This file is part of CasparCG.
+* This file is part of CasparCG (www.casparcg.com).
 *
-*    CasparCG is free software: you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation, either version 3 of the License, or
-*    (at your option) any later version.
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
 *
-*    CasparCG is distributed in the hope that it will be useful,
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*    GNU General Public License for more details.
-
-*    You should have received a copy of the GNU General Public License
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
 *
+* Author: Nicklas P Andersson
 */
+
  
 #ifndef __AMCPCOMMANDSIMPL_H__
 #define __AMCPCOMMANDSIMPL_H__
@@ -30,13 +32,19 @@ std::wstring ListTemplates();
 
 namespace amcp {
 	
+class ChannelGridCommand : public AMCPCommandBase<false, AddToQueue, 0>
+{
+	std::wstring print() const { return L"ChannelGridCommand";}
+	bool DoExecute();
+};
+
 class DiagnosticsCommand : public AMCPCommandBase<false, AddToQueue, 0>
 {
 	std::wstring print() const { return L"DiagnosticsCommand";}
 	bool DoExecute();
 };
 
-class CallCommand : public AMCPCommandBase<true, AddToQueue, 2>
+class CallCommand : public AMCPCommandBase<true, AddToQueue, 1>
 {
 	std::wstring print() const { return L"CallCommand";}
 	bool DoExecute();
@@ -96,7 +104,7 @@ class StopCommand : public AMCPCommandBase<true, AddToQueue, 0>
 	bool DoExecute();
 };
 
-class ClearCommand : public AMCPCommandBase<true, AddToQueue, 0>
+class ClearCommand : public AMCPCommandBase<true, ImmediatelyAndClear, 0>
 {
 	std::wstring print() const { return L"ClearCommand";}
 	bool DoExecute();
@@ -162,10 +170,10 @@ class InfoCommand : public AMCPCommandBase<false, AddToQueue, 0>
 {
 public:
 	std::wstring print() const { return L"InfoCommand";}
-	InfoCommand(const std::vector<safe_ptr<core::video_channel>>& channels) : channels_(channels){}
+	InfoCommand(const std::vector<spl::shared_ptr<core::video_channel>>& channels) : channels_(channels){}
 	bool DoExecute();
 private:
-	const std::vector<safe_ptr<core::video_channel>>& channels_;
+	const std::vector<spl::shared_ptr<core::video_channel>>& channels_;
 };
 
 class VersionCommand : public AMCPCommandBase<false, AddToQueue, 0>