From 1ab49bcc32f95f6650f879ad6ddcaaf33160f826 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 1 Feb 2022 16:20:28 -0700 Subject: [PATCH] change MidiStateTracker to MidiNoteTracker The old name will become a bigger class/object that tracks all MIDI state, not just notes --- libs/ardour/ardour/audio_track.h | 2 +- libs/ardour/ardour/auditioner.h | 2 +- libs/ardour/ardour/beatbox.h | 2 +- libs/ardour/ardour/disk_reader.h | 2 +- libs/ardour/ardour/midi_region.h | 6 +++--- libs/ardour/ardour/midi_ring_buffer.h | 2 +- libs/ardour/ardour/midi_source.h | 8 ++++---- libs/ardour/ardour/midi_state_tracker.h | 4 ++-- libs/ardour/ardour/midi_track.h | 2 +- libs/ardour/ardour/plugin.h | 2 +- libs/ardour/ardour/rt_midibuffer.h | 4 ++-- libs/ardour/ardour/smf_source.h | 2 +- libs/ardour/ardour/step_sequencer.h | 10 +++++----- libs/ardour/ardour/track.h | 4 ++-- libs/ardour/ardour/triggerbox.h | 2 +- libs/ardour/audio_track.cc | 2 +- libs/ardour/midi_model.cc | 2 +- libs/ardour/midi_playlist.cc | 2 +- libs/ardour/midi_region.cc | 6 +++--- libs/ardour/midi_source.cc | 2 +- libs/ardour/midi_state_tracker.cc | 20 ++++++++++---------- libs/ardour/midi_track.cc | 4 ++-- libs/ardour/rt_midibuffer.cc | 2 +- libs/ardour/session.cc | 2 +- libs/ardour/smf_source.cc | 2 +- libs/ardour/step_sequencer.cc | 6 +++--- tools/bb/bb.h | 4 ++-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 0ec64dca5c..deba34e870 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -50,7 +50,7 @@ class LIBARDOUR_API AudioTrack : public Track std::string const& name); int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, - MidiStateTracker&); + MidiNoteTracker&); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 28be1094f0..c557150022 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -87,7 +87,7 @@ public: return boost::shared_ptr (); } - int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr, bool, bool, bool, MidiStateTracker&) { return -1; } + int export_stuff (BufferSet&, samplepos_t, samplecnt_t, boost::shared_ptr, bool, bool, bool, MidiNoteTracker&) { return -1; } void set_audition_synth_info(PluginInfoPtr in) { audition_synth_info = in; } diff --git a/libs/ardour/ardour/beatbox.h b/libs/ardour/ardour/beatbox.h index 3860e0d749..dc13830b3e 100644 --- a/libs/ardour/ardour/beatbox.h +++ b/libs/ardour/ardour/beatbox.h @@ -66,7 +66,7 @@ class BeatBox : public ARDOUR::Processor { private: StepSequencer* _sequencer; - ARDOUR::MidiStateTracker inbound_tracker; + ARDOUR::MidiNoteTracker inbound_tracker; bool fill_midi_source (boost::shared_ptr); diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index e1df603f82..cfef323a31 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -207,7 +207,7 @@ private: DeclickAmp _declick_amp; sampleoffset_t _declick_offs; bool _declick_enabled; - MidiStateTracker _tracker; + MidiNoteTracker _tracker; boost::optional _last_read_reversed; boost::optional _last_read_loop; diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 1f8156a493..dc8e418377 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -46,7 +46,7 @@ class MidiChannelFilter; class MidiFilter; class MidiModel; class MidiSource; -class MidiStateTracker; +class MidiNoteTracker; class Playlist; class Route; class Session; @@ -71,7 +71,7 @@ class LIBARDOUR_API MidiRegion : public Region MidiCursor& cursor, uint32_t chan_n = 0, NoteMode mode = Sustained, - MidiStateTracker* tracker = 0, + MidiNoteTracker* tracker = 0, MidiChannelFilter* filter = 0) const; timecnt_t master_read_at (MidiRingBuffer& dst, @@ -136,7 +136,7 @@ class LIBARDOUR_API MidiRegion : public Region MidiCursor& cursor, uint32_t chan_n = 0, NoteMode mode = Sustained, - MidiStateTracker* tracker = 0, + MidiNoteTracker* tracker = 0, MidiChannelFilter* filter = 0) const; void register_properties (); diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h index c515de7326..3095e028ad 100644 --- a/libs/ardour/ardour/midi_ring_buffer.h +++ b/libs/ardour/ardour/midi_ring_buffer.h @@ -61,7 +61,7 @@ public: void resolve_tracker (Evoral::EventSink& dst, samplepos_t); private: - MidiStateTracker _tracker; + MidiNoteTracker _tracker; }; diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 64d090a2cb..5cd5fc6109 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -44,7 +44,7 @@ namespace ARDOUR { class MidiChannelFilter; class MidiModel; -class MidiStateTracker; +class MidiNoteTracker; template class MidiRingBuffer; @@ -96,7 +96,7 @@ class LIBARDOUR_API MidiSource : virtual public Source * @param loop_range If non-null, all event times will be mapped into this loop range. * @param cursor Cached iterator to start copying events * @param filter Channel filter to apply or NULL to disable filter - * @param tracker an optional pointer to MidiStateTracker object, for note on/off tracking. + * @param tracker an optional pointer to MidiNoteTracker object, for note on/off tracking. * @param filtered Parameters whose MIDI messages will not be returned. */ virtual timecnt_t midi_read (const Lock& lock, @@ -106,7 +106,7 @@ class LIBARDOUR_API MidiSource : virtual public Source timecnt_t const & cnt, Temporal::Range* loop_range, MidiCursor& cursor, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter, const std::set& filtered); @@ -212,7 +212,7 @@ class LIBARDOUR_API MidiSource : virtual public Source timepos_t const & start, timecnt_t const & cnt, Temporal::Range* loop_range, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter) const = 0; /** Write data to this source from a MidiRingBuffer. diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h index e1dac45150..a69e5efddc 100644 --- a/libs/ardour/ardour/midi_state_tracker.h +++ b/libs/ardour/ardour/midi_state_tracker.h @@ -37,10 +37,10 @@ class MidiSource; /** Tracks played notes, so they can be resolved in potential stuck note * situations (e.g. looping, transport stop, etc). */ -class LIBARDOUR_API MidiStateTracker +class LIBARDOUR_API MidiNoteTracker { public: - MidiStateTracker(); + MidiNoteTracker(); void track (const MidiBuffer::const_iterator& from, const MidiBuffer::const_iterator& to); void track (const uint8_t* evbuf); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 8c908cdc9b..13419885f8 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -68,7 +68,7 @@ public: bool include_endpoint, bool for_export, bool for_freeze, - MidiStateTracker& tracker); + MidiNoteTracker& tracker); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 7a538c7244..55295fa2f4 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -398,7 +398,7 @@ private: virtual void add_state (XMLNode*) const = 0; bool _have_presets; - MidiStateTracker _tracker; + MidiNoteTracker _tracker; BufferSet _pending_stop_events; bool _have_pending_stop_events; PresetRecord _last_preset; diff --git a/libs/ardour/ardour/rt_midibuffer.h b/libs/ardour/ardour/rt_midibuffer.h index 3d04df21c7..4469a9590a 100644 --- a/libs/ardour/ardour/rt_midibuffer.h +++ b/libs/ardour/ardour/rt_midibuffer.h @@ -36,7 +36,7 @@ namespace ARDOUR { class MidiBuffer; -class MidiStateTracker; +class MidiNoteTracker; /** */ class LIBARDOUR_API RTMidiBuffer : public Evoral::EventSink @@ -61,7 +61,7 @@ class LIBARDOUR_API RTMidiBuffer : public Evoral::EventSink samplecnt_t span() const; uint32_t write (TimeType time, Evoral::EventType type, uint32_t size, const uint8_t* buf); - uint32_t read (MidiBuffer& dst, samplepos_t start, samplepos_t end, MidiStateTracker& tracker, samplecnt_t offset = 0); + uint32_t read (MidiBuffer& dst, samplepos_t start, samplepos_t end, MidiNoteTracker& tracker, samplecnt_t offset = 0); void dump (uint32_t); void reverse (); diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index a31006b554..a478b98c90 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -99,7 +99,7 @@ public: timepos_t const & start, timecnt_t const & cnt, Temporal::Range* loop_range, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter) const; timecnt_t write_unlocked (const Lock& lock, diff --git a/libs/ardour/ardour/step_sequencer.h b/libs/ardour/ardour/step_sequencer.h index c9dd34a40d..4570a10e07 100644 --- a/libs/ardour/ardour/step_sequencer.h +++ b/libs/ardour/ardour/step_sequencer.h @@ -44,7 +44,7 @@ namespace ARDOUR { class MidiBuffer; -class MidiStateTracker; +class MidiNoteTracker; class StepSequencer; class StepSequence; class TempoMap; @@ -105,7 +105,7 @@ class Step : public PBD::Stateful { void set_beat (Temporal::Beats const & beat); Temporal::Beats beat () const { return _nominal_beat; } - bool run (MidiBuffer& buf, bool running, samplepos_t, samplepos_t, MidiStateTracker&); + bool run (MidiBuffer& buf, bool running, samplepos_t, samplepos_t, MidiNoteTracker&); bool skipped() const { return _skipped; } void set_skipped (bool); @@ -158,7 +158,7 @@ class Step : public PBD::Stateful { ParameterValue _parameters[_parameters_per_step]; size_t _repeat; - void check_note (size_t n, MidiBuffer& buf, bool, samplepos_t, samplepos_t, MidiStateTracker&); + void check_note (size_t n, MidiBuffer& buf, bool, samplepos_t, samplepos_t, MidiNoteTracker&); void check_parameter (size_t n, MidiBuffer& buf, bool, samplepos_t, samplepos_t); void dump_note (MusicTimeEvents&, size_t n, Temporal::Beats const &) const; void dump_parameter (MusicTimeEvents&, size_t n, Temporal::Beats const &) const; @@ -204,7 +204,7 @@ class StepSequence : public PBD::Stateful void reschedule (Temporal::Beats const &, Temporal::Beats const &); void schedule (Temporal::Beats const &); - bool run (MidiBuffer& buf, bool running, samplepos_t, samplepos_t, MidiStateTracker&); + bool run (MidiBuffer& buf, bool running, samplepos_t, samplepos_t, MidiNoteTracker&); StepSequencer& sequencer() const { return _sequencer; } @@ -281,7 +281,7 @@ class StepSequencer : public PBD::Stateful bool _running; size_t _step_capacity; - ARDOUR::MidiStateTracker outbound_tracker; + ARDOUR::MidiNoteTracker outbound_tracker; struct Request { diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 1985413b76..11e85de930 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -42,7 +42,7 @@ class DiskWriter; class IO; class RecordEnableControl; class RecordSafeControl; -class MidiStateTracker; +class MidiNoteTracker; /** A track is an route (bus) with a recordable diskstream and * related objects relevant to recording, playback and editing. @@ -112,7 +112,7 @@ public: virtual int export_stuff (BufferSet& bufs, samplepos_t start_sample, samplecnt_t nframes, boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, - MidiStateTracker&) = 0; + MidiNoteTracker&) = 0; virtual int set_state (const XMLNode&, int version); static void zero_diskstream_id_in_xml (XMLNode&); diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h index b89f8ae894..7fe6eedbeb 100644 --- a/libs/ardour/ardour/triggerbox.h +++ b/libs/ardour/ardour/triggerbox.h @@ -494,7 +494,7 @@ class LIBARDOUR_API MIDITrigger : public Trigger { private: PBD::ID data_source; - MidiStateTracker tracker; + MidiNoteTracker tracker; PBD::ScopedConnection content_connection; Temporal::Beats final_beat; diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 31e0dc42e9..149d0e2aa9 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -202,7 +202,7 @@ AudioTrack::get_input_monitoring_state (bool recording, bool talkback) const int AudioTrack::export_stuff (BufferSet& buffers, samplepos_t start, samplecnt_t nframes, boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze, - MidiStateTracker& /* ignored, this is audio */) + MidiNoteTracker& /* ignored, this is audio */) { boost::scoped_array gain_buffer (new gain_t[nframes]); boost::scoped_array mix_buffer (new Sample[nframes]); diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index c5c0c0841f..bf43d58366 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -1299,7 +1299,7 @@ MidiModel::write_section_to (boost::shared_ptr source, bool offset_events) { ReadLock lock(read_lock()); - MidiStateTracker mst; + MidiNoteTracker mst; const bool old_percussive = percussive(); set_percussive(false); diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index b0243b00d2..28270c9222 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -287,7 +287,7 @@ MidiPlaylist::contained_automation() void MidiPlaylist::render (MidiChannelFilter* filter) { - typedef pair TrackerInfo; + typedef pair TrackerInfo; Playlist::RegionReadLock rl (this); diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 79b68903ff..ed5c976e31 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -179,7 +179,7 @@ MidiRegion::read_at (Evoral::EventSink& out, MidiCursor& cursor, uint32_t chan_n, NoteMode mode, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter) const { return _read_at (_sources, out, position, dur, loop_range, cursor, chan_n, mode, tracker, filter); @@ -206,7 +206,7 @@ MidiRegion::_read_at (const SourceList& /*srcs*/, MidiCursor& cursor, uint32_t chan_n, NoteMode mode, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter) const { timecnt_t dur (xdur); @@ -320,7 +320,7 @@ MidiRegion::render_range (Evoral::EventSink& dst, #endif MidiCursor cursor; - MidiStateTracker tracker; + MidiNoteTracker tracker; /* This call reads events from a source and writes them to `dst' timed in session samples */ diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 1f85030890..3fc9f395e2 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -180,7 +180,7 @@ MidiSource::midi_read (const Lock& lm, timecnt_t const & cnt, Temporal::Range* loop_range, MidiCursor& cursor, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter, const std::set& filtered) { diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index c9ea4de9e3..10877c89dc 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -33,13 +33,13 @@ using namespace std; using namespace ARDOUR; -MidiStateTracker::MidiStateTracker () +MidiNoteTracker::MidiNoteTracker () { reset (); } void -MidiStateTracker::reset () +MidiNoteTracker::reset () { DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: reset\n", this)); memset (_active_notes, 0, sizeof (_active_notes)); @@ -47,7 +47,7 @@ MidiStateTracker::reset () } void -MidiStateTracker::add (uint8_t note, uint8_t chn) +MidiNoteTracker::add (uint8_t note, uint8_t chn) { if (_active_notes[note+128 * chn] == 0) { ++_on; @@ -64,7 +64,7 @@ MidiStateTracker::add (uint8_t note, uint8_t chn) } void -MidiStateTracker::remove (uint8_t note, uint8_t chn) +MidiNoteTracker::remove (uint8_t note, uint8_t chn) { switch (_active_notes[note + 128 * chn]) { case 0: @@ -84,7 +84,7 @@ MidiStateTracker::remove (uint8_t note, uint8_t chn) } void -MidiStateTracker::track (const MidiBuffer::const_iterator &from, const MidiBuffer::const_iterator &to) +MidiNoteTracker::track (const MidiBuffer::const_iterator &from, const MidiBuffer::const_iterator &to) { for (MidiBuffer::const_iterator i = from; i != to; ++i) { track(*i); @@ -92,7 +92,7 @@ MidiStateTracker::track (const MidiBuffer::const_iterator &from, const MidiBuffe } void -MidiStateTracker::track (const uint8_t* evbuf) +MidiNoteTracker::track (const uint8_t* evbuf) { const uint8_t type = evbuf[0] & 0xF0; const uint8_t chan = evbuf[0] & 0x0F; @@ -110,7 +110,7 @@ MidiStateTracker::track (const uint8_t* evbuf) } void -MidiStateTracker::resolve_notes (MidiBuffer &dst, samplepos_t time) +MidiNoteTracker::resolve_notes (MidiBuffer &dst, samplepos_t time) { DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 MB-resolve notes @ %2 on = %3\n", this, time, _on)); @@ -138,7 +138,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, samplepos_t time) } void -MidiStateTracker::resolve_notes (Evoral::EventSink &dst, samplepos_t time) +MidiNoteTracker::resolve_notes (Evoral::EventSink &dst, samplepos_t time) { uint8_t buf[3]; @@ -168,7 +168,7 @@ MidiStateTracker::resolve_notes (Evoral::EventSink &dst, samplepos_ } void -MidiStateTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock, Temporal::Beats time) +MidiNoteTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock, Temporal::Beats time) { DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 MS-resolve notes @ %2 on = %3\n", this, time, _on)); @@ -199,7 +199,7 @@ MidiStateTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock, } void -MidiStateTracker::dump (ostream& o) +MidiNoteTracker::dump (ostream& o) { o << "******\n"; for (int c = 0; c < 16; ++c) { diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 7ca6e9d796..509267fc32 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -528,7 +528,7 @@ MidiTrack::export_stuff (BufferSet& buffers, bool include_endpoint, bool for_export, bool for_freeze, - MidiStateTracker& tracker) + MidiNoteTracker& tracker) { if (buffers.count().n_midi() == 0) { return -1; @@ -547,7 +547,7 @@ MidiTrack::export_stuff (BufferSet& buffers, * subsequent call */ - MidiStateTracker ignored; + MidiNoteTracker ignored; /* XXX this doesn't fail, other than if the lock cannot be obtained */ mpl->rendered()->read (buffers.get_midi(0), start, start+nframes, ignored, start); diff --git a/libs/ardour/rt_midibuffer.cc b/libs/ardour/rt_midibuffer.cc index 85f5f4c7cd..38222dc8fe 100644 --- a/libs/ardour/rt_midibuffer.cc +++ b/libs/ardour/rt_midibuffer.cc @@ -252,7 +252,7 @@ item_item_earlier (ARDOUR::RTMidiBuffer::Item const & item, ARDOUR::RTMidiBuffer } uint32_t -RTMidiBuffer::read (MidiBuffer& dst, samplepos_t start, samplepos_t end, MidiStateTracker& tracker, samplecnt_t offset) +RTMidiBuffer::read (MidiBuffer& dst, samplepos_t start, samplepos_t end, MidiNoteTracker& tracker, samplecnt_t offset) { Glib::Threads::RWLock::ReaderLock lm (_lock, Glib::Threads::TRY_LOCK); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 7663af6636..9071d4c9da 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -5730,7 +5730,7 @@ Session::write_one_track (Track& track, samplepos_t start, samplepos_t end, string legal_playlist_name; string possible_path; MidiBuffer resolved (256); - MidiStateTracker tracker; + MidiNoteTracker tracker; DataType data_type = track.data_type(); std::vector midi_source_locks; diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 8272329e88..f952bcbb63 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -216,7 +216,7 @@ SMFSource::read_unlocked (const Lock& lock, timepos_t const & start, timecnt_t const & duration, Temporal::Range* loop_range, - MidiStateTracker* tracker, + MidiNoteTracker* tracker, MidiChannelFilter* filter) const { int ret = 0; diff --git a/libs/ardour/step_sequencer.cc b/libs/ardour/step_sequencer.cc index 6b715649dd..d495c510b9 100644 --- a/libs/ardour/step_sequencer.cc +++ b/libs/ardour/step_sequencer.cc @@ -224,7 +224,7 @@ Step::adjust_octave (int amt) } bool -Step::run (MidiBuffer& buf, bool running, samplepos_t start_sample, samplepos_t end_sample, MidiStateTracker& tracker) +Step::run (MidiBuffer& buf, bool running, samplepos_t start_sample, samplepos_t end_sample, MidiNoteTracker& tracker) { for (size_t n = 0; n < _parameters_per_step; ++n) { check_parameter (n, buf, running, start_sample, end_sample); @@ -264,7 +264,7 @@ Step::dump_parameter (MusicTimeEvents& events, size_t n, Temporal::Beats const & } void -Step::check_note (size_t n, MidiBuffer& buf, bool running, samplepos_t start_sample, samplepos_t end_sample, MidiStateTracker& tracker) +Step::check_note (size_t n, MidiBuffer& buf, bool running, samplepos_t start_sample, samplepos_t end_sample, MidiNoteTracker& tracker) { Note& note (_notes[n]); @@ -518,7 +518,7 @@ StepSequence::set_channel (int c) } bool -StepSequence::run (MidiBuffer& buf, bool running, samplepos_t start_sample, samplepos_t end_sample, MidiStateTracker& tracker) +StepSequence::run (MidiBuffer& buf, bool running, samplepos_t start_sample, samplepos_t end_sample, MidiNoteTracker& tracker) { const size_t s = _sequencer.start_step(); const size_t e = _sequencer.end_step(); diff --git a/tools/bb/bb.h b/tools/bb/bb.h index 07175b6664..c4e70e7fe8 100644 --- a/tools/bb/bb.h +++ b/tools/bb/bb.h @@ -64,8 +64,8 @@ class BeatBox { superclock_t measure_superclocks; int _quantize_divisor; bool clear_pending; - ARDOUR::MidiStateTracker inbound_tracker; - ARDOUR::MidiStateTracker outbound_tracker; + ARDOUR::MidiNoteTracker inbound_tracker; + ARDOUR::MidiNoteTracker outbound_tracker; struct Event { superclock_t time;