pulling trunk

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

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 2d93108038b386f5563bece2a4dba02f6fa243a1..d48bbe3053c2b93b6de05f5d4f708a403d145512 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -24,7 +24,7 @@
 #include <ardour/timestamps.h>
 
 #include <pbd/error.h>
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 #include <ardour/ardour.h>
 #include <ardour/session.h>
@@ -158,7 +158,7 @@ Session::merge_event (Event* ev)
        default:
                for (Events::iterator i = events.begin(); i != events.end(); ++i) {
                        if ((*i)->type == ev->type && (*i)->action_frame == ev->action_frame) {
-                         error << compose(_("Session: cannot have two events of type %1 at the same frame (%2)."), 
+                         error << string_compose(_("Session: cannot have two events of type %1 at the same frame (%2)."), 
                                                 event_names[ev->type], ev->action_frame) << endmsg;
                                return;
                        }
@@ -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;
@@ -425,7 +419,7 @@ Session::process_event (Event* ev)
                break;
 
        default:
-         fatal << compose(_("Programming error: illegal event type in process_event (%1)"), ev->type) << endmsg;
+         fatal << string_compose(_("Programming error: illegal event type in process_event (%1)"), ev->type) << endmsg;
                /*NOTREACHED*/
                break;
        };