X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_events.cc;h=03afd54440747ba09d27ed7bf7048d4b461b2d2e;hb=848db8fbd56dbae1ad286b7791dba293462b5f43;hp=83db1c94e7d9ec508f2bcbeb33df1566cd76b66e;hpb=62e730b57ab30bb8642c5682b53b7c534d923a24;p=ardour.git

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 83db1c94e7..03afd54440 100644
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -20,15 +20,11 @@
 #include <cmath>
 #include <unistd.h>
 
-#include "ardour/timestamps.h"
-
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
 #include "pbd/stacktrace.h"
+#include "pbd/pthread_utils.h"
 
-#include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/butler.h"
 #include "ardour/debug.h"
 #include "ardour/session_event.h"
 
@@ -57,11 +53,11 @@ 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 ());
-	DEBUG_TRACE (DEBUG::SessionEvents, string_compose ("%1 Allocating SessionEvent from %2 ev @ %3\n", pthread_self(), p->name(), ev));
+	DEBUG_TRACE (DEBUG::SessionEvents, string_compose ("%1 Allocating SessionEvent from %2 ev @ %3\n", pthread_name(), p->name(), ev));
 #ifndef NDEBUG
 	if (DEBUG::SessionEvents & PBD::debug_bits) {
 		stacktrace (cerr, 40);
@@ -70,16 +66,16 @@ 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);
 
 	DEBUG_TRACE (DEBUG::SessionEvents, string_compose (
 		             "%1 Deleting SessionEvent @ %2 ev thread pool = %3 ev pool = %4\n",
-		             pthread_self(), ev, p->name(), ev->own_pool->name()
+		             pthread_name(), ev, p->name(), ev->own_pool->name()
 		             ));
 
 #ifndef NDEBUG
@@ -87,7 +83,7 @@ SessionEvent::operator delete (void *ptr, size_t /*size*/)
 		stacktrace (cerr, 40);
 	}
 #endif
-	
+
 	if (p == ev->own_pool) {
 		p->release (ptr);
 	} else {
@@ -129,7 +125,8 @@ SessionEventManager::dump_events () const
 {
 	cerr << "EVENT DUMP" << endl;
 	for (Events::const_iterator i = events.begin(); i != events.end(); ++i) {
-		cerr << "\tat " << (*i)->action_frame << ' ' << (*i)->type << " target = " << (*i)->target_frame << endl;
+
+		cerr << "\tat " << (*i)->action_frame << ' ' << enum_2_string ((*i)->type) << " target = " << (*i)->target_frame << endl;
 	}
 	cerr << "Next event: ";
 
@@ -137,12 +134,12 @@ SessionEventManager::dump_events () const
 		cerr << "none" << endl;
 	} else {
 		cerr << "at " << (*next_event)->action_frame << ' '
-		     << (*next_event)->type << " target = "
+		     << enum_2_string ((*next_event)->type) << " target = "
 		     << (*next_event)->target_frame << endl;
 	}
 	cerr << "Immediate events pending:\n";
 	for (Events::const_iterator i = immediate_events.begin(); i != immediate_events.end(); ++i) {
-		cerr << "\tat " << (*i)->action_frame << ' ' << (*i)->type << " target = " << (*i)->target_frame << endl;
+		cerr << "\tat " << (*i)->action_frame << ' ' << enum_2_string((*i)->type) << " target = " << (*i)->target_frame << endl;
 	}
 	cerr << "END EVENT_DUMP" << endl;
 }
@@ -178,6 +175,7 @@ SessionEventManager::merge_event (SessionEvent* ev)
 
 	switch (ev->type) {
 	case SessionEvent::AutoLoop:
+	case SessionEvent::AutoLoopDeclick:
 	case SessionEvent::StopOnce:
 		_clear_event_type (ev->type);
 		break;
@@ -247,7 +245,7 @@ SessionEventManager::_remove_event (SessionEvent* ev)
 			if (i == next_event) {
 				++next_event;
 			}
-			events.erase (i);
+			i = events.erase (i);
 			break;
 		}
 	}