X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_track.cc;h=798bd1aef5da6e5df83bfd63c1feba3c065f44d1;hb=3ac47220a0ddd24a89ff6603934ac3b7b7613fe2;hp=f7294d8e3b2ac3443c27c4aff92142a261bd7f34;hpb=cb8abbe8d2f0e4dfe52bd35613ebba7689628eca;p=ardour.git diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index f7294d8e3b..798bd1aef5 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -29,27 +29,35 @@ #define isnan_local std::isnan #endif -#include "pbd/ffs.h" #include "pbd/enumwriter.h" -#include "pbd/convert.h" +#include "pbd/types_convert.h" #include "evoral/midi_util.h" +#include "ardour/amp.h" +#include "ardour/beats_samples_converter.h" #include "ardour/buffer_set.h" #include "ardour/debug.h" #include "ardour/delivery.h" +#include "ardour/disk_reader.h" +#include "ardour/disk_writer.h" +#include "ardour/event_type_map.h" #include "ardour/meter.h" -#include "ardour/midi_diskstream.h" #include "ardour/midi_playlist.h" #include "ardour/midi_port.h" +#include "ardour/midi_region.h" #include "ardour/midi_track.h" +#include "ardour/monitor_control.h" #include "ardour/parameter_types.h" #include "ardour/port.h" #include "ardour/processor.h" +#include "ardour/profile.h" +#include "ardour/route_group_specialized.h" #include "ardour/session.h" #include "ardour/session_playlists.h" +#include "ardour/types_convert.h" #include "ardour/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace ARDOUR { class InterThreadInfo; @@ -62,16 +70,16 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -MidiTrack::MidiTrack (Session& sess, string name, Route::Flag flag, TrackMode mode) - : Track (sess, name, flag, mode, DataType::MIDI) - , _immediate_events(1024) // FIXME: size? +MidiTrack::MidiTrack (Session& sess, string name, TrackMode mode) + : Track (sess, name, PresentationInfo::MidiTrack, mode, DataType::MIDI) + , _immediate_events(6096) // FIXME: size? + , _immediate_event_buffer(6096) , _step_edit_ring_buffer(64) // FIXME: size? - , _note_mode(Sustained) + , _note_mode (Sustained) , _step_editing (false) , _input_active (true) - , _playback_channel_mask(0x0000ffff) - , _capture_channel_mask(0x0000ffff) { + _session.SessionLoaded.connect_same_thread (*this, boost::bind (&MidiTrack::restore_controls, this)); } MidiTrack::~MidiTrack () @@ -87,73 +95,48 @@ MidiTrack::init () _input->changed.connect_same_thread (*this, boost::bind (&MidiTrack::track_input_active, this, _1, _2)); + _disk_writer->set_note_mode (_note_mode); + _disk_reader->reset_tracker (); + + _disk_writer->DataRecorded.connect_same_thread (*this, boost::bind (&MidiTrack::data_recorded, this, _1)); + return 0; } -boost::shared_ptr -MidiTrack::create_diskstream () +void +MidiTrack::data_recorded (boost::weak_ptr src) { - MidiDiskstream::Flag dflags = MidiDiskstream::Flag (MidiDiskstream::Recordable); - - assert(_mode != Destructive); - - return boost::shared_ptr (new MidiDiskstream (_session, name(), dflags)); + DataRecorded (src); /* EMIT SIGNAL */ } - -void -MidiTrack::set_record_enabled (bool yn, void *src) +bool +MidiTrack::can_be_record_safe () { if (_step_editing) { - return; + return false; } - Track::set_record_enabled (yn, src); + return Track::can_be_record_safe (); } -void -MidiTrack::set_diskstream (boost::shared_ptr ds) +bool +MidiTrack::can_be_record_enabled () { - /* We have to do this here, as Track::set_diskstream will cause a buffer refill, - and the diskstream must be set up to fill its buffers using the correct _note_mode. - */ - boost::shared_ptr mds = boost::dynamic_pointer_cast (ds); - mds->set_note_mode (_note_mode); - - Track::set_diskstream (ds); - - mds->reset_tracker (); - - _diskstream->set_track (this); - _diskstream->set_destructive (_mode == Destructive); - _diskstream->set_record_enabled (false); - - _diskstream_data_recorded_connection.disconnect (); - mds->DataRecorded.connect_same_thread ( - _diskstream_data_recorded_connection, - boost::bind (&MidiTrack::diskstream_data_recorded, this, _1)); - - DiskstreamChanged (); /* EMIT SIGNAL */ -} + if (_step_editing) { + return false; + } -boost::shared_ptr -MidiTrack::midi_diskstream() const -{ - return boost::dynamic_pointer_cast(_diskstream); + return Track::can_be_record_enabled (); } int MidiTrack::set_state (const XMLNode& node, int version) { - const XMLProperty *prop; - /* This must happen before Track::set_state(), as there will be a buffer fill during that call, and we must fill buffers using the correct _note_mode. */ - if ((prop = node.property (X_("note-mode"))) != 0) { - _note_mode = NoteMode (string_2_enum (prop->value(), _note_mode)); - } else { + if (!node.get_property (X_("note-mode"), _note_mode)) { _note_mode = Sustained; } @@ -164,25 +147,24 @@ MidiTrack::set_state (const XMLNode& node, int version) // No destructive MIDI tracks (yet?) _mode = Normal; - if ((prop = node.property ("input-active")) != 0) { - set_input_active (string_is_affirmative (prop->value())); + bool yn; + if (node.get_property ("input-active", yn)) { + set_input_active (yn); } ChannelMode playback_channel_mode = AllChannels; ChannelMode capture_channel_mode = AllChannels; - if ((prop = node.property ("playback-channel-mode")) != 0) { - playback_channel_mode = ChannelMode (string_2_enum(prop->value(), playback_channel_mode)); - } - if ((prop = node.property ("capture-channel-mode")) != 0) { - capture_channel_mode = ChannelMode (string_2_enum(prop->value(), capture_channel_mode)); - } - if ((prop = node.property ("channel-mode")) != 0) { + node.get_property ("playback-channel-mode", playback_channel_mode); + node.get_property ("capture-channel-mode", capture_channel_mode); + + if (node.get_property ("channel-mode", playback_channel_mode)) { /* 3.0 behaviour where capture and playback modes were not separated */ - playback_channel_mode = ChannelMode (string_2_enum(prop->value(), playback_channel_mode)); capture_channel_mode = playback_channel_mode; } + XMLProperty const * prop; + unsigned int playback_channel_mask = 0xffff; unsigned int capture_channel_mask = 0xffff; @@ -213,9 +195,9 @@ MidiTrack::set_state (const XMLNode& node, int version) } XMLNode& -MidiTrack::state(bool full_state) +MidiTrack::state(bool save_template) { - XMLNode& root (Track::state(full_state)); + XMLNode& root (Track::state (save_template)); XMLNode* freeze_node; char buf[64]; @@ -223,13 +205,12 @@ MidiTrack::state(bool full_state) XMLNode* inode; freeze_node = new XMLNode (X_("freeze-info")); - freeze_node->add_property ("playlist", _freeze_record.playlist->name()); - freeze_node->add_property ("state", enum_2_string (_freeze_record.state)); + freeze_node->set_property ("playlist", _freeze_record.playlist->name()); + freeze_node->set_property ("state", _freeze_record.state); for (vector::iterator i = _freeze_record.processor_info.begin(); i != _freeze_record.processor_info.end(); ++i) { inode = new XMLNode (X_("processor")); - (*i)->id.print (buf, sizeof(buf)); - inode->add_property (X_("id"), buf); + inode->set_property (X_("id"), id()); inode->add_child_copy ((*i)->state); freeze_node->add_child_nocopy (*inode); @@ -238,16 +219,24 @@ MidiTrack::state(bool full_state) root.add_child_nocopy (*freeze_node); } - root.add_property("playback_channel-mode", enum_2_string(get_playback_channel_mode())); - root.add_property("capture_channel-mode", enum_2_string(get_capture_channel_mode())); + root.set_property("playback-channel-mode", get_playback_channel_mode()); + root.set_property("capture-channel-mode", get_capture_channel_mode()); snprintf (buf, sizeof(buf), "0x%x", get_playback_channel_mask()); - root.add_property("playback-channel-mask", buf); + root.set_property("playback-channel-mask", std::string(buf)); snprintf (buf, sizeof(buf), "0x%x", get_capture_channel_mask()); - root.add_property("capture-channel-mask", buf); + root.set_property("capture-channel-mask", std::string(buf)); - root.add_property ("note-mode", enum_2_string (_note_mode)); - root.add_property ("step-editing", (_step_editing ? "yes" : "no")); - root.add_property ("input-active", (_input_active ? "yes" : "no")); + root.set_property ("note-mode", _note_mode); + root.set_property ("step-editing", _step_editing); + root.set_property ("input-active", _input_active); + + for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { + if (boost::dynamic_pointer_cast(c->second)) { + boost::shared_ptr ac = boost::dynamic_pointer_cast (c->second); + assert (ac); + root.add_child_nocopy (ac->get_state ()); + } + } return root; } @@ -256,8 +245,6 @@ void MidiTrack::set_state_part_two () { XMLNode* fnode; - XMLProperty* prop; - LocaleGuard lg (X_("POSIX")); /* This is called after all session state has been restored but before have been made ports and connections are established. @@ -276,20 +263,19 @@ MidiTrack::set_state_part_two () } _freeze_record.processor_info.clear (); - if ((prop = fnode->property (X_("playlist"))) != 0) { - boost::shared_ptr pl = _session.playlists->by_name (prop->value()); + std::string str; + if (fnode->get_property (X_("playlist"), str)) { + boost::shared_ptr pl = _session.playlists->by_name (str); if (pl) { _freeze_record.playlist = boost::dynamic_pointer_cast (pl); } else { _freeze_record.playlist.reset(); _freeze_record.state = NoFreeze; - return; + return; } } - if ((prop = fnode->property (X_("state"))) != 0) { - _freeze_record.state = FreezeState (string_2_enum (prop->value(), _freeze_record.state)); - } + fnode->get_property (X_("state"), _freeze_record.state); XMLNodeConstIterator citer; XMLNodeList clist = fnode->children(); @@ -299,138 +285,54 @@ MidiTrack::set_state_part_two () continue; } - if ((prop = (*citer)->property (X_("id"))) == 0) { + if (!(*citer)->get_property (X_("id"), str)) { continue; } FreezeRecordProcessorInfo* frii = new FreezeRecordProcessorInfo (*((*citer)->children().front()), boost::shared_ptr()); - frii->id = prop->value (); + frii->id = str; _freeze_record.processor_info.push_back (frii); } } - if (midi_diskstream ()) { - midi_diskstream()->set_block_size (_session.get_block_size ()); - } - return; } -/** @param need_butler to be set to true if this track now needs the butler, otherwise it can be left alone - * or set to false. - */ -int -MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) +void +MidiTrack::restore_controls () { - Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK); - if (!lm.locked()) { - boost::shared_ptr diskstream = midi_diskstream(); - framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes); - if (can_internal_playback_seek(llabs(playback_distance))) { - /* TODO should declick, and/or note-off */ - internal_playback_seek(playback_distance); - } - return 0; - } - - boost::shared_ptr diskstream = midi_diskstream(); - - if (n_outputs().n_total() == 0 && _processors.empty()) { - return 0; - } - - if (!_active) { - silence (nframes); - if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) { - _meter->reset(); + // TODO order events (CC before PGM to set banks) + for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { + boost::shared_ptr mctrl = boost::dynamic_pointer_cast(c->second); + if (mctrl) { + mctrl->restore_value(); } - return 0; - } - - framepos_t transport_frame = _session.transport_frame(); - - int dret; - framecnt_t playback_distance; - - if ((nframes = check_initial_delay (nframes, transport_frame)) == 0) { - /* need to do this so that the diskstream sets its - playback distance to zero, thus causing diskstream::commit - to do nothing. - */ - BufferSet bufs; /* empty set - is OK, since nothing will happen */ - - dret = diskstream->process (bufs, transport_frame, 0, playback_distance, false); - need_butler = diskstream->commit (playback_distance); - return dret; - } - - BufferSet& bufs = _session.get_route_buffers (n_process_buffers()); - - fill_buffers_with_input (bufs, _input, nframes); - - if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) { - _meter->run (bufs, start_frame, end_frame, nframes, true); } +} - /* filter captured data before the diskstream sees it */ - - filter_channels (bufs, get_capture_channel_mode(), get_capture_channel_mask()); - - _silent = false; - - if ((dret = diskstream->process (bufs, transport_frame, nframes, playback_distance, (monitoring_state() == MonitoringDisk))) != 0) { - need_butler = diskstream->commit (playback_distance); - silence (nframes); - return dret; - } - - /* filter playback data before we do anything else */ - - filter_channels (bufs, get_playback_channel_mode(), get_playback_channel_mask ()); - - if (monitoring_state() == MonitoringInput) { - - /* not actually recording, but we want to hear the input material anyway, - at least potentially (depending on monitoring options) - */ - - /* because the playback buffer is event based and not a - * continuous stream, we need to make sure that we empty - * it of events every cycle to avoid it filling up with events - * read from disk, while we are actually monitoring input - */ - - diskstream->flush_playback (start_frame, end_frame); - - } - - - /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */ - - write_out_of_band_data (bufs, start_frame, end_frame, nframes); - - /* final argument: don't waste time with automation if we're not recording or rolling */ - - process_output_buffers (bufs, start_frame, end_frame, nframes, - declick, (!diskstream->record_enabled() && !_session.transport_stopped())); - - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - boost::shared_ptr d = boost::dynamic_pointer_cast (*i); - if (d) { - d->flush_buffers (nframes); +void +MidiTrack::update_controls (BufferSet const& bufs) +{ + const MidiBuffer& buf = bufs.get_midi(0); + for (MidiBuffer::const_iterator e = buf.begin(); e != buf.end(); ++e) { + const Evoral::Event& ev = *e; + const Evoral::Parameter param = midi_parameter(ev.buffer(), ev.size()); + const boost::shared_ptr control = automation_control (param); + if (control) { + double old = control->get_double (false, 0); + control->set_double (ev.value(), 0, false); + if (old != ev.value()) { + control->Changed (false, Controllable::NoGroup); + } } } - - need_butler = diskstream->commit (playback_distance); - - return 0; } int -MidiTrack::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing) +MidiTrack::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool state_changing) { - int ret = Track::no_roll (nframes, start_frame, end_frame, state_changing); + int ret = Track::no_roll_unlocked (nframes, start_sample, end_sample, state_changing); if (ret == 0 && _step_editing) { push_midi_input_to_step_edit_ringbuffer (nframes); @@ -452,25 +354,54 @@ MidiTrack::realtime_locate () (*i)->realtime_locate (); } - midi_diskstream()->reset_tracker (); + _disk_reader->reset_tracker (); } void -MidiTrack::realtime_handle_transport_stopped () +MidiTrack::non_realtime_locate (samplepos_t pos) { - Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK); + Track::non_realtime_locate(pos); - if (!lm.locked ()) { + boost::shared_ptr playlist = _disk_writer->midi_playlist(); + if (!playlist) { return; } - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - (*i)->realtime_handle_transport_stopped (); + /* Get the top unmuted region at this position. */ + boost::shared_ptr region = boost::dynamic_pointer_cast( + playlist->top_unmuted_region_at(pos)); + if (!region) { + return; + } + + /* the source may be missing, but the control still referenced in the GUI */ + if (!region->midi_source() || !region->model()) { + return; + } + + Glib::Threads::Mutex::Lock lm (_control_lock, Glib::Threads::TRY_LOCK); + if (!lm.locked()) { + return; + } + + /* Update track controllers based on its "automation". */ + const samplepos_t origin = region->position() - region->start(); + BeatsSamplesConverter bfc(_session.tempo_map(), origin); + for (Controls::const_iterator c = _controls.begin(); c != _controls.end(); ++c) { + boost::shared_ptr tcontrol; + boost::shared_ptr rcontrol; + if ((tcontrol = boost::dynamic_pointer_cast(c->second)) && + (rcontrol = region->control(tcontrol->parameter()))) { + const Temporal::Beats pos_beats = bfc.from(pos - origin); + if (rcontrol->list()->size() > 0) { + tcontrol->set_value(rcontrol->list()->eval(pos_beats.to_double()), Controllable::NoGroup); + } + } } } void -MidiTrack::push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes) +MidiTrack::push_midi_input_to_step_edit_ringbuffer (samplecnt_t nframes) { PortSet& ports (_input->ports()); @@ -482,7 +413,7 @@ MidiTrack::push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes) for (MidiBuffer::const_iterator e = mb->begin(); e != mb->end(); ++e) { - const Evoral::MIDIEvent ev(*e, false); + const Evoral::Event ev(*e, false); /* note on, since for step edit, note length is determined elsewhere @@ -490,95 +421,89 @@ MidiTrack::push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes) if (ev.is_note_on()) { /* we don't care about the time for this purpose */ - _step_edit_ring_buffer.write (0, ev.type(), ev.size(), ev.buffer()); + _step_edit_ring_buffer.write (0, ev.event_type(), ev.size(), ev.buffer()); } } } } -void -MidiTrack::filter_channels (BufferSet& bufs, ChannelMode mode, uint32_t mask) +void +MidiTrack::snapshot_out_of_band_data (samplecnt_t nframes) { - if (mode == AllChannels) { + _immediate_event_buffer.clear (); + if (0 == _immediate_events.read_space()) { return; } - MidiBuffer& buf (bufs.get_midi (0)); - - for (MidiBuffer::iterator e = buf.begin(); e != buf.end(); ) { - - Evoral::MIDIEvent ev(*e, false); - - if (ev.is_channel_event()) { - switch (mode) { - case FilterChannels: - if (0 == ((1< 0); + + DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 has %2 of immediate events to deliver\n", + name(), _immediate_events.read_space())); + + /* write as many of the immediate events as we can, but give "true" as + * the last argument ("stop on overflow in destination") so that we'll + * ship the rest out next time. + * + * the Port::port_offset() + (nframes-1) argument puts all these events at the last + * possible position of the output buffer, so that we do not + * violate monotonicity when writing. Port::port_offset() will + * be non-zero if we're in a split process cycle. + */ + _immediate_events.read (_immediate_event_buffer, 0, 1, Port::port_offset() + nframes - 1, true); } void -MidiTrack::write_out_of_band_data (BufferSet& bufs, framepos_t /*start*/, framepos_t /*end*/, framecnt_t nframes) +MidiTrack::write_out_of_band_data (BufferSet& bufs, samplecnt_t nframes) const { MidiBuffer& buf (bufs.get_midi (0)); + buf.merge_from (_immediate_event_buffer, nframes); +} - // Append immediate events +int +MidiTrack::export_stuff (BufferSet& buffers, + samplepos_t start, + samplecnt_t nframes, + boost::shared_ptr endpoint, + bool include_endpoint, + bool for_export, + bool for_freeze) +{ + if (buffers.count().n_midi() == 0) { + return -1; + } - if (_immediate_events.read_space()) { + Glib::Threads::RWLock::ReaderLock rlock (_processor_lock); - DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 has %2 of immediate events to deliver\n", - name(), _immediate_events.read_space())); + boost::shared_ptr mpl = _disk_writer->midi_playlist(); + if (!mpl) { + return -2; + } - /* write as many of the immediate events as we can, but give "true" as - * the last argument ("stop on overflow in destination") so that we'll - * ship the rest out next time. - * - * the Port::port_offset() + (nframes-1) argument puts all these events at the last - * possible position of the output buffer, so that we do not - * violate monotonicity when writing. Port::port_offset() will - * be non-zero if we're in a split process cycle. - */ - _immediate_events.read (buf, 0, 1, Port::port_offset() + nframes - 1, true); + buffers.get_midi(0).clear(); + if (mpl->read(buffers.get_midi(0), start, nframes, 0) != nframes) { + return -1; } -} -int -MidiTrack::export_stuff (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framecnt_t /*nframes*/, - boost::shared_ptr /*endpoint*/, bool /*include_endpoint*/, bool /*for_export*/, bool /*for_freeze*/) -{ - return -1; + //bounce_process (buffers, start, nframes, endpoint, include_endpoint, for_export, for_freeze); + + return 0; } boost::shared_ptr -MidiTrack::bounce (InterThreadInfo& /*itt*/) +MidiTrack::bounce (InterThreadInfo& itt) { - std::cerr << "MIDI bounce currently unsupported" << std::endl; - return boost::shared_ptr (); + return bounce_range (_session.current_start_sample(), _session.current_end_sample(), itt, main_outs(), false); } - boost::shared_ptr -MidiTrack::bounce_range (framepos_t /*start*/, framepos_t /*end*/, InterThreadInfo& /*itt*/, - boost::shared_ptr /*endpoint*/, bool /*include_endpoint*/) +MidiTrack::bounce_range (samplepos_t start, + samplepos_t end, + InterThreadInfo& itt, + boost::shared_ptr endpoint, + bool include_endpoint) { - std::cerr << "MIDI bounce range currently unsupported" << std::endl; - return boost::shared_ptr (); + vector > srcs; + return _session.write_one_track (*this, start, end, false, srcs, itt, endpoint, include_endpoint, false, false); } void @@ -598,7 +523,7 @@ void MidiTrack::set_note_mode (NoteMode m) { _note_mode = m; - midi_diskstream()->set_note_mode(m); + _disk_writer->set_note_mode(m); } std::string @@ -631,8 +556,7 @@ MidiTrack::write_immediate_event(size_t size, const uint8_t* buf) cerr << "WARNING: Ignoring illegal immediate MIDI event" << endl; return false; } - const uint32_t type = midi_parameter_type(buf[0]); - return (_immediate_events.write (0, type, size, buf) == size); + return (_immediate_events.write (0, Evoral::MIDI_EVENT, size, buf) == size); } void @@ -643,6 +567,7 @@ MidiTrack::set_parameter_automation_state (Evoral::Parameter param, AutoState st case MidiPgmChangeAutomation: case MidiPitchBenderAutomation: case MidiChannelPressureAutomation: + case MidiNotePressureAutomation: case MidiSystemExclusiveAutomation: /* The track control for MIDI parameters is for immediate events to act as a control surface, write/touch for them is not currently @@ -654,19 +579,26 @@ MidiTrack::set_parameter_automation_state (Evoral::Parameter param, AutoState st } void -MidiTrack::MidiControl::set_value(double val) +MidiTrack::MidiControl::restore_value () +{ + actually_set_value (get_value(), Controllable::NoGroup); +} + +void +MidiTrack::MidiControl::actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override) { const Evoral::Parameter ¶meter = _list ? _list->parameter() : Control::parameter(); + const Evoral::ParameterDescriptor &desc = EventTypeMap::instance().descriptor(parameter); bool valid = false; if (isinf_local(val)) { cerr << "MIDIControl value is infinity" << endl; } else if (isnan_local(val)) { cerr << "MIDIControl value is NaN" << endl; - } else if (val < parameter.min()) { - cerr << "MIDIControl value is < " << parameter.min() << endl; - } else if (val > parameter.max()) { - cerr << "MIDIControl value is > " << parameter.max() << endl; + } else if (val < desc.lower) { + cerr << "MIDIControl value is < " << desc.lower << endl; + } else if (val > desc.upper) { + cerr << "MIDIControl value is > " << desc.upper << endl; } else { valid = true; } @@ -675,7 +607,7 @@ MidiTrack::MidiControl::set_value(double val) return; } - assert(val <= parameter.max()); + assert(val <= desc.upper); if ( ! _list || ! automation_playback()) { size_t size = 3; uint8_t ev[3] = { parameter.channel(), uint8_t (val), 0 }; @@ -698,6 +630,12 @@ MidiTrack::MidiControl::set_value(double val) ev[1] = int(val); break; + case MidiNotePressureAutomation: + ev[0] += MIDI_CMD_NOTE_PRESSURE; + ev[1] = parameter.id(); + ev[2] = int(val); + break; + case MidiPitchBenderAutomation: ev[0] += MIDI_CMD_BENDER; ev[1] = 0x7F & int(val); @@ -710,7 +648,7 @@ MidiTrack::MidiControl::set_value(double val) _route->write_immediate_event(size, ev); } - AutomationControl::set_value(val); + AutomationControl::actually_set_value(val, group_override); } void @@ -729,69 +667,45 @@ MidiTrack::set_step_editing (bool yn) boost::shared_ptr MidiTrack::write_source (uint32_t) { - return midi_diskstream()->write_source (); + return _disk_writer->midi_write_source (); } void -MidiTrack::set_playback_channel_mode(ChannelMode mode, uint16_t mask) +MidiTrack::set_playback_channel_mode(ChannelMode mode, uint16_t mask) { - ChannelMode old = get_playback_channel_mode (); - uint16_t old_mask = get_playback_channel_mask (); - - if (old != mode || mask != old_mask) { - _set_playback_channel_mode (mode, mask); - PlaybackChannelModeChanged (); - _session.set_dirty (); + if (_playback_filter.set_channel_mode(mode, mask)) { + _session.set_dirty(); } } void -MidiTrack::set_capture_channel_mode(ChannelMode mode, uint16_t mask) +MidiTrack::set_capture_channel_mode(ChannelMode mode, uint16_t mask) { - ChannelMode old = get_capture_channel_mode (); - uint16_t old_mask = get_capture_channel_mask (); - - if (old != mode || mask != old_mask) { - _set_capture_channel_mode (mode, mask); - CaptureChannelModeChanged (); - _session.set_dirty (); + if (_capture_filter.set_channel_mode(mode, mask)) { + _session.set_dirty(); } } void MidiTrack::set_playback_channel_mask (uint16_t mask) { - uint16_t old = get_playback_channel_mask(); - - if (old != mask) { - _set_playback_channel_mask (mask); - PlaybackChannelMaskChanged (); - _session.set_dirty (); + if (_playback_filter.set_channel_mask(mask)) { + _session.set_dirty(); } } void MidiTrack::set_capture_channel_mask (uint16_t mask) { - uint16_t old = get_capture_channel_mask(); - - if (old != mask) { - _set_capture_channel_mask (mask); - CaptureChannelMaskChanged (); - _session.set_dirty (); + if (_capture_filter.set_channel_mask(mask)) { + _session.set_dirty(); } } boost::shared_ptr MidiTrack::midi_playlist () { - return midi_diskstream()->midi_playlist (); -} - -void -MidiTrack::diskstream_data_recorded (boost::weak_ptr src) -{ - DataRecorded (src); /* EMIT SIGNAL */ + return boost::dynamic_pointer_cast (_playlists[DataType::MIDI]); } bool @@ -835,16 +749,10 @@ MidiTrack::track_input_active (IOChange change, void* /* src */) } } -boost::shared_ptr -MidiTrack::diskstream_factory (XMLNode const & node) -{ - return boost::shared_ptr (new MidiDiskstream (_session, node)); -} - boost::shared_ptr MidiTrack::get_gui_feed_buffer () const { - return midi_diskstream()->get_gui_feed_buffer (); + return _disk_writer->get_gui_feed_buffer (); } void @@ -860,14 +768,14 @@ MidiTrack::act_on_mute () /* If we haven't got a diskstream yet, there's nothing to worry about, and we can't call get_channel_mask() anyway. */ - if (!midi_diskstream()) { + if (!_disk_writer) { return; } - if (muted()) { + if (muted() || _mute_master->muted_by_others_soloing_at (MuteMaster::AllPoints)) { /* only send messages for channels we are using */ - uint16_t mask = get_playback_channel_mask(); + uint16_t mask = _playback_filter.get_channel_mask(); for (uint8_t channel = 0; channel <= 0xF; channel++) { @@ -876,39 +784,36 @@ MidiTrack::act_on_mute () DEBUG_TRACE (DEBUG::MidiIO, string_compose ("%1 delivers mute message to channel %2\n", name(), channel+1)); uint8_t ev[3] = { ((uint8_t) (MIDI_CMD_CONTROL | channel)), MIDI_CTL_SUSTAIN, 0 }; write_immediate_event (3, ev); - ev[1] = MIDI_CTL_ALL_NOTES_OFF; - write_immediate_event (3, ev); + + /* Note we do not send MIDI_CTL_ALL_NOTES_OFF here, since this may + silence notes that came from another non-muted track. */ } } + + /* Resolve active notes. */ + _disk_reader->resolve_tracker(_immediate_events, Port::port_offset()); } } - + void -MidiTrack::set_monitoring (MonitorChoice mc) -{ - if (mc != _monitoring) { - - Track::set_monitoring (mc); - - /* monitoring state changed, so flush out any on notes at the - * port level. - */ - - PortSet& ports (_output->ports()); - - for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) { - boost::shared_ptr mp = boost::dynamic_pointer_cast (*p); - if (mp) { - mp->require_resolve (); - } - } +MidiTrack::monitoring_changed (bool self, Controllable::GroupControlDisposition gcd) +{ + Track::monitoring_changed (self, gcd); + + /* monitoring state changed, so flush out any on notes at the + * port level. + */ - boost::shared_ptr md (midi_diskstream()); - - if (md) { - md->reset_tracker (); + PortSet& ports (_output->ports()); + + for (PortSet::iterator p = ports.begin(); p != ports.end(); ++p) { + boost::shared_ptr mp = boost::dynamic_pointer_cast (*p); + if (mp) { + mp->require_resolve (); } } + + _disk_reader->reset_tracker (); } MonitorState @@ -917,7 +822,19 @@ MidiTrack::monitoring_state () const MonitorState ms = Track::monitoring_state(); if (ms == MonitoringSilence) { return MonitoringInput; - } + } return ms; } +MonitorState +MidiTrack::get_auto_monitoring_state () const +{ + //if we are a midi track, we ignore auto_input, tape_mode, etc etc. "Auto" will monitor Disk+In + return MonitoringCue; +} + +void +MidiTrack::filter_input (BufferSet& bufs) +{ + _capture_filter.filter (bufs); +}