r209@gandalf: fugalh | 2006-07-28 17:38:21 -0600

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

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 68555dbe4044a0505d59d725a814b2d97f8e2e33..e918e0383f56897e10c5634ab1e2be0965668e7e 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);
 
@@ -342,12 +342,6 @@ Session::process_event (Event* ev)
        case Event::PunchIn:
                // cerr << "PunchIN at " << transport_frame() << endl;
                if (punch_in && record_status() == Enabled) {
-                       {
-                               LockMonitor lm (diskstream_lock, __LINE__, __FILE__);
-                               for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) {
-                                       (*i)->punch_in();
-                               }
-                       }
                        enable_record ();
                }
                remove = false;
@@ -395,11 +389,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<AudioDiskstream*> (ev->ptr), ev->speed);
                break;
 
        case Event::SetSlaveSource: