diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 09:16:28 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-02 09:16:28 -0500 |
| commit | e7c47747286c16aa575456b07120e1e8e8271bd5 (patch) | |
| tree | 7b74a91fcf5685271f2b90d57a3658c4051dbe84 /libs/ardour/test/control_surfaces_test.cc | |
| parent | 393ff4015349318b404d9e799292ce194645df09 (diff) | |
| parent | b439b79813a562278e5fc9ac088e4ca1fbf9f6cb (diff) | |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'libs/ardour/test/control_surfaces_test.cc')
| -rw-r--r-- | libs/ardour/test/control_surfaces_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/test/control_surfaces_test.cc b/libs/ardour/test/control_surfaces_test.cc index f82945c3ce..63c5e33c6f 100644 --- a/libs/ardour/test/control_surfaces_test.cc +++ b/libs/ardour/test/control_surfaces_test.cc @@ -35,7 +35,7 @@ ControlSurfacesTest::instantiateAndTeardownTest () ControlProtocolManager& m = ControlProtocolManager::instance (); for (list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) { - m.instantiate (**i); - m.teardown (**i); + m.activate (**i); + m.deactivate (**i); } } |