2.0. Updated namespaces.

[casparcg] / protocol / cii / CIICommandsImpl.cpp

diff --git a/protocol/cii/CIICommandsImpl.cpp b/protocol/cii/CIICommandsImpl.cpp
index e70d66116a595c2ccfbd30d4f3728a42d3ad5fef..7e1957fbaa9546782562e55ce8e549bc670b195a 100644 (file)
--- a/protocol/cii/CIICommandsImpl.cpp
+++ b/protocol/cii/CIICommandsImpl.cpp
@@ -98,6 +98,7 @@ void MiscellaneousCommand::Setup(const std::vector<std::wstring>& parameters)
        {\r
                filename_ = parameters[5];\r
                filename_ = filename_.substr(0, filename_.find_last_of(TEXT('.')));\r
+               filename_.append(L".ft");\r
                state_ = 0;\r
                return;\r
        }\r
@@ -140,7 +141,7 @@ void MiscellaneousCommand::Execute()
 \r
        //TODO: Need to be checked for validity\r
        else if(state_ == 1)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->add(layer_, filename_, false, TEXT(""), xmlData_);\r
+               flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->add(layer_, filename_, false, TEXT(""), xmlData_);\r
 }\r
 \r
 \r
@@ -154,11 +155,11 @@ void KeydataCommand::Execute()
 \r
        //TODO: Need to be checked for validity\r
        else if(state_ == 1)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->stop(layer_, 0);\r
+               flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->stop(layer_, 0);\r
        else if(state_ == 2)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->clear();\r
+               pCIIStrategy_->GetChannel()->stage()->clear(flash::cg_producer::DEFAULT_LAYER);\r
        else if(state_ == 3)\r
-               get_default_cg_producer(pCIIStrategy_->GetChannel())->play(layer_);\r
+               flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->play(layer_);\r
 }\r
 \r
 void KeydataCommand::Setup(const std::vector<std::wstring>& parameters) {\r
@@ -183,10 +184,12 @@ void KeydataCommand::Setup(const std::vector<std::wstring>& parameters) {
 \r
        if(parameters[1].at(0) == 27)   //NEPTUNE:      Y\<27>\X                        Stop layer X.\r
                state_ = 1;\r
-       else if(static_cast<unsigned char>(parameters[1].at(0)) == 254) //NEPTUNE:      Y\<254>                 Clear Canvas. \r
+       else if(static_cast<unsigned char>(parameters[1].at(1)) == 190) //NEPTUNE:      Y\<254>                 Clear Canvas. \r
                state_ = 2;\r
-       else if(static_cast<unsigned char>(parameters[1].at(0)) == 213) //NEPTUNE:      Y\<213><243>\X  Play layer X. \r
-               state_ = 3;\r
+       else if(static_cast<unsigned char>(parameters[1].at(1)) == 149) //NEPTUNE:      Y\<213><243>\X  Play layer X. \r
+               state_ = 3;                                                                                                     //UPDATE 2011-05-09: These char-codes are aparently not valid after converting to wide-chars\r
+                                                                                                                                       //the correct sequence is <195><149><195><179> \r
+               \r
 }\r
 \r
 }}}
\ No newline at end of file