smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

change API of MidiSource::append_event_beats() to allow meta-event legality

Browse source 
Because we want a default argument of false, this involved the usual
inline-non-virtual-method-calls-virtual-with-no-default trick.

Also, do NOT append data to a MidiModel or change the length of an SMFSource
unless we know for sure that added that data to the SMF object.
This commit is contained in:
Paul Davis 2025-08-18 16:26:55 -06:00
parent 586ac7e447
commit 48cd807e6a
3 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/ardour/ardour/midi_source.h
View file

@ -123,10 +123,14 @@ class LIBARDOUR_API MidiSource : virtual public Source
/** Append a single event with a timestamp in beats. /** Append a single event with a timestamp in beats.
* *
* Caller must ensure that the event is later than the last written event. * Caller must ensure that the event is later than the last written
* event since the last ::begin_write() or ::end_track() call.
*/ */
virtual void append_event_beats(const WriterLock& lock, virtual void _append_event_beats(const WriterLock& lock, const Evoral::Event<Temporal::Beats>& ev, bool allow_meta) = 0;
const Evoral::Event<Temporal::Beats>& ev) = 0;
void append_event_beats(const WriterLock& lock, const Evoral::Event<Temporal::Beats>& ev, bool allow_meta = false) {
_append_event_beats (lock, ev, allow_meta);
}
/** Append a single event with a timestamp in samples. /** Append a single event with a timestamp in samples.
* *

2
libs/ardour/ardour/smf_source.h
View file

@ -52,7 +52,7 @@ public:
return safe_midi_file_extension(path); return safe_midi_file_extension(path);
} }
void append_event_beats (const WriterLock& lock, const Evoral::Event<Temporal::Beats>& ev); void _append_event_beats (const WriterLock& lock, const Evoral::Event<Temporal::Beats>& ev, bool allow_meta);
void append_event_samples (const WriterLock& lock, const Evoral::Event<samplepos_t>& ev, samplepos_t source_start); void append_event_samples (const WriterLock& lock, const Evoral::Event<samplepos_t>& ev, samplepos_t source_start);
void update_length (timepos_t const & dur); void update_length (timepos_t const & dur);

58
libs/ardour/smf_source.cc
View file

@ -480,8 +480,7 @@ SMFSource::duration() const
/** Append an event with a timestamp in beats */ /** Append an event with a timestamp in beats */
void void
SMFSource::append_event_beats (const WriterLock& lock, SMFSource::_append_event_beats (const WriterLock& lock, const Evoral::Event<Temporal::Beats>& ev, bool allow_meta)
const Evoral::Event<Temporal::Beats>& ev)
{ {
if (!_writing || ev.size() == 0 || ev.is_realtime()) { if (!_writing || ev.size() == 0 || ev.is_realtime()) {
return; return;
@ -519,20 +518,22 @@ SMFSource::append_event_beats (const WriterLock& lock,
event_id = ev.id(); event_id = ev.id();
} }
if (_model) {
_model->append (ev, event_id);
}
assert (!_length || (_length.time_domain() == Temporal::BeatTime));
_length = timepos_t (max (_length.beats(), time));
const Temporal::Beats delta_time_beats = time - _last_ev_time_beats; const Temporal::Beats delta_time_beats = time - _last_ev_time_beats;
const uint32_t delta_time_ticks = delta_time_beats.to_ticks(ppqn()); const uint32_t delta_time_ticks = delta_time_beats.to_ticks(ppqn());
Evoral::SMF::append_event_delta (delta_time_ticks, ev.size(), ev.buffer(), event_id); if (Evoral::SMF::append_event_delta (delta_time_ticks, ev.size(), ev.buffer(), event_id, allow_meta)) {
_last_ev_time_beats = time;
_flags = Source::Flag (_flags & ~Empty); _last_ev_time_beats = time;
_flags = Source::Flag (_flags & ~Missing); _flags = Source::Flag (_flags & ~Empty);
_flags = Source::Flag (_flags & ~Missing);
if (_model && !Evoral::SMF::is_meta (ev.buffer(), ev.size())) {
_model->append (ev, event_id);
}
assert (!_length || (_length.time_domain() == Temporal::BeatTime));
_length = timepos_t (max (_length.beats(), time));
}
} }
/** Append an event with a timestamp in samples (samplepos_t) */ /** Append an event with a timestamp in samples (samplepos_t) */
@ -569,17 +570,6 @@ SMFSource::append_event_samples (const WriterLock& lock,
event_id = ev.id(); event_id = ev.id();
} }
if (_model) {
const Evoral::Event<Temporal::Beats> beat_ev (ev.event_type(),
ev_time_beats,
ev.size(),
const_cast<uint8_t*>(ev.buffer()));
_model->append (beat_ev, event_id);
}
assert (!_length || (_length.time_domain() == Temporal::BeatTime));
_length = timepos_t (max (_length.beats(), ev_time_beats));
/* a distance measure that starts at @p _last_ev_time_samples (audio time) and /* a distance measure that starts at @p _last_ev_time_samples (audio time) and
extends for ev.time() (audio time) extends for ev.time() (audio time)
*/ */
@ -587,10 +577,22 @@ SMFSource::append_event_samples (const WriterLock& lock,
const Temporal::Beats delta_time_beats = delta_distance.beats (); const Temporal::Beats delta_time_beats = delta_distance.beats ();
const uint32_t delta_time_ticks = delta_time_beats.to_ticks(ppqn()); const uint32_t delta_time_ticks = delta_time_beats.to_ticks(ppqn());
Evoral::SMF::append_event_delta (delta_time_ticks, ev.size(), ev.buffer(), event_id); if (Evoral::SMF::append_event_delta (delta_time_ticks, ev.size(), ev.buffer(), event_id) > 0) {;
_last_ev_time_samples = ev.time(); _last_ev_time_samples = ev.time();
_flags = Source::Flag (_flags & ~Empty); _flags = Source::Flag (_flags & ~Empty);
_flags = Source::Flag (_flags & ~Missing); _flags = Source::Flag (_flags & ~Missing);
if (_model && !Evoral::SMF::is_meta (ev.buffer(), ev.size())) {
const Evoral::Event<Temporal::Beats> beat_ev (ev.event_type(),
ev_time_beats,
ev.size(),
const_cast<uint8_t*>(ev.buffer()));
_model->append (beat_ev, event_id);
}
assert (!_length || (_length.time_domain() == Temporal::BeatTime));
_length = timepos_t (max (_length.beats(), ev_time_beats));
}
} }
XMLNode& XMLNode&