#276

#279

Removed ImmediatelyAndClear AMCP queue type since it seems to do more harm than good.

diff --git a/CHANGES.txt b/CHANGES.txt
index c3926f2628149d06b4c4ec32967a6f2a4fcf0e97..f6a7e2d7aeec17962ea89b33b95bdaa3c5030dd7 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ General
   o Added support for using a different configuration file at startup than the\r
     default casparcg.config by simply adding the name of the file to use as the\r
     first command line argument to casparcg.exe.\r
+  o Fixed various bugs.\r
 \r
 \r
 \r

diff --git a/protocol/amcp/AMCPCommand.h b/protocol/amcp/AMCPCommand.h
index eb6aba1000d2e13a45c4874507bb693f89fde4ba..6dcacb52dfa51a9dbf328d546068d0cc5fc8c65f 100644 (file)
--- a/protocol/amcp/AMCPCommand.h
+++ b/protocol/amcp/AMCPCommand.h
@@ -35,8 +35,7 @@ namespace caspar { namespace protocol { namespace amcp {
        enum AMCPCommandScheduling\r
        {\r
                Default = 0,\r
-               AddToQueue,\r
-               ImmediatelyAndClear\r
+               AddToQueue\r
        };\r
 \r
        class AMCPCommand\r

diff --git a/protocol/amcp/AMCPCommandQueue.cpp b/protocol/amcp/AMCPCommandQueue.cpp
index d47bcbac0df29778a303fee08503e26f0a32c495..c2e34581172f639ff730087f244d0a5a5a1781a8 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.cpp
+++ b/protocol/amcp/AMCPCommandQueue.cpp
@@ -39,9 +39,6 @@ void AMCPCommandQueue::AddCommand(AMCPCommandPtr pCurrentCommand)
        if(!pCurrentCommand)\r
                return;\r
 \r
-       if(pCurrentCommand->GetScheduling() == ImmediatelyAndClear)\r
-               executor_.clear();\r
-\r
        if(executor_.size() > 64)\r
        {\r
                try\r

diff --git a/protocol/amcp/AMCPCommandsImpl.h b/protocol/amcp/AMCPCommandsImpl.h
index 1a14140d5326448f3a4685b297fbb0a79c88ba8d..f376d8463f044caaf36146ddf0ad286c2fbd9c0d 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.h
+++ b/protocol/amcp/AMCPCommandsImpl.h
@@ -136,7 +136,7 @@ class StopCommand : public AMCPCommandBase<true, AddToQueue, 0>
        bool DoExecute();\r
 };\r
 \r
-class ClearCommand : public AMCPCommandBase<true, ImmediatelyAndClear, 0>\r
+class ClearCommand : public AMCPCommandBase<true, AddToQueue, 0>\r
 {\r
        std::wstring print() const { return L"ClearCommand";}\r
        bool DoExecute();\r

diff --git a/protocol/amcp/AMCPProtocolStrategy.cpp b/protocol/amcp/AMCPProtocolStrategy.cpp
index bbd4728050ce0736a82f720a4be712cbabdbb469..fd9d26e84c20cfcbe4d18b43b1d5df95138f6981 100644 (file)
--- a/protocol/amcp/AMCPProtocolStrategy.cpp
+++ b/protocol/amcp/AMCPProtocolStrategy.cpp
@@ -218,8 +218,6 @@ AMCPCommandPtr AMCPProtocolStrategy::InterpretCommandString(const std::wstring&
 \r
                                        if(commandSwitch == TEXT("/APP"))\r
                                                pCommand->SetScheduling(AddToQueue);\r
-                                       else if(commandSwitch  == TEXT("/IMMF"))\r
-                                               pCommand->SetScheduling(ImmediatelyAndClear);\r
                                }\r
 \r
                                if(pCommand->NeedChannel())\r