summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConstruct2
-rw-r--r--libs/ardour/audioengine.cc14
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