From 3705a2d6307cf443acbf8419b0e0f560591f2016 Mon Sep 17 00:00:00 2001 From: Hans Baier Date: Wed, 28 Jan 2009 04:55:31 +0000 Subject: * MIDI control lanes: Set Interpolationtype according to Parameter git-svn-id: svn://localhost/ardour2/branches/3.0@4452 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/smf_source.cc | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'libs/ardour/smf_source.cc') diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 9caf005833..cc521336e3 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -241,8 +241,9 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt) append_event_unlocked(Frames, ev); - if (_model) + if (_model) { _model->append(ev); + } } SMF::flush(); @@ -601,14 +602,18 @@ SMFSource::set_source_name (string newname, bool destructive) void SMFSource::load_model(bool lock, bool force_reload) { - if (_writing) + if (_writing) { return; + } + - if (lock) + if (lock) { Glib::Mutex::Lock lm (_lock); + } - if (_model && !force_reload && !_model->empty()) + if (_model && !force_reload && !_model->empty()) { return; + } if (! _model) { _model = boost::shared_ptr(new MidiModel(this)); @@ -648,10 +653,18 @@ SMFSource::load_model(bool lock, bool force_reload) _model->append(ev); } - if (ev.size() > scratch_size) + if (ev.size() > scratch_size) { scratch_size = ev.size(); - else + } else { ev.size() = scratch_size; + } + } + + // set interpolation style to defaults, can be changed by the GUI later + Evoral::ControlSet::Controls controls = _model->controls(); + for (Evoral::ControlSet::Controls::iterator c = controls.begin(); c != controls.end(); ++c) { + (*c).second->list()->set_interpolation( + EventTypeMap::instance().interpolation_of((*c).first)); } _model->end_write(false); -- cgit v1.2.3