Merged CLK changes from trunk, and separated delimiter message splitting and codepage...

[casparcg] / protocol / clk / CLKProtocolStrategy.h

diff --git a/protocol/clk/CLKProtocolStrategy.h b/protocol/clk/CLKProtocolStrategy.h
index 15afc2a1dc325c4141bc5766c35541294b6d1c39..c82534cecef645b1cfd50af655e05bde92e8b601 100644 (file)
--- a/protocol/clk/CLKProtocolStrategy.h
+++ b/protocol/clk/CLKProtocolStrategy.h
@@ -1,56 +1,42 @@
-/*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
-*\r
-*  This file is part of CasparCG.\r
-*\r
-*    CasparCG is free software: you can redistribute it and/or modify\r
-*    it under the terms of the GNU General Public License as published by\r
-*    the Free Software Foundation, either version 3 of the License, or\r
-*    (at your option) any later version.\r
-*\r
-*    CasparCG is distributed in the hope that it will be useful,\r
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-*    GNU General Public License for more details.\r
-\r
-*    You should have received a copy of the GNU General Public License\r
-*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-*/\r
- \r
-#pragma once\r
-\r
-#include "CLKCommand.h"\r
-#include "../util/ProtocolStrategy.h"\r
-#include <core/channel.h>\r
-\r
-namespace caspar { namespace protocol { namespace CLK {\r
-\r
-class CLKProtocolStrategy : public IO::IProtocolStrategy\r
-{\r
-public:\r
-       CLKProtocolStrategy(const std::vector<safe_ptr<core::channel>>& channels);\r
-\r
-       void Parse(const TCHAR* pData, int charCount, IO::ClientInfoPtr pClientInfo);\r
-       UINT GetCodepage() { return 28591; }    //ISO 8859-1\r
-       \r
-private:\r
-       enum ParserState\r
-       {\r
-               ExpectingNewCommand,\r
-               ExpectingCommand,\r
-               ExpectingClockID,\r
-               ExpectingTime,\r
-               ExpectingParameter\r
-       };\r
-\r
-       ParserState     currentState_;\r
-       CLKCommand currentCommand_;\r
-       std::wstringstream currentCommandString_;\r
-\r
-       safe_ptr<core::channel> pChannel_;\r
-\r
-       bool bClockLoaded_;\r
-};\r
-\r
-}}}\r
+/*
+* 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/protocol_strategy.h"
+#include "clk_command_processor.h"
+#include <core/video_channel.h>
+
+namespace caspar { namespace protocol { namespace CLK {
+
+class clk_protocol_strategy_factory : public IO::protocol_strategy_factory<wchar_t>
+{
+       clk_command_processor command_processor_;
+public:
+       clk_protocol_strategy_factory(
+                       const std::vector<spl::shared_ptr<core::video_channel>>& channels);
+
+       virtual IO::protocol_strategy<wchar_t>::ptr create(
+               const IO::client_connection<wchar_t>::ptr& client_connection);
+};
+
+}}}