diff options
| author | David Robillard <d@drobilla.net> | 2009-10-22 14:46:47 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-22 14:46:47 +0000 |
| commit | 33da74c8e353ac56194956cae8e2b7d74ec1a1b0 (patch) | |
| tree | d0e8808dfae866b3fa4ba8478f9df027cec97e42 /libs/ardour/midi_playlist.cc | |
| parent | a7c37f6a2da278803a0f66cf29da95813da6e48e (diff) | |
Fix MidiBuffer::merge_in_place and add aggressive correctness checking.
git-svn-id: svn://localhost/ardour2/branches/3.0@5854 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_playlist.cc')
| -rw-r--r-- | libs/ardour/midi_playlist.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 991e709651..49b5ff2c4f 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -137,7 +137,7 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d _read_data_count = 0; // relevent regions overlapping start <--> end - vector<boost::shared_ptr<Region> > regs; + vector< boost::shared_ptr<Region> > regs; for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { if ((*i)->coverage (start, end) != OverlapNone) { @@ -164,7 +164,7 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d NoteTrackers::iterator t = _note_trackers.find ((*i).get()); MidiStateTracker* tracker; - + if (t == _note_trackers.end()) { pair<Region*,MidiStateTracker*> newpair; newpair.first = (*i).get(); @@ -173,7 +173,7 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d } else { tracker = t->second; } - + mr->read_at (dst, start, dur, chan_n, _note_mode, tracker); _read_data_count += mr->read_data_count(); } |