From c55e23e7aadca4ebe3b9ee8029abce939b4403ec Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 16 Oct 2019 23:07:29 -0600 Subject: change MidiPlaylist::dump() into ::render(); change type of initial argument --- libs/ardour/midi_playlist.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'libs/ardour/midi_playlist.cc') diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 2231791de6..61d114f67f 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -36,6 +36,7 @@ #include "ardour/midi_source.h" #include "ardour/midi_state_tracker.h" #include "ardour/region_factory.h" +#include "ardour/rt_midibuffer.h" #include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/types.h" @@ -491,7 +492,7 @@ MidiPlaylist::contained_automation() } void -MidiPlaylist::dump (Evoral::EventSink& dst, MidiChannelFilter* filter) +MidiPlaylist::render (RTMidiBuffer& dst, MidiChannelFilter* filter) { typedef pair TrackerInfo; @@ -516,7 +517,13 @@ MidiPlaylist::dump (Evoral::EventSink& dst, MidiChannelFilter* filt we read into a temporarily list, sort it, then write that to dst. */ Evoral::EventList evlist; - Evoral::EventSink& tgt = (regs.size() == 1) ? dst : evlist; + Evoral::EventSink* tgt; + + if (regs.size() == 1) { + tgt = &dst; + } else { + tgt = &evlist; + } DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1 regions to read, direct: %2\n", regs.size(), (regs.size() == 1))); @@ -529,7 +536,7 @@ MidiPlaylist::dump (Evoral::EventSink& dst, MidiChannelFilter* filt } DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("dump from %1 at %2\n", mr->name())); - mr->dump_to (tgt, 0, _note_mode, filter); + mr->render (*tgt, 0, _note_mode, filter); } if (!evlist.empty()) { -- cgit v1.2.3