diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-03 22:26:29 +0000 |
commit | 73192bc1a7ea55fa1864dc3826845b15c00dd2ec (patch) | |
tree | c0039f3f5a848aed6e880abf11519dad855fa899 /libs/audiographer/tests/general/chunker_test.cc | |
parent | 74b4a3c77b08dc1e58274875604eb73e8492fa93 (diff) |
Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/audiographer/tests/general/chunker_test.cc')
-rw-r--r-- | libs/audiographer/tests/general/chunker_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/audiographer/tests/general/chunker_test.cc b/libs/audiographer/tests/general/chunker_test.cc index c667360601..ea5c29a410 100644 --- a/libs/audiographer/tests/general/chunker_test.cc +++ b/libs/audiographer/tests/general/chunker_test.cc @@ -33,13 +33,13 @@ class ChunkerTest : public CppUnit::TestFixture void testSynchronousProcess() { chunker->add_output (sink); - nframes_t frames_output = 0; + framecnt_t frames_output = 0; ProcessContext<float> const context (random_data, frames, 1); chunker->process (context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) 0, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); chunker->process (context); frames_output = sink->get_data().size(); @@ -51,7 +51,7 @@ class ChunkerTest : public CppUnit::TestFixture chunker->process (context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) 0, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); chunker->process (context); frames_output = sink->get_data().size(); @@ -65,7 +65,7 @@ class ChunkerTest : public CppUnit::TestFixture assert (frames % 2 == 0); chunker->add_output (sink); - nframes_t frames_output = 0; + framecnt_t frames_output = 0; ProcessContext<float> const half_context (random_data, frames / 2, 1); ProcessContext<float> const context (random_data, frames, 1); @@ -73,12 +73,12 @@ class ChunkerTest : public CppUnit::TestFixture // 0.5 chunker->process (half_context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) 0, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); // 1.5 chunker->process (context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) 0, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); // 2.5 chunker->process (context); @@ -93,7 +93,7 @@ class ChunkerTest : public CppUnit::TestFixture // 3.5 chunker->process (context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) 0, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) 0, frames_output); // 4.0 chunker->process (half_context); @@ -112,7 +112,7 @@ class ChunkerTest : public CppUnit::TestFixture chunker.reset (new Chunker<float>(frames / 4)); chunker->add_output (sink); - nframes_t frames_output = 0; + framecnt_t frames_output = 0; ProcessContext<float> const half_context (random_data, frames / 2, 1); ProcessContext<float> const context (random_data, frames, 1); @@ -120,12 +120,12 @@ class ChunkerTest : public CppUnit::TestFixture // 0.5 chunker->process (half_context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) frames / 2, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) frames / 2, frames_output); // 1.5 chunker->process (context); frames_output = sink->get_data().size(); - CPPUNIT_ASSERT_EQUAL ((nframes_t) frames / 2 * 3, frames_output); + CPPUNIT_ASSERT_EQUAL ((framecnt_t) frames / 2 * 3, frames_output); // 2.5 chunker->process (context); @@ -141,7 +141,7 @@ class ChunkerTest : public CppUnit::TestFixture boost::shared_ptr<VectorSink<float> > sink; float * random_data; - nframes_t frames; + framecnt_t frames; }; CPPUNIT_TEST_SUITE_REGISTRATION (ChunkerTest); |