diff options
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/audioengine.h | 1 | ||||
-rw-r--r-- | libs/ardour/audioengine.cc | 7 | ||||
-rw-r--r-- | libs/ardour/test/playlist_layering_test.cc | 144 | ||||
-rw-r--r-- | libs/ardour/test/playlist_layering_test.h | 31 | ||||
-rw-r--r-- | libs/ardour/wscript | 1 |
5 files changed, 184 insertions, 0 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 7d9cb3f28a..ca580419b6 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -254,6 +254,7 @@ _ the regular process() call to session->process() is not made. bool port_is_mine (const std::string&) const; static AudioEngine* instance() { return _instance; } + static void destroy(); void died (); int create_process_thread (boost::function<void()>, pthread_t*, size_t stacksize); diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 74936fbc34..c6cb20bc4d 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1513,3 +1513,10 @@ AudioEngine::update_latencies () jack_recompute_total_latencies (_priv_jack); } } + +void +AudioEngine::destroy () +{ + delete _instance; + _instance = 0; +} diff --git a/libs/ardour/test/playlist_layering_test.cc b/libs/ardour/test/playlist_layering_test.cc new file mode 100644 index 0000000000..278fb0ab78 --- /dev/null +++ b/libs/ardour/test/playlist_layering_test.cc @@ -0,0 +1,144 @@ +#include "midi++/manager.h" +#include "pbd/textreceiver.h" +#include "pbd/compose.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/playlist_factory.h" +#include "ardour/source_factory.h" +#include "ardour/region.h" +#include "ardour/region_factory.h" +#include "playlist_layering_test.h" + +CPPUNIT_TEST_SUITE_REGISTRATION (PlaylistLayeringTest); + +using namespace std; +using namespace ARDOUR; +using namespace PBD; + +class TestReceiver : public Receiver +{ +protected: + void receive (Transmitter::Channel chn, const char * str) { + const char *prefix = ""; + + switch (chn) { + case Transmitter::Error: + prefix = ": [ERROR]: "; + break; + case Transmitter::Info: + /* ignore */ + return; + case Transmitter::Warning: + prefix = ": [WARNING]: "; + break; + case Transmitter::Fatal: + prefix = ": [FATAL]: "; + break; + case Transmitter::Throw: + /* this isn't supposed to happen */ + abort (); + } + + /* note: iostreams are already thread-safe: no external + lock required. + */ + + cout << prefix << str << endl; + + if (chn == Transmitter::Fatal) { + exit (9); + } + } +}; + +TestReceiver test_receiver; + +void +PlaylistLayeringTest::setUp () +{ + string const test_session_path = "libs/ardour/test/playlist_layering_test"; + string const test_wav_path = "libs/ardour/test/playlist_layering_test/playlist_layering_test.wav"; + system (string_compose ("rm -rf %1", test_session_path).c_str()); + + init (false, true); + SessionEvent::create_per_thread_pool ("test", 512); + + test_receiver.listen_to (error); + test_receiver.listen_to (info); + test_receiver.listen_to (fatal); + test_receiver.listen_to (warning); + + AudioEngine* engine = new AudioEngine ("test", ""); + MIDI::Manager::create (engine->jack ()); + CPPUNIT_ASSERT (engine->start () == 0); + + _session = new Session (*engine, test_session_path, "playlist_layering_test"); + engine->set_session (_session); + + _playlist = PlaylistFactory::create (DataType::AUDIO, *_session, "test"); + _source = SourceFactory::createWritable (DataType::AUDIO, *_session, test_wav_path, "", false, 44100); +} + +void +PlaylistLayeringTest::tearDown () +{ + AudioEngine::instance()->remove_session (); + EnumWriter::destroy (); + MIDI::Manager::destroy (); + AudioEngine::destroy (); +} + +void +PlaylistLayeringTest::create_three_short_regions () +{ + PropertyList plist; + plist.add (Properties::start, 0); + plist.add (Properties::length, 100); + for (int i = 0; i < 3; ++i) { + _region[i] = RegionFactory::create (_source, plist); + } +} + +void +PlaylistLayeringTest::addHigherTest () +{ + _session->config.set_layer_model (AddHigher); + create_three_short_regions (); + + _playlist->add_region (_region[0], 0); + _playlist->add_region (_region[1], 10); + _playlist->add_region (_region[2], 20); + + CPPUNIT_ASSERT_EQUAL (layer_t (0), _region[0]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (1), _region[1]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (2), _region[2]->layer ()); + + _region[0]->set_position (5); + + /* region move should have no effect */ + CPPUNIT_ASSERT_EQUAL (layer_t (0), _region[0]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (1), _region[1]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (2), _region[2]->layer ()); +} + +void +PlaylistLayeringTest::moveAddHigherTest () +{ + _session->config.set_layer_model (MoveAddHigher); + create_three_short_regions (); + + _playlist->add_region (_region[0], 0); + _playlist->add_region (_region[1], 10); + _playlist->add_region (_region[2], 20); + + CPPUNIT_ASSERT_EQUAL (layer_t (0), _region[0]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (1), _region[1]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (2), _region[2]->layer ()); + + _region[0]->set_position (5); + + /* region move should have put 0 on top */ + CPPUNIT_ASSERT_EQUAL (layer_t (2), _region[0]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (0), _region[1]->layer ()); + CPPUNIT_ASSERT_EQUAL (layer_t (1), _region[2]->layer ()); +} diff --git a/libs/ardour/test/playlist_layering_test.h b/libs/ardour/test/playlist_layering_test.h new file mode 100644 index 0000000000..7757e017c4 --- /dev/null +++ b/libs/ardour/test/playlist_layering_test.h @@ -0,0 +1,31 @@ +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> + +namespace ARDOUR { + class Session; + class Playlist; + class Source; +} + +class PlaylistLayeringTest : public CppUnit::TestFixture +{ + CPPUNIT_TEST_SUITE (PlaylistLayeringTest); + CPPUNIT_TEST (addHigherTest); + CPPUNIT_TEST (moveAddHigherTest); + CPPUNIT_TEST_SUITE_END (); + +public: + void setUp (); + void tearDown (); + + void addHigherTest (); + void moveAddHigherTest (); + +private: + void create_three_short_regions (); + + ARDOUR::Session* _session; + boost::shared_ptr<ARDOUR::Playlist> _playlist; + boost::shared_ptr<ARDOUR::Source> _source; + boost::shared_ptr<ARDOUR::Region> _region[16]; +}; diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 1c26a16fd0..42c72784f9 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -430,6 +430,7 @@ def build(bld): test/framewalk_to_beats_test.cc test/framepos_plus_beats_test.cc test/framepos_minus_beats_test.cc + test/playlist_layering_test.cc test/testrunner.cc '''.split() |