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
This commit is contained in:
parent
415131ef53
commit
d9228151ae
|
@ -1072,9 +1072,9 @@ 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 soundtouch-1.0')
|
libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
|
||||||
# Comment the previous line and uncomment this for Debian:
|
# Comment the previous line and uncomment this for some versions of Debian:
|
||||||
libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
|
#libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
|
||||||
|
|
||||||
libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
|
libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
|
||||||
LIBPATH='#libs/appleutility',
|
LIBPATH='#libs/appleutility',
|
||||||
|
|
|
@ -257,11 +257,11 @@ Session::butler_thread_work ()
|
||||||
|
|
||||||
/* don't read inactive tracks */
|
/* don't read inactive tracks */
|
||||||
|
|
||||||
/*IO* io = ds->io();
|
IO* io = ds->io();
|
||||||
|
|
||||||
if (io && !io->active()) {
|
if (io && !io->active()) {
|
||||||
continue;
|
continue;
|
||||||
}*/
|
}
|
||||||
|
|
||||||
switch (ds->do_refill ()) {
|
switch (ds->do_refill ()) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user