diff options
author | David Robillard <d@drobilla.net> | 2008-05-21 04:23:23 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-05-21 04:23:23 +0000 |
commit | d9228151aee5cb6e7809ef273e9f3b34e74b4b12 (patch) | |
tree | bee050e16ef2e6a838c3cdfa926227747f22da31 | |
parent | 415131ef53d7d3d32dd36985548ad95906025ed5 (diff) |
Don't read inactive tracks in Diskstream (merge oops, now matches 2.0).
Change soundtouch pkg-config name back to to "soundtouch-1.0" (Debian switched to this, I think fedora uses it too?).
git-svn-id: svn://localhost/ardour2/branches/3.0@3373 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | SConstruct | 6 | ||||
-rw-r--r-- | libs/ardour/session_butler.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 9f2c40e82a..db2c095250 100644 --- a/SConstruct +++ b/SConstruct @@ -1072,9 +1072,9 @@ if env['SYSLIBS']: # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() - #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') - # Comment the previous line and uncomment this for Debian: - libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') + # Comment the previous line and uncomment this for some versions of Debian: + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index 872f97eab9..2ac06e57dd 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -257,11 +257,11 @@ Session::butler_thread_work () /* don't read inactive tracks */ - /*IO* io = ds->io(); + IO* io = ds->io(); if (io && !io->active()) { continue; - }*/ + } switch (ds->do_refill ()) { case 0: |