This reverts commit f374ce69a6. The code does not compile on OS X, and includes changes to ARDOUR::AudioEngine that have not landed in git.
f374ce69a6