rollback to 3428, before the mysterious removal of libs/* at 3431/3432

[ardour.git] / libs / ardour / session_butler.cc

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 872f97eab91470f9b823416f25548a086f10a6e3..ec5de23caffbc537f74fb58719a0b15e614a6a92 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -69,10 +69,15 @@ int
 Session::start_butler_thread ()
 {
        /* size is in Samples, not bytes */
-
-       dstream_buffer_size = (uint32_t) floor (Config->get_track_buffer_seconds() * (float) frame_rate());
-
-       Crossfade::set_buffer_size (dstream_buffer_size);
+       audio_dstream_buffer_size = (uint32_t) floor (Config->get_audio_track_buffer_seconds() * (float) frame_rate());
+       
+       /* size is in bytes
+        * XXX: Jack needs to tell us the MIDI buffer size
+        * (i.e. how many MIDI bytes we might see in a cycle)
+        */
+       midi_dstream_buffer_size = (uint32_t) floor (Config->get_midi_track_buffer_seconds() * (float)frame_rate());
+       
+       Crossfade::set_buffer_size (audio_dstream_buffer_size);
 
        butler_should_run = false;
 
@@ -257,11 +262,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: