X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2Famcp%2FAMCPProtocolStrategy.h;h=559b9d44f1f09042135033c1a5dbd8b8003e6fb1;hb=a660f13c38fbd89c3db2169449baa5e2268db815;hp=4454b01e621d11d12f5936abbe54a42e89c09ea3;hpb=6853b5cf1073f6d3696e5842d994ba89d88dc126;p=casparcg

diff --git a/protocol/amcp/AMCPProtocolStrategy.h b/protocol/amcp/AMCPProtocolStrategy.h
index 4454b01e6..559b9d44f 100644
--- a/protocol/amcp/AMCPProtocolStrategy.h
+++ b/protocol/amcp/AMCPProtocolStrategy.h
@@ -1,71 +1,56 @@
-/*
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>
-*
-*  This file is part of CasparCG.
-*
-*    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/>.
-*
-*/
-#pragma once
-
-#include "../util/protocolstrategy.h"
-#include <core/channel.h>
-
-#include "AMCPCommand.h"
-#include "AMCPCommandQueue.h"
-
-#include <boost/noncopyable.hpp>
-
-namespace caspar { namespace protocol { namespace amcp {
-
-class AMCPProtocolStrategy : public IO::IProtocolStrategy, boost::noncopyable
-{
-	enum MessageParserState {
-		New = 0,
-		GetSwitch,
-		GetCommand,
-		GetParameters,
-		GetChannel,
-		Done
-	};
-
-	AMCPProtocolStrategy(const AMCPProtocolStrategy&);
-	AMCPProtocolStrategy& operator=(const AMCPProtocolStrategy&);
-
-public:
-	AMCPProtocolStrategy(const std::vector<safe_ptr<core::channel>>& channels);
-	virtual ~AMCPProtocolStrategy();
-
-	virtual void Parse(const TCHAR* pData, int charCount, IO::ClientInfoPtr pClientInfo);
-	virtual UINT GetCodepage() {
-		return CP_UTF8;
-	}
-
-	AMCPCommandPtr InterpretCommandString(const std::wstring& str, MessageParserState* pOutState=0);
-
-private:
-	friend class AMCPCommand;
-
-	void ProcessMessage(const std::wstring& message, IO::ClientInfoPtr& pClientInfo);
-	std::size_t TokenizeMessage(const std::wstring& message, std::vector<std::wstring>* pTokenVector);
-	AMCPCommandPtr CommandFactory(const std::wstring& str);
-
-	bool QueueCommand(AMCPCommandPtr);
-
-	std::vector<safe_ptr<core::channel>> channels_;
-	std::vector<AMCPCommandQueuePtr> commandQueues_;
-	static const std::wstring MessageDelimiter;
-};
-
-}}}
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* 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 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
+*/
+
+#pragma once
+
+#include "../util/ProtocolStrategy.h"
+
+#include <core/video_channel.h>
+#include <core/thumbnail_generator.h>
+#include <core/producer/media_info/media_info_repository.h>
+#include <core/producer/cg_proxy.h>
+#include <core/system_info_provider.h>
+
+#include <common/memory.h>
+
+#include <boost/noncopyable.hpp>
+
+#include <string>
+#include <future>
+
+namespace caspar { namespace protocol { namespace amcp {
+
+class AMCPProtocolStrategy : public IO::IProtocolStrategy, boost::noncopyable
+{
+public:
+	AMCPProtocolStrategy(const std::wstring& name, const spl::shared_ptr<class amcp_command_repository>& repo);
+
+	virtual ~AMCPProtocolStrategy();
+
+	virtual void Parse(const std::wstring& msg, IO::ClientInfoPtr pClientInfo);
+	virtual std::string GetCodepage() const { return "UTF-8"; }
+
+private:
+	struct impl;
+	spl::unique_ptr<impl> impl_;
+};
+
+}}}