Clarify behaviour of ::read (overwrites its buffer) wrt ::read_at (mixes into its buffer).

Refactor things slightly, removing need for ReadOps.  Fix crash on teardown of test.
Fixes Rhythm Ferret.


git-svn-id: svn://localhost/ardour2/branches/3.0@12127 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 11 deletions

diff --git a/libs/ardour/test/audio_region_test.cc b/libs/ardour/test/audio_region_test.cc
index 72e886b4e1..cd1986b19b 100644
--- a/libs/ardour/test/audio_region_test.cc
+++ b/libs/ardour/test/audio_region_test.cc
@@ -23,19 +23,10 @@ AudioRegionTest::readTest ()
 
 	/* Simple read: 256 frames from start of region, no fades */
 
-	/* gbuf should be ignored; set it to 0 to ensure that it is */
-	for (int i = 0; i < N; ++i) {
-		gbuf[i] = 0;
-	}
-
 	ar->set_position (P);
 	ar->set_length (1024);
 
-	for (int i = 0; i < N; ++i) {
-		buf[i] = 0;
-	}
-	
-	ar->_read_at (ar->_sources, ar->_length, buf, mbuf, gbuf, P, 256, 0, AudioRegion::ReadOps (0));
+	ar->read_from_sources (ar->_sources, ar->_length, buf, P, 256, 0);
 	check_staircase (buf, 0, 256);
 
 	for (int i = 0; i < N; ++i) {
@@ -43,7 +34,7 @@ AudioRegionTest::readTest ()
 	}
 
 	/* Offset read: 256 frames from 128 frames into the region, no fades */
-	ar->_read_at (ar->_sources, ar->_length, buf, mbuf, gbuf, P + 128, 256, 0, AudioRegion::ReadOps (0));
+	ar->read_from_sources (ar->_sources, ar->_length, buf, P + 128, 256, 0);
 	check_staircase (buf, 128, 256);
 
 	/* Simple read with a fade-in: 256 frames from start of region, with fades */