Modified version of Hans' patch for mantis 1985. Also remove unused port_connections...

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

diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 37d0bbd4e720b7badd29f94c6297904e91e15693..59fe9e29a8b1f8c06cfee8d1f292e6d72e606deb 100644 (file)
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -27,18 +27,18 @@
 
 #include <glibmm/thread.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 "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"
 
@@ -78,7 +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_readahed_frames ((nframes_t) (Config->get_midi_readahead() * (float) frame_rate()));
+       MidiDiskstream::set_readahead_frames ((nframes_t) (Config->get_midi_readahead() * (float) frame_rate()));
        
        Crossfade::set_buffer_size (audio_dstream_buffer_size);
 
@@ -266,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;