#include <set>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
-#include "pbd/basename.h"
#include "pbd/xml++.h"
-#include "pbd/enumwriter.h"
+#include "pbd/basename.h"
#include "ardour/automation_control.h"
-#include "ardour/dB.h"
-#include "ardour/gain.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_source.h"
-#include "ardour/playlist.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
+#include "ardour/tempo.h"
#include "ardour/types.h"
#include "i18n.h"
namespace ARDOUR {
namespace Properties {
PBD::PropertyDescriptor<void*> midi_data;
+ PBD::PropertyDescriptor<Evoral::MusicalTime> start_beats;
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::start_beats.property_id = g_quark_from_static_string (X_("start-beats"));
+ DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for start-beats = %1\n", Properties::start_beats.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 ()
{
+ add_property (_start_beats);
add_property (_length_beats);
}
/* Basic MidiRegion constructor (many channels) */
MidiRegion::MidiRegion (const SourceList& srcs)
: Region (srcs)
+ , _start_beats (Properties::start_beats, 0)
, _length_beats (Properties::length_beats, midi_source(0)->length_beats())
{
register_properties ();
MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other)
: Region (other)
+ , _start_beats (Properties::start_beats, other->_start_beats)
, _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0)
{
update_length_beats ();
model_changed ();
}
-/** Create a new MidiRegion, that is part of an existing one */
+/** Create a new MidiRegion that is part of an existing one */
MidiRegion::MidiRegion (boost::shared_ptr<const MidiRegion> other, frameoffset_t offset)
: Region (other, offset)
+ , _start_beats (Properties::start_beats, (Evoral::MusicalTime) 0)
, _length_beats (Properties::length_beats, (Evoral::MusicalTime) 0)
{
BeatsFramesConverter bfc (_session.tempo_map(), _position);
Evoral::MusicalTime const offset_beats = bfc.from (offset);
+ _start_beats = other->_start_beats + offset_beats;
_length_beats = other->_length_beats - offset_beats;
register_properties ();
/** Create a new MidiRegion that has its own version of some/all of the Source used by another.
*/
boost::shared_ptr<MidiRegion>
-MidiRegion::clone () const
+MidiRegion::clone (string path) const
{
BeatsFramesConverter bfc (_session.tempo_map(), _position);
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);
+ boost::shared_ptr<MidiSource> ms = midi_source(0)->clone (path, bbegin, bend);
PropertyList plist;
- plist.add (Properties::name, ms->name());
+ plist.add (Properties::name, PBD::basename_nosuffix (ms->name()));
plist.add (Properties::whole_file, true);
plist.add (Properties::start, _start);
+ plist.add (Properties::start_beats, _start_beats);
plist.add (Properties::length, _length);
plist.add (Properties::length_beats, _length_beats);
plist.add (Properties::layer, 0);
void
MidiRegion::post_set (const PropertyChange& pc)
{
+ Region::post_set (pc);
+
if (pc.contains (Properties::length) && !pc.contains (Properties::length_beats)) {
update_length_beats ();
+ } else if (pc.contains (Properties::start) && !pc.contains (Properties::start_beats)) {
+ set_start_beats_from_start_frames ();
}
}
+void
+MidiRegion::set_start_beats_from_start_frames ()
+{
+ BeatsFramesConverter c (_session.tempo_map(), _position - _start);
+ _start_beats = c.from (_start);
+}
+
void
MidiRegion::set_length_internal (framecnt_t len)
{
update_length_beats ();
}
+void
+MidiRegion::update_after_tempo_map_change ()
+{
+ Region::update_after_tempo_map_change ();
+
+ /* _position has now been updated for the new tempo map */
+ _start = _position - _session.tempo_map().framepos_minus_beats (_position, _start_beats);
+
+ send_change (Properties::start);
+}
+
void
MidiRegion::update_length_beats ()
{
src->set_note_mode(mode);
/*
- cerr << "MR read @ " << position << " * " << to_read
+ cerr << "MR " << name () << " read @ " << position << " * " << to_read
<< " _position = " << _position
<< " _start = " << _start
<< " intoffset = " << internal_offset
return midi_source()->model();
}
-int
-MidiRegion::exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&)
-{
- return -1;
-}
-
boost::shared_ptr<MidiSource>
MidiRegion::midi_source (uint32_t n) const
{
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());
+ Glib::Threads::Mutex::Lock lm (midi_source(0)->mutex());
midi_source(0)->invalidate ();
}
model()->insert_silence_at_start (c.from (-_start));
_start = 0;
+ _start_beats = 0;
}
/** Transpose the notes in this region by a given number of semitones */
BeatsFramesConverter c (_session.tempo_map(), _start);
model()->transpose (c.from (_start), c.from (_start + _length), semitones);
}
+
+void
+MidiRegion::set_start_internal (framecnt_t s)
+{
+ Region::set_start_internal (s);
+ set_start_beats_from_start_frames ();
+}
projects / ardour.git / blobdiff