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

diff --git a/SConstruct b/SConstruct
index 9f2c40e82a583c4d5e45bc893556a900d1b1a88d..db2c0952504b513f8406f282a8a8469c01ee6d47 100644 (file)
--- 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 872f97eab91470f9b823416f25548a086f10a6e3..2ac06e57dd89bb6b02915f9663132b82f9911113 100644 (file)
--- 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: