#include "ardour/session.h"
#include "ardour/types.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
* formality, until apply_command is called and ownership is taken.
*/
MidiModel::NoteDiffCommand*
-MidiModel::new_note_diff_command (const string name)
+MidiModel::new_note_diff_command (const string& name)
{
boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
assert (ms);
/** Start a new SysExDiff command */
MidiModel::SysExDiffCommand*
-MidiModel::new_sysex_diff_command (const string name)
+MidiModel::new_sysex_diff_command (const string& name)
{
boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
assert (ms);
/** Start a new PatchChangeDiff command */
MidiModel::PatchChangeDiffCommand*
-MidiModel::new_patch_change_diff_command (const string name)
+MidiModel::new_patch_change_diff_command (const string& name)
{
boost::shared_ptr<MidiSource> ms = _midi_source.lock ();
assert (ms);
void
MidiModel::apply_command(Session& session, Command* cmd)
{
- session.begin_reversible_command(cmd->name());
+ session.begin_reversible_command (cmd->name());
(*cmd)();
- session.commit_reversible_command(cmd);
- set_edited(true);
+ session.commit_reversible_command (cmd);
+ set_edited (true);
}
/** Apply a command as part of a larger reversible transaction
MidiModel::apply_command_as_subcommand(Session& session, Command* cmd)
{
(*cmd)();
- session.add_command(cmd);
- set_edited(true);
+ session.add_command (cmd);
+ set_edited (true);
}
/************** DIFF COMMAND ********************/
MidiModel::NoteDiffCommand::unmarshal_note (XMLNode *xml_note)
{
unsigned int note;
- XMLProperty* prop;
+ XMLProperty const * prop;
unsigned int channel;
MidiModel::TimeType time;
MidiModel::TimeType length;
MidiModel::NoteDiffCommand::NoteChange
MidiModel::NoteDiffCommand::unmarshal_change (XMLNode *xml_change)
{
- XMLProperty* prop;
+ XMLProperty const * prop;
NoteChange change;
change.note_id = 0;
MidiModel::SysExDiffCommand::Change
MidiModel::SysExDiffCommand::unmarshal_change (XMLNode *xml_change)
{
- XMLProperty* prop;
+ XMLProperty const * prop;
Change change;
if ((prop = xml_change->property ("property")) != 0) {
MidiModel::PatchChangePtr
MidiModel::PatchChangeDiffCommand::unmarshal_patch_change (XMLNode* n)
{
- XMLProperty* prop;
- XMLProperty* prop_id;
+ XMLProperty const * prop;
+ XMLProperty const * prop_id;
Evoral::event_id_t id = 0;
Evoral::Beats time = Evoral::Beats();
int channel = 0;
MidiModel::PatchChangeDiffCommand::Change
MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n)
{
- XMLProperty* prop;
+ XMLProperty const * prop;
Change c;
int an_int;
/* Invalidate and store active notes, which will be picked up by the iterator
on the next roll if time progresses linearly. */
- ms->invalidate(source_lock,
- ms->session().transport_rolling() ? &_active_notes : NULL);
+ ms->invalidate(source_lock);
ms->mark_streaming_midi_write_started (source_lock, note_mode());
bool
MidiModel::write_section_to (boost::shared_ptr<MidiSource> source,
const Glib::Threads::Mutex::Lock& source_lock,
- Evoral::Beats begin_time,
- Evoral::Beats end_time)
+ TimeType begin_time,
+ TimeType end_time,
+ bool offset_events)
{
ReadLock lock(read_lock());
MidiStateTracker mst;
source->mark_streaming_midi_write_started (source_lock, note_mode());
for (Evoral::Sequence<TimeType>::const_iterator i = begin(TimeType(), true); i != end(); ++i) {
- const Evoral::Event<Evoral::Beats>& ev (*i);
+ if (i->time() >= begin_time && i->time() < end_time) {
- if (ev.time() >= begin_time && ev.time() < end_time) {
+ Evoral::Event<TimeType> mev (*i, true); /* copy the event */
- const Evoral::MIDIEvent<Evoral::Beats>* mev =
- static_cast<const Evoral::MIDIEvent<Evoral::Beats>* > (&ev);
-
- if (!mev) {
- continue;
+ if (offset_events) {
+ mev.set_time(mev.time() - begin_time);
}
+ if (mev.is_note_off()) {
- if (mev->is_note_off()) {
-
- if (!mst.active (mev->note(), mev->channel())) {
+ if (!mst.active (mev.note(), mev.channel())) {
/* the matching note-on was outside the
time range we were given, so just
ignore this note-off.
continue;
}
- source->append_event_beats (source_lock, *i);
- mst.remove (mev->note(), mev->channel());
+ source->append_event_beats (source_lock, mev);
+ mst.remove (mev.note(), mev.channel());
- } else if (mev->is_note_on()) {
- mst.add (mev->note(), mev->channel());
- source->append_event_beats(source_lock, *i);
+ } else if (mev.is_note_on()) {
+ mst.add (mev.note(), mev.channel());
+ source->append_event_beats(source_lock, mev);
} else {
- source->append_event_beats(source_lock, *i);
+ source->append_event_beats(source_lock, mev);
}
}
}
+ if (offset_events) {
+ end_time -= begin_time;
+ }
mst.resolve_notes (*source, source_lock, end_time);
set_percussive(old_percussive);
Add currently active notes to _active_notes so we can restore them
if playback resumes at the same point after the edit. */
source_lock = new Glib::Threads::Mutex::Lock(ms->mutex());
- ms->invalidate(*source_lock,
- ms->session().transport_rolling() ? &_active_notes : NULL);
+ ms->invalidate(*source_lock);
}
return WriteLock(new WriteLockImpl(source_lock, _lock, _control_lock));
apply_command_as_subcommand (s->session(), c);
}
+
+ ContentsShifted (t.to_double());
}
void