diff options
| -rw-r--r-- | src/simpl/base.cpp | 17 | ||||
| -rw-r--r-- | tests/test_base.cpp | 25 | ||||
| -rw-r--r-- | tests/test_base.h | 2 |
3 files changed, 37 insertions, 7 deletions
diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp index d56cdd3..6671b53 100644 --- a/src/simpl/base.cpp +++ b/src/simpl/base.cpp @@ -357,13 +357,18 @@ void Frame::audio(sample* new_audio, int size) { throw Exception(std::string("Memory not managed by Frame.")); } - // copy size should also be less than or equal to the current frame size - if(size > _size) { - throw Exception(std::string("Specified copy size is too large, " - "it must be less than the Frame size.")); + if((size < _size) && (_size % size == 0)) { + std::rotate(_audio, _audio + size, _audio + _size); + std::copy(new_audio, new_audio + size, _audio + (_size - size)); + } + else if(size == _size) { + std::copy(new_audio, new_audio + size, _audio); + } + else { + printf("size: %d (%d)\n", size, _size); + throw Exception(std::string("Specified copy size must be a multiple " + "of the current Frame size.")); } - - memcpy(_audio, new_audio, sizeof(sample) * size); } sample* Frame::audio() { diff --git a/tests/test_base.cpp b/tests/test_base.cpp index 1a0816f..44b353c 100644 --- a/tests/test_base.cpp +++ b/tests/test_base.cpp @@ -19,7 +19,7 @@ void TestPeak::tearDown() { // --------------------------------------------------------------------------- void TestFrame::setUp() { - frame = new Frame(); + frame = new Frame(512, true); } void TestFrame::tearDown() { @@ -66,3 +66,26 @@ void TestFrame::test_clear() { frame->clear(); CPPUNIT_ASSERT(frame->num_peaks() == 0); } + +void TestFrame::test_audio() { + sample samples[8] = {0, 1, 2, 3, 4, 5, 6, 7}; + frame->size(8); + frame->audio(&samples[0], 8); + + CPPUNIT_ASSERT(frame->size() == 8); + + for(int i = 0; i < 8; i++) { + CPPUNIT_ASSERT(frame->audio()[i] == samples[i]); + } + + sample new_samples[2] = {8, 9}; + sample rotated_samples[8] = {2, 3, 4, 5, 6, 7, 8, 9}; + + frame->audio(&new_samples[0], 2); + + CPPUNIT_ASSERT(frame->size() == 8); + + for(int i = 0; i < 8; i++) { + CPPUNIT_ASSERT(frame->audio()[i] == rotated_samples[i]); + } +} diff --git a/tests/test_base.h b/tests/test_base.h index 2ab20a4..73aceed 100644 --- a/tests/test_base.h +++ b/tests/test_base.h @@ -41,6 +41,7 @@ class TestFrame : public CPPUNIT_NS::TestCase { CPPUNIT_TEST(test_max_partials); CPPUNIT_TEST(test_add_peak); CPPUNIT_TEST(test_clear); + CPPUNIT_TEST(test_audio); CPPUNIT_TEST_SUITE_END(); public: @@ -56,6 +57,7 @@ protected: void test_max_partials(); void test_add_peak(); void test_clear(); + void test_audio(); }; } // end of namespace simpl |