diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2006-08-24 11:44:06 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2006-08-24 11:44:06 +0000 |
| commit | 3bba45c773a985a5c668f6106ebce61a776790ff (patch) | |
| tree | 3b0eb7c48ecc7ac89d6464e55a58c8bdf9364fe2 | |
| parent | 29d58af43871bb121500c5665aacec63d13a1428 (diff) | |
* [Modified] audioengine.cc
Connect to jack before we start the metering thread in case
the connect fails and an exception is thrown.
* [Modified] SConstruct
Change back the pkg-config argument for the SoundTouch library
to the name used in the upstream tarball. Sorry drobilla, perhaps
there is a way to handle both.
git-svn-id: svn://localhost/ardour2/trunk@848 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | libs/ardour/audioengine.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 85d8b56224..6de22b3587 100644 --- a/SConstruct +++ b/SConstruct @@ -552,7 +552,7 @@ if env['SYSLIBS']: # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() - libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 14593d9712..50089062d4 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -67,11 +67,11 @@ AudioEngine::AudioEngine (string client_name) m_meter_thread = 0; m_meter_exit = false; - start_metering_thread(); + if (connect_to_jack (client_name)) { + throw NoBackendAvailable (); + } - if (connect_to_jack (client_name)) { - throw NoBackendAvailable (); - } + start_metering_thread(); } @@ -81,9 +81,9 @@ AudioEngine::~AudioEngine () jack_client_close (_jack); } - if(m_meter_thread) { - g_atomic_int_inc(&m_meter_exit); - } + if(m_meter_thread) { + g_atomic_int_inc(&m_meter_exit); + } } void |