From 73cfef69c813be499484757628e36fd478ea30c2 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 7 Jan 2012 06:40:21 +0100 Subject: [PATCH] fix some problems with OutputSlotProtocol_test still WIP... - there is a logical contradiction with the frame numbers - somehow, in diagnostics, we access the wrong sequence instance --- src/proc/asset/meta/time-grid.cpp | 1 + tests/components/proc/play/diagnostic-output-slot.hpp | 2 +- tests/components/proc/play/output-slot-protocol-test.cpp | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/proc/asset/meta/time-grid.cpp b/src/proc/asset/meta/time-grid.cpp index 89744eee0..d72878f03 100644 --- a/src/proc/asset/meta/time-grid.cpp +++ b/src/proc/asset/meta/time-grid.cpp @@ -85,6 +85,7 @@ namespace meta { PQuant quantiser (dynamic_pointer_cast(gridImplementation)); Literal bindingID (cStr(newGrid.ident.name)); + advice::Provision(bindingID).setAdvice(gridImplementation); advice::Provision(bindingID).setAdvice(quantiser); return gridImplementation; } diff --git a/tests/components/proc/play/diagnostic-output-slot.hpp b/tests/components/proc/play/diagnostic-output-slot.hpp index 920630856..6ec40d009 100644 --- a/tests/components/proc/play/diagnostic-output-slot.hpp +++ b/tests/components/proc/play/diagnostic-output-slot.hpp @@ -117,7 +117,7 @@ namespace play { BuffHandle trackFrame (FrameID frameNr, BuffHandle const& newBuffer) { - REQUIRE (contains (frameTrackingIndex_,frameNr), + REQUIRE (!contains (frameTrackingIndex_,frameNr), "attempt to lock already used frame %lu", frameNr); frameTrackingIndex_.insert (frameNr); diff --git a/tests/components/proc/play/output-slot-protocol-test.cpp b/tests/components/proc/play/output-slot-protocol-test.cpp index 480b664c8..a1e0fef09 100644 --- a/tests/components/proc/play/output-slot-protocol-test.cpp +++ b/tests/components/proc/play/output-slot-protocol-test.cpp @@ -92,15 +92,12 @@ namespace test { int64_t frameNr = 123; BuffHandle buff00 = sink1.lockBufferFor (frameNr); BuffHandle buff10 = sink2.lockBufferFor (frameNr); - buff00.create(); - buff10.create(); // rendering process calculates content.... buff00.accessAs() = testData(0,0); // while further frames might be processed in parallel BuffHandle buff11 = sink2.lockBufferFor (++frameNr); - buff11.create(); buff11.accessAs() = testData(1,1); buff10.accessAs() = testData(1,0);