From f5290a99a31e13ef9b49de7e6383e6d6b8a51276 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 8 Jan 2012 03:06:32 +0100
Subject: [PATCH] OutputSlot : simulated usage protocol passes unit test

OutputSlotProtocol_test

Some parts are still missing
 - timings
 _ initialisation
---
 src/proc/play/output-slot-connection.hpp            |  2 ++
 tests/47playout.tests                               |  2 +-
 .../components/proc/play/diagnostic-output-slot.hpp |  4 ++--
 .../proc/play/output-slot-protocol-test.cpp         | 13 +------------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/proc/play/output-slot-connection.hpp b/src/proc/play/output-slot-connection.hpp
index f83b789c6..ed61ef864 100644
--- a/src/proc/play/output-slot-connection.hpp
+++ b/src/proc/play/output-slot-connection.hpp
@@ -162,6 +162,7 @@ namespace play {
       OpenedSinks
       getOpenedSinks()
         {
+                                                                                 //////////////////////////TICKET #878  not re-entrant, lifecycle isn't clear
           REQUIRE (this->isActive());
           return transform (eachElm(connections_), connectOutputSink);
         }
@@ -189,6 +190,7 @@ namespace play {
       void
       init() ///< derived classes need to invoke this to build the actual connections
         {
+                                                                                 //////////////////////////TICKET #878  really build all at once? or on demand?
           connections_.populate_by (&ConnectionStateManager::buildConnection, this);
         }
       
diff --git a/tests/47playout.tests b/tests/47playout.tests
index d59689f3b..0bdc2a9ad 100644
--- a/tests/47playout.tests
+++ b/tests/47playout.tests
@@ -2,6 +2,6 @@ TESTING "Component Test Suite: Player and Output" ./test-components --group=play
 
 
 
-PLANNED "Output Slot Protocol" OutputSlotProtocol_test <<END
+TEST "Output Slot Protocol" OutputSlotProtocol_test <<END
 return: 0
 END
diff --git a/tests/components/proc/play/diagnostic-output-slot.hpp b/tests/components/proc/play/diagnostic-output-slot.hpp
index e6e971a9d..e78062589 100644
--- a/tests/components/proc/play/diagnostic-output-slot.hpp
+++ b/tests/components/proc/play/diagnostic-output-slot.hpp
@@ -216,7 +216,7 @@ namespace play {
       TestFrame const *
       accessEmittedFrame (uint frameNr)  const
         {
-          if (frameNr <= buffProvider_.emittedCnt())
+          if (frameNr < buffProvider_.emittedCnt())
             return & accessFrame(frameNr);
           else
             return 0;                                               ////////////////////////////////TICKET #856
@@ -225,7 +225,7 @@ namespace play {
       diagn::Block const *
       accessEmittedBuffer (uint bufferNr)  const
         {
-          if (bufferNr <= buffProvider_.emittedCnt())
+          if (bufferNr < buffProvider_.emittedCnt())
             return & accessBlock(bufferNr);
           else
             return 0;
diff --git a/tests/components/proc/play/output-slot-protocol-test.cpp b/tests/components/proc/play/output-slot-protocol-test.cpp
index 028346593..7c1e04f7c 100644
--- a/tests/components/proc/play/output-slot-protocol-test.cpp
+++ b/tests/components/proc/play/output-slot-protocol-test.cpp
@@ -22,33 +22,22 @@
 
 
 #include "lib/test/run.hpp"
-//#include "lib/util.hpp"
+
 #include "proc/play/diagnostic-output-slot.hpp"
 #include "proc/engine/buffhandle.hpp"
 #include "proc/engine/testframe.hpp"
 
-//#include <boost/format.hpp>
-//#include <iostream>
-
-//using boost::format;
-//using std::string;
-//using std::cout;
 
 
 namespace proc {
 namespace play {
 namespace test {
   
-//  using lib::AllocationCluster;
-//  using mobject::session::PEffect;
   using proc::engine::BuffHandle;
   using proc::engine::test::testData;
   using proc::engine::test::TestFrame;
   
   
-  namespace { // Test fixture
-    
-  }
   
   
   /*******************************************************************