Fix a couple of build errors in the test suite.
authorColin Fletcher <colin.m.fletcher@googlemail.com>
Wed, 8 Jun 2016 15:03:14 +0000 (16:03 +0100)
committerColin Fletcher <colin.m.fletcher@googlemail.com>
Wed, 8 Jun 2016 18:56:34 +0000 (19:56 +0100)
The parameters to Session::new_audio_track() changed in e0ff70cf, and
Playlist::region_list() was renamed to region_list_property() in
fce6ac0e. Update calls to these functions in the test suite to match.

A couple of tests still fail after these changes.

libs/ardour/test/control_surfaces_test.cc
libs/ardour/test/profiling/lots_of_regions.cc

index 82b965345591076a4c389faff237ddeddb5e51d9..440339cc976d6c497cc61d6779a7cc6a6f4d857e 100644 (file)
@@ -31,7 +31,7 @@ using namespace ARDOUR;
 void
 ControlSurfacesTest::instantiateAndTeardownTest ()
 {
-       _session->new_audio_track (1, 2, Normal, 0, 1, "Test");
+       _session->new_audio_track (1, 2, NULL, 1, "Test", PresentationInfo::max_order, Normal);
 
        ControlProtocolManager& m = ControlProtocolManager::instance ();
        for (list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) {
index 44678229563d2a86743783fdf64a82295dd525ce..0e5a4c2ce6d18ddcca5b2d35b79b0b8c5b71c41c 100644 (file)
@@ -29,7 +29,7 @@ main (int argc, char* argv[])
        assert (playlist);
 
        /* And the region */
-       boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (playlist->region_list().rlist().front());
+       boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (playlist->region_list_property().rlist().front());
        assert (region);
 
        /* Duplicate it a lot */