Fix crash on relayering.

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

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index eac71fb5d1eda01d9abfd46700bdd78c292c0816..59fe9e29a8b1f8c06cfee8d1f292e6d72e606deb 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -27,16 +27,18 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/error.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/stacktrace.h>
-
-#include <ardour/configuration.h>
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/crossfade.h>
-#include <ardour/timestamps.h>
+#include "pbd/error.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/stacktrace.h"
+
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioengine.h"
+#include "ardour/configuration.h"
+#include "ardour/crossfade.h"
+#include "ardour/io.h"
+#include "ardour/midi_diskstream.h"
+#include "ardour/session.h"
+#include "ardour/timestamps.h"
 
 #include "i18n.h"
 
@@ -76,6 +78,7 @@ Session::start_butler_thread ()
         * (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());
+       MidiDiskstream::set_readahead_frames ((nframes_t) (Config->get_midi_readahead() * (float) frame_rate()));
        
        Crossfade::set_buffer_size (audio_dstream_buffer_size);
 
@@ -160,7 +163,7 @@ Session::wait_till_butler_finished ()
 void *
 Session::_butler_thread_work (void* arg)
 {
-       PBD::ThreadCreated (pthread_self(), X_("Butler"));
+       PBD::notify_gui_about_thread_creation (pthread_self(), X_("Butler"));
        return ((Session *) arg)->butler_thread_work ();
        return 0;
 }
@@ -263,7 +266,7 @@ Session::butler_thread_work ()
 
                        /* don't read inactive tracks */
 
-                       IO* io = ds->io();
+                       boost::shared_ptr<IO> io = ds->io();
                        
                        if (io && !io->active()) {
                                continue;
@@ -313,7 +316,7 @@ Session::butler_thread_work ()
                        /* note that we still try to flush diskstreams attached to inactive routes
                         */
                        
-                       switch ((*i)->do_flush (Session::ButlerContext)) {
+                       switch ((*i)->do_flush (ButlerContext)) {
                        case 0:
                                bytes += (*i)->write_data_count();
                                break;