ardour/livetrax
13
0
Fork 0
Code

* [Modified] audioengine.cc

Browse Source 
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:
Tim Mayberry 2006-08-24 11:44:06 +00:00
parent 29d58af438
commit 3bba45c773
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -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',

14
libs/ardour/audioengine.cc
View File

@ -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