summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-10-04 05:15:28 +0000
committerDavid Robillard <d@drobilla.net>2007-10-04 05:15:28 +0000
commit79db28b0b87a6fb67ed6f31ec4753f52aad4358a (patch)
tree898e8a5d7c7c213900b4074051c2b8e9de95f733 /libs
parent9bcd3f1d167428916664e56d489477e8840eec3c (diff)
Merge the two separate 'add notes to midi region' interfaces (note and midievent).
Update note range dynamically while recording to fit incoming notes. git-svn-id: svn://localhost/ardour2/trunk@2512 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/midi_event.h2
-rw-r--r--libs/ardour/note.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/ardour/midi_event.h b/libs/ardour/ardour/midi_event.h
index bd16440d05..c430c708b7 100644
--- a/libs/ardour/ardour/midi_event.h
+++ b/libs/ardour/ardour/midi_event.h
@@ -148,7 +148,7 @@ struct MidiEvent {
inline uint8_t cc_number() const { return (_buffer[1]); }
inline uint8_t cc_value() const { return (_buffer[2]); }
inline const Byte* buffer() const { return _buffer; }
- inline Byte*& buffer() { return _buffer; }
+ inline Byte*& buffer() { return _buffer; }
private:
double _time; /**< Sample index (or beat time) at which event is valid */
diff --git a/libs/ardour/note.cc b/libs/ardour/note.cc
index 029daab3ba..1cd691c3d7 100644
--- a/libs/ardour/note.cc
+++ b/libs/ardour/note.cc
@@ -45,6 +45,8 @@ Note::Note(const Note& copy)
: _on_event(copy._on_event, true)
, _off_event(copy._off_event, true)
{
+ assert(_on_event.buffer());
+ assert(_off_event.buffer());
/*
assert(copy._on_event.size == 3);
_on_event.buffer = _on_event_buffer;