diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
tree | f8e43560917a0a70c48d32ac171e828472cfd794 /libs/ardour/test/profiling/load_session.cc | |
parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'libs/ardour/test/profiling/load_session.cc')
-rw-r--r-- | libs/ardour/test/profiling/load_session.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/ardour/test/profiling/load_session.cc b/libs/ardour/test/profiling/load_session.cc index 3f56e63577..f2a2a6922e 100644 --- a/libs/ardour/test/profiling/load_session.cc +++ b/libs/ardour/test/profiling/load_session.cc @@ -3,7 +3,6 @@ #include "ardour/ardour.h" #include "ardour/audioengine.h" #include "ardour/session.h" -#include "midi++/manager.h" #include <iostream> #include <cstdlib> @@ -41,9 +40,8 @@ int main (int argc, char* argv[]) AudioEngine::instance()->remove_session (); delete s; - AudioEngine::instance()->stop (true); + AudioEngine::instance()->stop (); - MIDI::Manager::destroy (); AudioEngine::destroy (); return 0; |