Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 83db1c94e7d9ec508f2bcbeb33df1566cd76b66e..6c828ac6f0d490f0217c69171aa02d833974595e 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -20,15 +20,10 @@
 #include <cmath>
 #include <unistd.h>
 
-#include "ardour/timestamps.h"
-
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/stacktrace.h"
 
-#include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/butler.h"
 #include "ardour/debug.h"
 #include "ardour/session_event.h"
 
@@ -57,7 +52,7 @@ SessionEvent::create_per_thread_pool (const std::string& name, uint32_t nitems)
 }
 
 void *
-SessionEvent::operator new (size_t) 
+SessionEvent::operator new (size_t)
 {
        CrossThreadPool* p = pool->per_thread_pool ();
        SessionEvent* ev = static_cast<SessionEvent*> (p->alloc ());
@@ -70,9 +65,9 @@ SessionEvent::operator new (size_t)
        ev->own_pool = p;
        return ev;
 }
-    
-void 
-SessionEvent::operator delete (void *ptr, size_t /*size*/) 
+
+void
+SessionEvent::operator delete (void *ptr, size_t /*size*/)
 {
        Pool* p = pool->per_thread_pool ();
        SessionEvent* ev = static_cast<SessionEvent*> (ptr);
@@ -87,7 +82,7 @@ SessionEvent::operator delete (void *ptr, size_t /*size*/)
                stacktrace (cerr, 40);
        }
 #endif
-       
+
        if (p == ev->own_pool) {
                p->release (ptr);
        } else {
@@ -178,6 +173,7 @@ SessionEventManager::merge_event (SessionEvent* ev)
 
        switch (ev->type) {
        case SessionEvent::AutoLoop:
+       case SessionEvent::AutoLoopDeclick:
        case SessionEvent::StopOnce:
                _clear_event_type (ev->type);
                break;