From 22b07e0233a29d9633ffa825a79503befaf2e16e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 5 Oct 2015 16:17:49 +0200 Subject: NOOP, remove trailing tabs/whitespace. --- libs/ardour/test/audio_region_read_test.cc | 6 +++--- libs/ardour/test/audio_region_test.cc | 6 +++--- libs/ardour/test/automation_list_property_test.cc | 2 +- libs/ardour/test/bbt_test.cc | 2 +- libs/ardour/test/combine_regions_test.cc | 14 +++++++------- libs/ardour/test/control_surfaces_test.cc | 2 +- libs/ardour/test/framepos_minus_beats_test.cc | 14 +++++++------- libs/ardour/test/framepos_plus_beats_test.cc | 14 +++++++------- libs/ardour/test/framewalk_to_beats_test.cc | 14 +++++++------- libs/ardour/test/jack_utils_test.cc | 2 +- libs/ardour/test/load_session.cc | 2 +- libs/ardour/test/midi_clock_slave_test.h | 2 +- libs/ardour/test/mtdm_test.cc | 2 +- libs/ardour/test/playlist_equivalent_regions_test.cc | 2 +- libs/ardour/test/playlist_read_test.cc | 16 ++++++++-------- libs/ardour/test/playlist_read_test.h | 4 ++-- libs/ardour/test/profiling/load_session.cc | 2 +- libs/ardour/test/tempo_test.cc | 6 +++--- libs/ardour/test/test_util.cc | 2 +- libs/ardour/test/testrunner.cc | 10 +++++----- 20 files changed, 62 insertions(+), 62 deletions(-) (limited to 'libs/ardour/test') diff --git a/libs/ardour/test/audio_region_read_test.cc b/libs/ardour/test/audio_region_read_test.cc index 6a8e3600f1..c7ae50afd5 100644 --- a/libs/ardour/test/audio_region_read_test.cc +++ b/libs/ardour/test/audio_region_read_test.cc @@ -31,7 +31,7 @@ void AudioRegionReadTest::readTest () { int const N = 1024; - + Sample buf[N]; Sample mbuf[N]; float gbuf[N]; @@ -70,7 +70,7 @@ AudioRegionReadTest::readTest () for (int i = 64; i < P; ++i) { CPPUNIT_ASSERT_EQUAL (i, int (buf[i])); } - + /* Offset read: 256 frames from 128 frames into the region, with fades (though the fade should not affect it, as it is finished before the read starts) */ @@ -78,7 +78,7 @@ AudioRegionReadTest::readTest () for (int i = 0; i < N; ++i) { buf[i] = 0; } - + _ar[0]->read_at (buf, mbuf, gbuf, P + 128, 256, 0); check_staircase (buf, 128, 256); } diff --git a/libs/ardour/test/audio_region_test.cc b/libs/ardour/test/audio_region_test.cc index deb0d2e46a..aae25e2f5d 100644 --- a/libs/ardour/test/audio_region_test.cc +++ b/libs/ardour/test/audio_region_test.cc @@ -49,14 +49,14 @@ AudioRegionTest::setUp () assert (s); int const signal_length = 4096; - + Sample staircase[signal_length]; for (int i = 0; i < signal_length; ++i) { staircase[i] = i; } s->write (staircase, signal_length); - + PropertyList plist; plist.add (Properties::start, 0); plist.add (Properties::length, 100); @@ -81,4 +81,4 @@ AudioRegionTest::tearDown () TestNeedingSession::tearDown (); } - + diff --git a/libs/ardour/test/automation_list_property_test.cc b/libs/ardour/test/automation_list_property_test.cc index 7206ee8220..e17ad4f151 100644 --- a/libs/ardour/test/automation_list_property_test.cc +++ b/libs/ardour/test/automation_list_property_test.cc @@ -58,7 +58,7 @@ AutomationListPropertyTest::basicTest () /* No change since we just cleared them */ CPPUNIT_ASSERT_EQUAL (false, property.changed()); - + property->add (1, 2, false, false); property->add (3, 4, false, false); diff --git a/libs/ardour/test/bbt_test.cc b/libs/ardour/test/bbt_test.cc index 86dd389409..416d02ba14 100644 --- a/libs/ardour/test/bbt_test.cc +++ b/libs/ardour/test/bbt_test.cc @@ -17,7 +17,7 @@ BBTTest::addTest () Meter meter(4.0, 4.0); map.add_meter (meter, BBT_Time(1, 1, 0)); - + /* add some good stuff here */ } diff --git a/libs/ardour/test/combine_regions_test.cc b/libs/ardour/test/combine_regions_test.cc index 0202fe8873..5eee1d47d0 100644 --- a/libs/ardour/test/combine_regions_test.cc +++ b/libs/ardour/test/combine_regions_test.cc @@ -55,12 +55,12 @@ CombineRegionsTest::check_crossfade1 () _ar[1]->fade_in()->curve().get_vector (0, 128, fade_in, 128); _ar[1]->inverse_fade_in()->curve().get_vector (0, 128, fade_out, 128); - + /* Crossfading _r[0] to _r[1] using _r[1]'s fade in and inverse fade in. _r[0] also has a standard region fade out to add to the fun. */ for (int i = 128; i < 256; ++i) { - + float region_fade_out = 1; if (i >= 192) { /* Ardour fades out from 1 to VERY_SMALL_SIGNAL, which is 0.0000001, @@ -74,7 +74,7 @@ CombineRegionsTest::check_crossfade1 () */ float r0 = i * region_fade_out; r0 *= fade_out[i - 128]; - + float const r1 = (i - 128) * fade_in[i - 128]; CPPUNIT_ASSERT_DOUBLES_EQUAL (r0 + r1, buf[i], 1e-16); } @@ -102,7 +102,7 @@ CombineRegionsTest::crossfadeTest1 () _ar[0]->set_default_fade_in (); _ar[0]->set_default_fade_out (); _ar[1]->set_default_fade_out (); - + _playlist->add_region (_r[0], 0); _r[0]->set_length (256); @@ -165,7 +165,7 @@ CombineRegionsTest::check_crossfade2 () _ar[0]->inverse_fade_out()->curve().get_vector (0, 128, fade_in, 128); _ar[0]->fade_out()->curve().get_vector (0, 128, fade_out, 128); - + /* Crossfading _r[0] to _r[1] using _r[0]'s fade out and inverse fade out. _r[1] also has a standard region fade in to add to the fun. */ @@ -179,7 +179,7 @@ CombineRegionsTest::check_crossfade2 () float r0 = i * fade_out[i - 128]; float r1 = (i - 128) * region_fade_in; r1 *= fade_in[i - 128]; - + CPPUNIT_ASSERT_DOUBLES_EQUAL (r0 + r1, buf[i], 1e-16); } @@ -206,7 +206,7 @@ CombineRegionsTest::crossfadeTest2 () _ar[0]->set_default_fade_in (); _ar[0]->set_default_fade_out (); _ar[1]->set_default_fade_out (); - + _playlist->add_region (_r[0], 0); _r[0]->set_length (256); diff --git a/libs/ardour/test/control_surfaces_test.cc b/libs/ardour/test/control_surfaces_test.cc index 63c5e33c6f..82b9653455 100644 --- a/libs/ardour/test/control_surfaces_test.cc +++ b/libs/ardour/test/control_surfaces_test.cc @@ -32,7 +32,7 @@ void ControlSurfacesTest::instantiateAndTeardownTest () { _session->new_audio_track (1, 2, Normal, 0, 1, "Test"); - + ControlProtocolManager& m = ControlProtocolManager::instance (); for (list::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) { m.activate (**i); diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc index a96fec6531..12f020e2d7 100644 --- a/libs/ardour/test/framepos_minus_beats_test.cc +++ b/libs/ardour/test/framepos_minus_beats_test.cc @@ -17,7 +17,7 @@ FrameposMinusBeatsTest::singleTempoTest () int const bpm = 120; double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate); - + TempoMap map (sampling_rate); Tempo tempo (bpm); Meter meter (4, 4); @@ -46,14 +46,14 @@ FrameposMinusBeatsTest::doubleTempoTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames @@ -98,14 +98,14 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index 7069c54115..69fd9a597d 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -16,7 +16,7 @@ FrameposPlusBeatsTest::singleTempoTest () int const bpm = 120; double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate); - + TempoMap map (sampling_rate); Tempo tempo (bpm); Meter meter (4, 4); @@ -45,14 +45,14 @@ FrameposPlusBeatsTest::doubleTempoTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames @@ -97,14 +97,14 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc index 501eca894e..8b7748cfa4 100644 --- a/libs/ardour/test/framewalk_to_beats_test.cc +++ b/libs/ardour/test/framewalk_to_beats_test.cc @@ -15,7 +15,7 @@ FramewalkToBeatsTest::singleTempoTest () int const bpm = 120; double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate); - + TempoMap map (sampling_rate); Tempo tempo (bpm); Meter meter (4, 4); @@ -51,14 +51,14 @@ FramewalkToBeatsTest::doubleTempoTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames @@ -107,15 +107,15 @@ FramewalkToBeatsTest::tripleTempoTest () /* 120bpm at bar 1, 240bpm at bar 2, 160bpm at bar 3 - + 120bpm = 24e3 samples per beat 160bpm = 18e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 160bpm 0 beats 4 beats 8 beats 0 frames 96e3 frames 144e3 frames diff --git a/libs/ardour/test/jack_utils_test.cc b/libs/ardour/test/jack_utils_test.cc index 7645df6ff3..d8a21ceb49 100644 --- a/libs/ardour/test/jack_utils_test.cc +++ b/libs/ardour/test/jack_utils_test.cc @@ -273,7 +273,7 @@ JackUtilsTest::test_config () std::string command_line; CPPUNIT_ASSERT (get_default_jack_command_line (command_line)); - + CPPUNIT_ASSERT (write_jack_config_file (config_path, command_line)); } diff --git a/libs/ardour/test/load_session.cc b/libs/ardour/test/load_session.cc index f2a2a6922e..41dc48ef2f 100644 --- a/libs/ardour/test/load_session.cc +++ b/libs/ardour/test/load_session.cc @@ -21,7 +21,7 @@ int main (int argc, char* argv[]) ARDOUR::init (false, true, localedir); Session* s = 0; - + try { s = load_session (argv[1], argv[2]); } catch (failed_constructor& e) { diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index dd046fb8a8..0899eed6ce 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -83,7 +83,7 @@ class MIDIClock_SlaveTest : public CppUnit::TestFixture, ARDOUR::MIDIClock_Slave public: MIDIClock_SlaveTest () : MIDIClock_Slave (new TestSlaveSessionProxy) {} - + void setUp() { } diff --git a/libs/ardour/test/mtdm_test.cc b/libs/ardour/test/mtdm_test.cc index 43a6538242..f3265b2ccd 100644 --- a/libs/ardour/test/mtdm_test.cc +++ b/libs/ardour/test/mtdm_test.cc @@ -22,7 +22,7 @@ MTDMTest::basicTest () mtdm->process (256, in, out); memcpy (in, out, 256 * sizeof (float)); } - + for (int i = 0; i < 64; ++i) { mtdm->process (256, in, out); memcpy (in, out, 256 * sizeof (float)); diff --git a/libs/ardour/test/playlist_equivalent_regions_test.cc b/libs/ardour/test/playlist_equivalent_regions_test.cc index 12853d39dd..eb34eaf5bc 100644 --- a/libs/ardour/test/playlist_equivalent_regions_test.cc +++ b/libs/ardour/test/playlist_equivalent_regions_test.cc @@ -30,7 +30,7 @@ void PlaylistEquivalentRegionsTest::setUp () { AudioRegionTest::setUp (); - + _playlist_b = PlaylistFactory::create (DataType::AUDIO, *_session, "testB"); } diff --git a/libs/ardour/test/playlist_read_test.cc b/libs/ardour/test/playlist_read_test.cc index 78b2e4eadd..e87179fac6 100644 --- a/libs/ardour/test/playlist_read_test.cc +++ b/libs/ardour/test/playlist_read_test.cc @@ -67,14 +67,14 @@ PlaylistReadTest::singleReadTest () CPPUNIT_ASSERT_EQUAL (double (64), _ar[0]->_fade_out->back()->when); _ar[0]->set_length (1024); _audio_playlist->read (_buf, _mbuf, _gbuf, 0, 256, 0); - + for (int i = 0; i < 64; ++i) { /* Note: this specific float casting is necessary so that the rounding is done here the same as it is done in AudioPlaylist. */ CPPUNIT_ASSERT_DOUBLES_EQUAL (float (i * float (i / 63.0)), _buf[i], 1e-16); } - + for (int i = 64; i < 256; ++i) { CPPUNIT_ASSERT_EQUAL (i, int (_buf[i])); } @@ -101,7 +101,7 @@ PlaylistReadTest::overlappingReadTest () CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_in_is_xfade()); CPPUNIT_ASSERT_EQUAL (false, _ar[0]->fade_out_is_xfade()); #endif - + _audio_playlist->add_region (_ar[1], 128); _ar[1]->set_default_fade_in (); _ar[1]->set_default_fade_out (); @@ -111,10 +111,10 @@ PlaylistReadTest::overlappingReadTest () CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_in_is_xfade()); CPPUNIT_ASSERT_EQUAL (false, _ar[1]->fade_out_is_xfade()); #endif - + CPPUNIT_ASSERT_EQUAL (double (64), _ar[1]->_fade_in->back()->when); CPPUNIT_ASSERT_EQUAL (double (64), _ar[1]->_fade_out->back()->when); - + _ar[1]->set_length (1024); _audio_playlist->read (_buf, _mbuf, _gbuf, 0, 256, 0); @@ -151,7 +151,7 @@ PlaylistReadTest::transparentReadTest () CPPUNIT_ASSERT_EQUAL (double (64), _ar[0]->_fade_in->back()->when); CPPUNIT_ASSERT_EQUAL (double (64), _ar[0]->_fade_out->back()->when); _ar[0]->set_length (1024); - + _audio_playlist->add_region (_ar[1], 0); _ar[1]->set_default_fade_in (); _ar[1]->set_default_fade_out (); @@ -237,7 +237,7 @@ PlaylistReadTest::enclosedTransparentReadTest () _ar[0]->set_fade_in_length (0); _ar[0]->set_fade_out_length (0); _ar[0]->set_length (256); - + _audio_playlist->add_region (_ar[1], 0); /* These calls will result in a 64-sample fade */ _ar[1]->set_fade_in_length (0); @@ -266,7 +266,7 @@ PlaylistReadTest::enclosedTransparentReadTest () for (int i = (256 + 64); i < (256 + 64 + 128); ++i) { CPPUNIT_ASSERT_DOUBLES_EQUAL (i + i - (256 + 64) + 64, _buf[i], 1e-16); } - + /* Then _ar[1] + _ar[0] (faded out) for 64 samples */ for (int i = (256 + 64 + 128); i < 512; ++i) { float const ar0_without_fade = i - 256; diff --git a/libs/ardour/test/playlist_read_test.h b/libs/ardour/test/playlist_read_test.h index 97a1eb9eab..5161863409 100644 --- a/libs/ardour/test/playlist_read_test.h +++ b/libs/ardour/test/playlist_read_test.h @@ -32,7 +32,7 @@ class PlaylistReadTest : public AudioRegionTest public: void setUp (); void tearDown (); - + void singleReadTest (); void overlappingReadTest (); void transparentReadTest (); @@ -44,6 +44,6 @@ private: ARDOUR::Sample* _buf; ARDOUR::Sample* _mbuf; float* _gbuf; - + void check_staircase (ARDOUR::Sample *, int, int); }; diff --git a/libs/ardour/test/profiling/load_session.cc b/libs/ardour/test/profiling/load_session.cc index f2a2a6922e..41dc48ef2f 100644 --- a/libs/ardour/test/profiling/load_session.cc +++ b/libs/ardour/test/profiling/load_session.cc @@ -21,7 +21,7 @@ int main (int argc, char* argv[]) ARDOUR::init (false, true, localedir); Session* s = 0; - + try { s = load_session (argv[1], argv[2]); } catch (failed_constructor& e) { diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index 2cac1fa872..4905259351 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -18,14 +18,14 @@ TempoTest::recomputeMapTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ - + /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames diff --git a/libs/ardour/test/test_util.cc b/libs/ardour/test/test_util.cc index 7be501d100..5220203465 100644 --- a/libs/ardour/test/test_util.cc +++ b/libs/ardour/test/test_util.cc @@ -68,7 +68,7 @@ check_nodes (XMLNode const * p, XMLNode const * q, list const & ignore_p CPPUNIT_ASSERT_EQUAL (qc.size(), pc.size()); XMLNodeList::const_iterator k = pc.begin (); XMLNodeList::const_iterator l = qc.begin (); - + while (k != pc.end ()) { check_nodes (*k, *l, ignore_properties); ++k; diff --git a/libs/ardour/test/testrunner.cc b/libs/ardour/test/testrunner.cc index 2d9a8fc39e..ddb320e02b 100644 --- a/libs/ardour/test/testrunner.cc +++ b/libs/ardour/test/testrunner.cc @@ -54,23 +54,23 @@ main(int argc, char* argv[]) TestUI* test_ui = new TestUI(); CppUnit::TestResult testresult; - + CppUnit::TestResultCollector collectedresults; testresult.addListener (&collectedresults); - + CppUnit::BriefTestProgressListener progress; testresult.addListener (&progress); - + CppUnit::TestRunner testrunner; testrunner.addTest (CppUnit::TestFactoryRegistry::getRegistry ().makeTest ()); testrunner.run (testresult); - + CppUnit::CompilerOutputter compileroutputter (&collectedresults, std::cerr); compileroutputter.write (); delete test_ui; ARDOUR::cleanup (); - + return collectedresults.wasSuccessful () ? 0 : 1; } -- cgit v1.2.3