From e0cf3b6354e2c92a6adabe85cb6d6d3c547c287c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 13 Dec 2011 02:46:36 +0000 Subject: more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/midi_buffer.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libs/ardour/midi_buffer.cc') diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index e944727337..403f0a86ac 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -497,6 +497,12 @@ MidiBuffer::merge_in_place(const MidiBuffer &other) (int) *(_data + us.offset + sizeof (TimeType)), (int) *(other._data + them.offset + sizeof (TimeType)))); + if ((*us).time() != (*them).time()) { + cerr << " in merge code for two events:\n" + << '\t' << (*us) << endl + << '\t' << (*them) << endl + << "about to crash ...\n"; + } assert ((*us).time() == (*them).time()); uint8_t our_midi_status_byte = *(_data + us.offset + sizeof (TimeType)); -- cgit v1.2.3