Large nasty commit in the form of a 5000 line patch chock-full of completely

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

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 5687e3f733ed583f9feea4c963f23f5faa88c521..79d20c8c3961e91990e2c7d20ea4ec4cae85b9b7 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -24,16 +24,16 @@
 #include <ardour/timestamps.h>
 
 #include <pbd/error.h>
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 #include <ardour/ardour.h>
 #include <ardour/session.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 
 #include "i18n.h"
 
 using namespace ARDOUR;
-//using namespace sigc;
+using namespace PBD;
 
 MultiAllocSingleReleasePool Session::Event::pool ("event", sizeof (Session::Event), 512);
 
@@ -120,7 +120,6 @@ Session::queue_event (Event* ev)
        }
 }
 
-/* [DR] Always called from audio thread? */
 void
 Session::merge_event (Event* ev)
 {
@@ -311,8 +310,7 @@ Session::process_event (Event* ev)
                return;
        }
 
-       // FIXME [DR]
-       printf("Processing event: %s\n", event_names[ev->type]);
+       //printf("Processing event: %s\n", event_names[ev->type]);
 
        switch (ev->type) {
        case Event::SetLoop:
@@ -395,11 +393,11 @@ Session::process_event (Event* ev)
                break;
 
        case Event::Overwrite:
-               overwrite_some_buffers (static_cast<DiskStream*>(ev->ptr));
+               overwrite_some_buffers (static_cast<AudioDiskstream*>(ev->ptr));
                break;
 
        case Event::SetDiskstreamSpeed:
-               set_diskstream_speed (static_cast<DiskStream*> (ev->ptr), ev->speed);
+               set_diskstream_speed (static_cast<Diskstream*> (ev->ptr), ev->speed);
                break;
 
        case Event::SetSlaveSource: