Remove all use of nframes_t.

git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-03 22:26:29 +00:00
parent 74b4a3c77b
commit 73192bc1a7
280 changed files with 1615 additions and 1628 deletions

View file

@ -62,7 +62,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
converter->init (frames, D_Tri, 32);
converter->add_output (sink);
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
{
ProcessContext<float> pc(random_data, frames / 2, 1);
@ -88,7 +88,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
{
boost::shared_ptr<SampleFormatConverter<float> > converter (new SampleFormatConverter<float>(1));
boost::shared_ptr<VectorSink<float> > sink (new VectorSink<float>());
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
converter->init(frames, D_Tri, 32);
converter->add_output (sink);
@ -110,7 +110,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
CPPUNIT_ASSERT_EQUAL (frames, frames_output);
CPPUNIT_ASSERT (TestUtils::array_filled(sink->get_array(), frames));
for (nframes_t i = 0; i < frames; ++i) {
for (framecnt_t i = 0; i < frames; ++i) {
// fp comparison needs a bit of tolerance, 1.01 << 1.5
CPPUNIT_ASSERT(sink->get_data()[i] < 1.01);
CPPUNIT_ASSERT(sink->get_data()[i] > -1.01);
@ -121,7 +121,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
{
boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(1));
boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>());
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
converter->init(frames, D_Tri, 32);
converter->add_output (sink);
@ -137,7 +137,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
{
boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(1));
boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>());
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
converter->init(frames, D_Tri, 24);
converter->add_output (sink);
@ -153,7 +153,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
{
boost::shared_ptr<SampleFormatConverter<int16_t> > converter (new SampleFormatConverter<int16_t>(1));
boost::shared_ptr<VectorSink<int16_t> > sink (new VectorSink<int16_t>());
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
converter->init(frames, D_Tri, 16);
converter->add_output (sink);
@ -169,7 +169,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
{
boost::shared_ptr<SampleFormatConverter<uint8_t> > converter (new SampleFormatConverter<uint8_t>(1));
boost::shared_ptr<VectorSink<uint8_t> > sink (new VectorSink<uint8_t>());
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
converter->init(frames, D_Tri, 8);
converter->add_output (sink);
@ -185,7 +185,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
{
boost::shared_ptr<SampleFormatConverter<int32_t> > converter (new SampleFormatConverter<int32_t>(3));
boost::shared_ptr<VectorSink<int32_t> > sink (new VectorSink<int32_t>());
nframes_t frames_output = 0;
framecnt_t frames_output = 0;
converter->init(frames, D_Tri, 32);
converter->add_output (sink);
@ -193,7 +193,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
ProcessContext<float> pc(random_data, 4, 1);
CPPUNIT_ASSERT_THROW (converter->process (pc), Exception);
nframes_t new_frame_count = frames - (frames % 3);
framecnt_t new_frame_count = frames - (frames % 3);
converter->process (ProcessContext<float> (pc.data(), new_frame_count, 3));
frames_output = sink->get_data().size();
CPPUNIT_ASSERT_EQUAL (new_frame_count, frames_output);
@ -203,7 +203,7 @@ class SampleFormatConverterTest : public CppUnit::TestFixture
private:
float * random_data;
nframes_t frames;
framecnt_t frames;
};
CPPUNIT_TEST_SUITE_REGISTRATION (SampleFormatConverterTest);