X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsmf_source.cc;h=76d379e9477b34df62deecee23f863245c237157;hb=1399ef391de5b05888ea2e13e6ff80f14b6e84d9;hp=8a956495a555d17f6d28c9ca506cb64d601bae12;hpb=4bc0d1c475f4f8c87b0fea690e5105d31337d6f4;p=ardour.git diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 8a956495a5..76d379e947 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -30,27 +30,29 @@ #include "pbd/stl_delete.h" #include "pbd/strsplit.h" -#include +#include "pbd/gstdio_compat.h" #include #include #include "evoral/Control.hpp" #include "evoral/SMF.hpp" +#include "ardour/debug.h" +#include "ardour/midi_channel_filter.h" #include "ardour/midi_model.h" #include "ardour/midi_ring_buffer.h" #include "ardour/midi_state_tracker.h" #include "ardour/parameter_types.h" #include "ardour/session.h" #include "ardour/smf_source.h" -#include "ardour/debug.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace Glib; using namespace PBD; using namespace Evoral; +using namespace std; /** Constructor used for new internal-to-session files. File cannot exist. */ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) @@ -58,6 +60,7 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) , MidiSource(s, path, flags) , FileSource(s, DataType::MIDI, path, string(), flags) , Evoral::SMF() + , _open (false) , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) , _smf_last_read_end (0) @@ -68,7 +71,7 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) if (init (_path, false)) { throw failed_constructor (); } - + assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); existence_check (); @@ -93,6 +96,7 @@ SMFSource::SMFSource (Session& s, const string& path) , MidiSource(s, path, Source::Flag (0)) , FileSource(s, DataType::MIDI, path, string(), Source::Flag (0)) , Evoral::SMF() + , _open (false) , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) , _smf_last_read_end (0) @@ -103,7 +107,7 @@ SMFSource::SMFSource (Session& s, const string& path) if (init (_path, true)) { throw failed_constructor (); } - + assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); existence_check (); @@ -124,6 +128,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) : Source(s, node) , MidiSource(s, node) , FileSource(s, node, must_exist) + , _open (false) , _last_ev_time_beats(0.0) , _last_ev_time_frames(0) , _smf_last_read_end (0) @@ -173,7 +178,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) return; } - if (open(_path)) { + if (open (_path)) { throw failed_constructor (); } @@ -197,13 +202,22 @@ SMFSource::open_for_write () return 0; } +void +SMFSource::close () +{ + /* nothing to do: file descriptor is never kept open */ +} + /** All stamps in audio frames */ framecnt_t -SMFSource::read_unlocked (Evoral::EventSink& destination, +SMFSource::read_unlocked (const Lock& lock, + Evoral::EventSink& destination, framepos_t const source_start, framepos_t start, framecnt_t duration, - MidiStateTracker* tracker) const + Evoral::Range* loop_range, + MidiStateTracker* tracker, + MidiChannelFilter* filter) const { int ret = 0; uint64_t time = 0; // in SMF ticks, 1 tick per _ppqn @@ -217,7 +231,6 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, // Output parameters for read_event (which will allocate scratch in buffer as needed) uint32_t ev_delta_t = 0; - uint32_t ev_type = 0; uint32_t ev_size = 0; uint8_t* ev_buffer = 0; @@ -225,7 +238,7 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, BeatsFramesConverter converter(_session.tempo_map(), source_start); - const uint64_t start_ticks = (uint64_t)(converter.from(start) * ppqn()); + const uint64_t start_ticks = converter.from(start).to_ticks(); DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: start in ticks %1\n", start_ticks)); if (_smf_last_read_end == 0 || start != _smf_last_read_end) { @@ -263,26 +276,25 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, continue; } - ev_type = midi_parameter_type(ev_buffer[0]); - - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked delta %1, time %2, buf[0] %3, type %4\n", - ev_delta_t, time, ev_buffer[0], ev_type)); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked delta %1, time %2, buf[0] %3\n", + ev_delta_t, time, ev_buffer[0])); assert(time >= start_ticks); /* Note that we add on the source start time (in session frames) here so that ev_frame_time is in session frames. */ - const framepos_t ev_frame_time = converter.to(time / (double)ppqn()) + source_start; + const framepos_t ev_frame_time = converter.to(Evoral::Beats::ticks_at_rate(time, ppqn())) + source_start; - if (ev_frame_time < start + duration) { - destination.write (ev_frame_time, ev_type, ev_size, ev_buffer); + if (loop_range) { + loop_range->squish (ev_frame_time); + } - if (tracker) { - if (ev_buffer[0] & MIDI_CMD_NOTE_ON) { - tracker->add (ev_buffer[1], ev_buffer[0] & 0xf); - } else if (ev_buffer[0] & MIDI_CMD_NOTE_OFF) { - tracker->remove (ev_buffer[1], ev_buffer[0] & 0xf); + if (ev_frame_time < start + duration) { + if (!filter || !filter->filter(ev_buffer, ev_size)) { + destination.write (ev_frame_time, Evoral::MIDI_EVENT, ev_size, ev_buffer); + if (tracker) { + tracker->track(ev_buffer); } } } else { @@ -299,12 +311,13 @@ SMFSource::read_unlocked (Evoral::EventSink& destination, } framecnt_t -SMFSource::write_unlocked (MidiRingBuffer& source, +SMFSource::write_unlocked (const Lock& lock, + MidiRingBuffer& source, framepos_t position, framecnt_t cnt) { if (!_writing) { - mark_streaming_write_started (); + mark_streaming_write_started (lock); } framepos_t time; @@ -318,7 +331,7 @@ SMFSource::write_unlocked (MidiRingBuffer& source, _model->start_write(); } - Evoral::MIDIEvent ev; + Evoral::Event ev; while (true) { /* Get the event time, in frames since session start but ignoring looping. */ bool ret; @@ -359,16 +372,16 @@ SMFSource::write_unlocked (MidiRingBuffer& source, break; } time -= position; - + ev.set(buf, size, time); - ev.set_event_type(midi_parameter_type(ev.buffer()[0])); + ev.set_event_type(Evoral::MIDI_EVENT); ev.set_id(Evoral::next_event_id()); if (!(ev.is_channel_event() || ev.is_smf_meta_event() || ev.is_sysex())) { continue; } - append_event_unlocked_frames(ev, position); + append_event_frames(lock, ev, position); } Evoral::SMF::flush (); @@ -377,22 +390,25 @@ SMFSource::write_unlocked (MidiRingBuffer& source, return cnt; } -/** Append an event with a timestamp in beats (double) */ +/** Append an event with a timestamp in beats */ void -SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) +SMFSource::append_event_beats (const Glib::Threads::Mutex::Lock& lock, + const Evoral::Event& ev) { if (!_writing || ev.size() == 0) { return; } - /*printf("SMFSource: %s - append_event_unlocked_beats ID = %d time = %lf, size = %u, data = ", +#if 0 + printf("SMFSource: %s - append_event_beats ID = %d time = %lf, size = %u, data = ", name().c_str(), ev.id(), ev.time(), ev.size()); - for (size_t i = 0; i < ev.size(); ++i) printf("%X ", ev.buffer()[i]); printf("\n");*/ + for (size_t i = 0; i < ev.size(); ++i) printf("%X ", ev.buffer()[i]); printf("\n"); +#endif - double time = ev.time(); + Evoral::Beats time = ev.time(); if (time < _last_ev_time_beats) { - const double difference = _last_ev_time_beats - time; - if (difference / (double)ppqn() < 1.0) { + const Evoral::Beats difference = _last_ev_time_beats - time; + if (difference.to_double() / (double)ppqn() < 1.0) { /* Close enough. This problem occurs because Sequence is not actually ordered due to fuzzy time comparison. I'm pretty sure this is inherently a bad idea which causes problems all over the @@ -401,7 +417,7 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) } else { /* Out of order by more than a tick. */ warning << string_compose(_("Skipping event with unordered beat time %1 < %2 (off by %3 beats, %4 ticks)"), - ev.time(), _last_ev_time_beats, difference, difference / (double)ppqn()) + ev.time(), _last_ev_time_beats, difference, difference.to_double() / (double)ppqn()) << endmsg; return; } @@ -421,8 +437,8 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) _length_beats = max(_length_beats, time); - const double delta_time_beats = time - _last_ev_time_beats; - const uint32_t delta_time_ticks = (uint32_t)lrint(delta_time_beats * (double)ppqn()); + const Evoral::Beats delta_time_beats = time - _last_ev_time_beats; + 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); _last_ev_time_beats = time; @@ -431,13 +447,15 @@ SMFSource::append_event_unlocked_beats (const Evoral::Event& ev) /** Append an event with a timestamp in frames (framepos_t) */ void -SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, framepos_t position) +SMFSource::append_event_frames (const Glib::Threads::Mutex::Lock& lock, + const Evoral::Event& ev, + framepos_t position) { if (!_writing || ev.size() == 0) { return; } - // printf("SMFSource: %s - append_event_unlocked_frames ID = %d time = %u, size = %u, data = ", + // printf("SMFSource: %s - append_event_frames ID = %d time = %u, size = %u, data = ", // name().c_str(), ev.id(), ev.time(), ev.size()); // for (size_t i=0; i < ev.size(); ++i) printf("%X ", ev.buffer()[i]); printf("\n"); @@ -449,8 +467,8 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, fr } BeatsFramesConverter converter(_session.tempo_map(), position); - const double ev_time_beats = converter.from(ev.time()); - Evoral::event_id_t event_id; + const Evoral::Beats ev_time_beats = converter.from(ev.time()); + Evoral::event_id_t event_id; if (ev.id() < 0) { event_id = Evoral::next_event_id(); @@ -459,18 +477,18 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event& ev, fr } if (_model) { - const Evoral::Event beat_ev (ev.event_type(), - ev_time_beats, - ev.size(), - const_cast(ev.buffer())); + const Evoral::Event beat_ev (ev.event_type(), + ev_time_beats, + ev.size(), + const_cast(ev.buffer())); _model->append (beat_ev, event_id); } _length_beats = max(_length_beats, ev_time_beats); - const Evoral::MusicalTime last_time_beats = converter.from (_last_ev_time_frames); - const Evoral::MusicalTime delta_time_beats = ev_time_beats - last_time_beats; - const uint32_t delta_time_ticks = (uint32_t)(lrint(delta_time_beats * (double)ppqn())); + const Evoral::Beats last_time_beats = converter.from (_last_ev_time_frames); + const Evoral::Beats delta_time_beats = ev_time_beats - last_time_beats; + 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); _last_ev_time_frames = ev.time(); @@ -481,7 +499,7 @@ XMLNode& SMFSource::get_state () { XMLNode& node = MidiSource::get_state(); - node.add_property (X_("origin"), _origin); + node.set_property (X_("origin"), _origin); return node; } @@ -504,33 +522,30 @@ SMFSource::set_state (const XMLNode& node, int version) } void -SMFSource::mark_streaming_midi_write_started (NoteMode mode) +SMFSource::mark_streaming_midi_write_started (const Lock& lock, NoteMode mode) { - /* CALLER MUST HOLD LOCK */ - if (!_open && open_for_write()) { error << string_compose (_("cannot open MIDI file %1 for write"), _path) << endmsg; /* XXX should probably throw or return something */ return; } - MidiSource::mark_streaming_midi_write_started (mode); + MidiSource::mark_streaming_midi_write_started (lock, mode); Evoral::SMF::begin_write (); - _last_ev_time_beats = 0.0; + _last_ev_time_beats = Evoral::Beats(); _last_ev_time_frames = 0; } void -SMFSource::mark_streaming_write_completed () +SMFSource::mark_streaming_write_completed (const Lock& lock) { - mark_midi_streaming_write_completed (Evoral::Sequence::DeleteStuckNotes); + mark_midi_streaming_write_completed (lock, Evoral::Sequence::DeleteStuckNotes); } void -SMFSource::mark_midi_streaming_write_completed (Evoral::Sequence::StuckNoteOption stuck_notes_option, Evoral::MusicalTime when) +SMFSource::mark_midi_streaming_write_completed (const Lock& lm, Evoral::Sequence::StuckNoteOption stuck_notes_option, Evoral::Beats when) { - Glib::Threads::Mutex::Lock lm (_lock); - MidiSource::mark_midi_streaming_write_completed (stuck_notes_option, when); + MidiSource::mark_midi_streaming_write_completed (lm, stuck_notes_option, when); if (!writable()) { warning << string_compose ("attempt to write to unwritable SMF file %1", _path) << endmsg; @@ -541,7 +556,7 @@ SMFSource::mark_midi_streaming_write_completed (Evoral::Sequenceset_edited(false); } - Evoral::SMF::end_write (); + Evoral::SMF::end_write (_path); /* data in the file now, not removable */ @@ -564,7 +579,7 @@ SMFSource::safe_midi_file_extension (const string& file) static bool compile = true; const int nmatches = 2; regmatch_t matches[nmatches]; - + if (Glib::file_test (file, Glib::FILE_TEST_EXISTS)) { if (!Glib::file_test (file, Glib::FILE_TEST_IS_REGULAR)) { /* exists but is not a regular file */ @@ -577,7 +592,7 @@ SMFSource::safe_midi_file_extension (const string& file) } else { compile = false; } - + if (regexec (&compiled_pattern, file.c_str(), nmatches, matches, 0)) { return false; } @@ -586,22 +601,18 @@ SMFSource::safe_midi_file_extension (const string& file) } static bool compare_eventlist ( - const std::pair< Evoral::Event*, gint >& a, - const std::pair< Evoral::Event*, gint >& b) { + const std::pair< const Evoral::Event*, gint >& a, + const std::pair< const Evoral::Event*, gint >& b) { return ( a.first->time() < b.first->time() ); } void -SMFSource::load_model (bool lock, bool force_reload) +SMFSource::load_model (const Glib::Threads::Mutex::Lock& lock, bool force_reload) { if (_writing) { return; } - boost::shared_ptr lm; - if (lock) - lm = boost::shared_ptr(new Glib::Threads::Mutex::Lock(_lock)); - if (_model && !force_reload) { return; } @@ -612,6 +623,8 @@ SMFSource::load_model (bool lock, bool force_reload) _model->clear(); } + invalidate(lock); + if (writable() && !_open) { return; } @@ -620,7 +633,7 @@ SMFSource::load_model (bool lock, bool force_reload) Evoral::SMF::seek_to_start(); uint64_t time = 0; /* in SMF ticks */ - Evoral::Event ev; + Evoral::Event ev; uint32_t scratch_size = 0; // keep track of scratch and minimize reallocs @@ -632,7 +645,7 @@ SMFSource::load_model (bool lock, bool force_reload) bool have_event_id; // TODO simplify event allocation - std::list< std::pair< Evoral::Event*, gint > > eventlist; + std::list< std::pair< Evoral::Event*, gint > > eventlist; for (unsigned i = 1; i <= num_tracks(); ++i) { if (seek_to_track(i)) continue; @@ -658,8 +671,7 @@ SMFSource::load_model (bool lock, bool force_reload) if (!have_event_id) { event_id = Evoral::next_event_id(); } - uint32_t event_type = midi_parameter_type(buf[0]); - double event_time = time / (double) ppqn(); + const Evoral::Beats event_time = Evoral::Beats::ticks_at_rate(time, ppqn()); #ifndef NDEBUG std::string ss; @@ -669,13 +681,13 @@ SMFSource::load_model (bool lock, bool force_reload) ss += b; } - DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF %6 load model delta %1, time %2, size %3 buf %4, type %5\n", - delta_t, time, size, ss , event_type, name())); + DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF %7 load model delta %1, time %2, size %3 buf %4, id %6\n", + delta_t, time, size, ss, event_id, name())); #endif eventlist.push_back(make_pair ( - new Evoral::Event ( - event_type, event_time, + new Evoral::Event ( + Evoral::MIDI_EVENT, event_time, size, buf, true) , event_id)); @@ -693,52 +705,56 @@ SMFSource::load_model (bool lock, bool force_reload) eventlist.sort(compare_eventlist); - std::list< std::pair< Evoral::Event*, gint > >::iterator it; + std::list< std::pair< Evoral::Event*, gint > >::iterator it; for (it=eventlist.begin(); it!=eventlist.end(); ++it) { _model->append (*it->first, it->second); delete it->first; } - _model->end_write (Evoral::Sequence::ResolveStuckNotes, _length_beats); + // cerr << "----SMF-SRC-----\n"; + // _playback_buf->dump (cerr); + // cerr << "----------------\n"; + + _model->end_write (Evoral::Sequence::ResolveStuckNotes, _length_beats); _model->set_edited (false); - invalidate(); + invalidate(lock); free(buf); } void -SMFSource::destroy_model () +SMFSource::destroy_model (const Glib::Threads::Mutex::Lock& lock) { //cerr << _name << " destroying model " << _model.get() << endl; _model.reset(); + invalidate(lock); } void -SMFSource::flush_midi () +SMFSource::flush_midi (const Lock& lock) { if (!writable() || _length_beats == 0.0) { return; } - ensure_disk_file (); + ensure_disk_file (lock); - Evoral::SMF::end_write (); + Evoral::SMF::end_write (_path); /* data in the file means its no longer removable */ mark_nonremovable (); - invalidate(); + invalidate(lock); } void SMFSource::set_path (const string& p) { FileSource::set_path (p); - SMF::set_path (_path); } /** Ensure that this source has some file on disk, even if it's just a SMF header */ void -SMFSource::ensure_disk_file () +SMFSource::ensure_disk_file (const Lock& lock) { if (!writable()) { return; @@ -750,8 +766,9 @@ SMFSource::ensure_disk_file () */ boost::shared_ptr mm = _model; _model.reset (); - mm->sync_to_source (); + mm->sync_to_source (lock); _model = mm; + invalidate(lock); } else { /* No model; if it's not already open, it's an empty source, so create and open it for writing. @@ -768,8 +785,6 @@ SMFSource::prevent_deletion () /* Unlike the audio case, the MIDI file remains mutable (because we can edit MIDI data) */ - + _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy)); } - -