namespace ARDOUR {
namespace Properties {
- PBD::PropertyDescriptor<void*> midi_data;
+ PBD::PropertyDescriptor<void*> midi_data;
+ PBD::PropertyDescriptor<Evoral::MusicalTime> length_beats;
}
}
{
Properties::midi_data.property_id = g_quark_from_static_string (X_("midi-data"));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for midi-data = %1\n", Properties::midi_data.property_id));
+ Properties::length_beats.property_id = g_quark_from_static_string (X_("length-beats"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for length-beats = %1\n", Properties::length_beats.property_id));
}
void
MidiRegion::register_properties ()
{
- /* none yet, but its only a matter of time */
+ add_property (_length_beats);
}
/* Basic MidiRegion constructor (many channels) */
MidiRegion::MidiRegion (const SourceList& srcs)
: Region (srcs)
+ , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0)
{
+ update_length_beats ();
register_properties ();
midi_source(0)->ModelChanged.connect_same_thread (_source_connection, boost::bind (&MidiRegion::model_changed, this));
/** Create a new MidiRegion, that is part of an existing one */
MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t offset, bool offset_relative)
: Region (other, offset, offset_relative)
+ , _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0)
{
+ update_length_beats ();
register_properties ();
assert(_name.val().find("/") == string::npos);
MidiRegion::clone ()
{
BeatsFramesConverter bfc (_session.tempo_map(), _position);
- double bbegin = bfc.from (_position);
- double bend = bfc.from (last_frame() + 1);
+ Evoral::MusicalTime const bbegin = bfc.from (_start);
+ Evoral::MusicalTime const bend = bfc.from (_start + _length);
boost::shared_ptr<MidiSource> ms = midi_source(0)->clone (bbegin, bend);
plist.add (Properties::name, ms->name());
plist.add (Properties::whole_file, true);
- plist.add (Properties::start, 0);
+ plist.add (Properties::start, _start);
plist.add (Properties::length, _length);
+ plist.add (Properties::length_beats, _length_beats);
plist.add (Properties::layer, 0);
return boost::dynamic_pointer_cast<MidiRegion> (RegionFactory::create (ms, plist, true));
}
void
-MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
+MidiRegion::set_length_internal (framecnt_t len)
{
- BeatsFramesConverter old_converter(_session.tempo_map(), _position - _start);
- double length_beats = old_converter.from(_length);
-
- Region::set_position_internal(pos, allow_bbt_recompute);
+ Region::set_length_internal (len);
+ update_length_beats ();
+}
- BeatsFramesConverter new_converter(_session.tempo_map(), pos - _start);
+void
+MidiRegion::update_length_beats ()
+{
+ cerr << name() << " Updating length beats, currently = " << _length_beats << " w/length = " << _length << endl;
+ BeatsFramesConverter converter (_session.tempo_map(), _position);
+ _length_beats = converter.from (_length);
+ cerr << "\tnew value: " << _length_beats << endl;
+}
- set_length(new_converter.to(length_beats), 0);
+void
+MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute)
+{
+ Region::set_position_internal (pos, allow_bbt_recompute);
+ /* zero length regions don't exist - so if _length_beats is zero, this object
+ is under construction.
+ */
+ if (_length_beats) {
+ /* leave _length_beats alone, and change _length to reflect the state of things
+ at the new position (tempo map may dictate a different number of frames
+ */
+ BeatsFramesConverter converter (_session.tempo_map(), _position - _start);
+ Region::set_length_internal (converter.to (_length_beats));
+ }
}
framecnt_t
-MidiRegion::read_at (Evoral::EventSink<nframes_t>& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const
+MidiRegion::read_at (Evoral::EventSink<framepos_t>& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode, MidiStateTracker* tracker) const
{
return _read_at (_sources, out, position, dur, chan_n, mode, tracker);
}
framecnt_t
-MidiRegion::master_read_at (MidiRingBuffer<nframes_t>& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode) const
+MidiRegion::master_read_at (MidiRingBuffer<framepos_t>& out, framepos_t position, framecnt_t dur, uint32_t chan_n, NoteMode mode) const
{
return _read_at (_master_sources, out, position, dur, chan_n, mode); /* no tracker */
}
framecnt_t
-MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink<nframes_t>& dst, framepos_t position, framecnt_t dur, uint32_t chan_n,
+MidiRegion::_read_at (const SourceList& /*srcs*/, Evoral::EventSink<framepos_t>& dst, framepos_t position, framecnt_t dur, uint32_t chan_n,
NoteMode mode, MidiStateTracker* tracker) const
{
frameoffset_t internal_offset = 0;
int
MidiRegion::set_state (const XMLNode& node, int version)
{
- return Region::set_state (node, version);
+ int ret = Region::set_state (node, version);
+
+ if (ret == 0) {
+ update_length_beats ();
+ }
+
+ return ret;
}
void
}
/* the source will have an iterator into the model, and that iterator will have been set up
- for a given set of filtered_paramters, so now that we've changed that list we must invalidate
+ for a given set of filtered_parameters, so now that we've changed that list we must invalidate
the iterator.
*/
Glib::Mutex::Lock lm (midi_source(0)->mutex());
midi_source(0)->invalidate ();
}
+
+/** This is called when a trim drag has resulted in a -ve _start time for this region.
+ * Fix it up by adding some empty space to the source.
+ */
+void
+MidiRegion::fix_negative_start ()
+{
+ BeatsFramesConverter c (_session.tempo_map(), _position);
+
+ model()->insert_silence_at_start (c.from (-_start));
+ _start = 0;
+}
projects / ardour.git / blobdiff