2.1.0: -cii: Merged changes from trunk.

[casparcg] / protocol / cii / CIICommandsImpl.h

diff --git a/protocol/cii/CIICommandsImpl.h b/protocol/cii/CIICommandsImpl.h
index 734d3bd89b6f4cc74e83aa7384f63b0cc4aa876f..f1fd1e83a3127056ddae1352c71ece36c83d070e 100644 (file)
--- a/protocol/cii/CIICommandsImpl.h
+++ b/protocol/cii/CIICommandsImpl.h
@@ -1,22 +1,24 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
 *\r
-*  This file is part of CasparCG.\r
+* This file is part of CasparCG (www.casparcg.com).\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
+* 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
+* 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
+* Author: Nicklas P Andersson\r
 */\r
+\r
  \r
 #pragma once\r
 \r
@@ -112,7 +114,7 @@ private:
 class KeydataCommand : public ICIICommand\r
 {\r
 public:\r
-       KeydataCommand(CIIProtocolStrategy* pPS) : pCIIStrategy_(pPS), state_(-1), layer_(0)\r
+       KeydataCommand(CIIProtocolStrategy* pPS) : pCIIStrategy_(pPS), state_(-1), layer_(0), casparLayer_(0)\r
        {}\r
 \r
        virtual int GetMinimumParameters() {\r
@@ -126,6 +128,7 @@ private:
        std::wstring titleName_;\r
        int state_;\r
        int layer_;\r
+       int casparLayer_;\r
 \r
        CIIProtocolStrategy* pCIIStrategy_;\r
 };\r