* [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
This commit is contained in:
parent
29d58af438
commit
3bba45c773
@ -552,7 +552,7 @@ if env['SYSLIBS']:
|
|||||||
|
|
||||||
# libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
|
# libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
|
||||||
libraries['soundtouch'] = LibraryInfo()
|
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',
|
libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
|
||||||
LIBPATH='#libs/appleutility',
|
LIBPATH='#libs/appleutility',
|
||||||
|
@ -67,11 +67,11 @@ AudioEngine::AudioEngine (string client_name)
|
|||||||
m_meter_thread = 0;
|
m_meter_thread = 0;
|
||||||
m_meter_exit = false;
|
m_meter_exit = false;
|
||||||
|
|
||||||
start_metering_thread();
|
if (connect_to_jack (client_name)) {
|
||||||
|
throw NoBackendAvailable ();
|
||||||
|
}
|
||||||
|
|
||||||
if (connect_to_jack (client_name)) {
|
start_metering_thread();
|
||||||
throw NoBackendAvailable ();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,9 +81,9 @@ AudioEngine::~AudioEngine ()
|
|||||||
jack_client_close (_jack);
|
jack_client_close (_jack);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(m_meter_thread) {
|
if(m_meter_thread) {
|
||||||
g_atomic_int_inc(&m_meter_exit);
|
g_atomic_int_inc(&m_meter_exit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
Reference in New Issue
Block a user