From 4887350e0dda2aa13d757916e98bf5e2cbb7f49c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 19 Mar 2021 06:29:03 +0100 Subject: [PATCH] API consistency, prefer typedef'ed event_id_t --- libs/ardour/ardour/midi_model.h | 4 ++-- libs/ardour/midi_model.cc | 4 ++-- libs/ardour/smf_source.cc | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index b55ac5886d..aa650a2967 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -307,8 +307,8 @@ public: boost::shared_ptr > find_note (NotePtr); PatchChangePtr find_patch_change (Evoral::event_id_t); - boost::shared_ptr > find_note (gint note_id); - boost::shared_ptr > find_sysex (gint); + boost::shared_ptr > find_note (Evoral::event_id_t); + boost::shared_ptr > find_sysex (Evoral::event_id_t); InsertMergePolicy insert_merge_policy () const; void set_insert_merge_policy (InsertMergePolicy); diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index c65aeb2494..d26eabc2f3 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -1380,7 +1380,7 @@ MidiModel::find_note (NotePtr other) } Evoral::Sequence::NotePtr -MidiModel::find_note (gint note_id) +MidiModel::find_note (Evoral::event_id_t note_id) { /* used only for looking up notes when reloading history from disk, so we don't care about performance *too* much. @@ -1408,7 +1408,7 @@ MidiModel::find_patch_change (Evoral::event_id_t id) } boost::shared_ptr > -MidiModel::find_sysex (gint sysex_id) +MidiModel::find_sysex (Evoral::event_id_t sysex_id) { /* used only for looking up notes when reloading history from disk, so we don't care about performance *too* much. diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 164b5971ab..ff1ac04b3b 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -254,7 +254,7 @@ SMFSource::read_unlocked (const Lock& lock, DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: seek to %1\n", start)); Evoral::SMF::seek_to_start(); while (time < start_ticks) { - gint ignored; + Evoral::event_id_t ignored; ret = read_event(&ev_delta_t, &ev_size, &ev_buffer, &ignored); if (ret == -1) { // EOF @@ -271,7 +271,7 @@ SMFSource::read_unlocked (const Lock& lock, _smf_last_read_end = start + duration; while (true) { - gint ignored; /* XXX don't ignore note id's ??*/ + Evoral::event_id_t ignored; /* XXX don't ignore note id's ??*/ ret = read_event(&ev_delta_t, &ev_size, &ev_buffer, &ignored); if (ret == -1) { // EOF @@ -657,7 +657,7 @@ SMFSource::load_model (const Glib::Threads::Mutex::Lock& lock, bool force_reload uint32_t size = 0; uint8_t* buf = NULL; int ret; - gint event_id; + Evoral::event_id_t event_id; bool have_event_id; // TODO simplify event allocation