#include "midi_time_axis.h"
#include "simpleline.h"
#include "canvas-hit.h"
+#include "canvas-note.h"
+#include "canvas-program-change.h"
#include "public_editor.h"
#include "ghostregion.h"
#include "midi_time_axis.h"
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color)
: RegionView (parent, tv, r, spu, basic_color)
+ , _force_channel(-1)
+ , _last_channel_selection(0xFFFF)
, _default_note_length(0.0)
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*parent))
, _mouse_state(None)
, _pressed_button(0)
{
- group->lower_to_bottom();
_note_group->raise_to_top();
-
- frame->property_fill_color_rgba() = 0xff000033;
}
MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, boost::shared_ptr<MidiRegion> r, double spu, Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility)
- : RegionView (parent, tv, r, spu, basic_color, visibility)
+ : RegionView (parent, tv, r, spu, basic_color, false, visibility)
+ , _force_channel(-1)
+ , _last_channel_selection(0xFFFF)
, _default_note_length(0.0)
, _active_notes(0)
, _note_group(new ArdourCanvas::Group(*parent))
, _delta_command(NULL)
, _mouse_state(None)
, _pressed_button(0)
+
{
_note_group->raise_to_top();
}
_model = midi_region()->midi_source(0)->model();
_enable_display = false;
- RegionView::init(basic_color, false);
+ RegionView::init (basic_color, false);
compute_colors (basic_color);
- reset_width_dependent_items ((double) _region->length() / samples_per_unit);
-
- set_y_position_and_height (0, trackview.height);
+ set_height (trackview.current_height());
region_muted ();
+ region_sync_changed ();
region_resized (BoundsChanged);
region_locked ();
-
- _region->StateChanged.connect (mem_fun(*this, &MidiRegionView::region_changed));
+
+ reset_width_dependent_items (_pixel_width);
+ //reset_width_dependent_items ((double) _region->length() / samples_per_unit);
set_colors ();
_enable_display = true;
-
if (_model) {
if (wfd) {
redisplay_model();
_model->ContentsChanged.connect(sigc::mem_fun(this, &MidiRegionView::redisplay_model));
}
- midi_region()->midi_source(0)->Switched.connect(sigc::mem_fun(this, &MidiRegionView::switch_source));
-
+ group->raise_to_top();
group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event), false);
+ midi_view()->signal_channel_mode_changed().connect(
+ mem_fun(this, &MidiRegionView::midi_channel_mode_changed));
}
bool
static double drag_start_x, drag_start_y;
static double last_x, last_y;
double event_x, event_y;
- nframes_t event_frame = 0;
+ nframes64_t event_frame = 0;
static ArdourCanvas::SimpleRect* drag_rect = NULL;
case GDK_BUTTON_PRESS:
if (_mouse_state != SelectTouchDragging &&
_mouse_state != EraseTouchDragging &&
- ev->button.button == 1 ) {
+ ev->button.button == 1) {
_pressed_button = ev->button.button;
_mouse_state = Pressed;
return true;
}
_pressed_button = ev->button.button;
- return false;
+ return true;
+
+ case GDK_2BUTTON_PRESS:
+ return true;
case GDK_ENTER_NOTIFY:
/* FIXME: do this on switch to note tool, too, if the pointer is already in */
if (_mouse_state == AddDragging)
event_x = trackview.editor.frame_to_pixel(event_frame);
- if (drag_rect)
+ if (drag_rect) {
if (event_x > drag_start_x)
drag_rect->property_x2() = event_x;
else
drag_rect->property_x1() = event_x;
+ }
if (drag_rect && _mouse_state == SelectRectDragging) {
if (event_y > drag_start_y)
group->ungrab(ev->button.time);
event_frame = trackview.editor.pixel_to_frame(event_x);
- if(_pressed_button != 1) {
+ if (_pressed_button != 1) {
return false;
}
break;
case MidiEditPencil:
create_note_at(event_x, event_y, _default_note_length);
- default:
- break;
+ default: break;
}
_mouse_state = None;
- return true;
+ break;
case SelectRectDragging: // Select drag done
_mouse_state = None;
delete drag_rect;
drag_rect = NULL;
- return true;
+ break;
case AddDragging: // Add drag done
_mouse_state = None;
if (drag_rect->property_x2() > drag_rect->property_x1() + 2) {
delete drag_rect;
drag_rect = NULL;
- return true;
- default:
- break;
+ default: break;
}
- default:
- break;
+ default: break;
}
return false;
assert(note >= 0.0);
assert(note <= 127.0);
- nframes_t new_note_time = trackview.editor.pixel_to_frame (x);
+ nframes64_t new_note_time = trackview.editor.pixel_to_frame (x);
assert(new_note_time >= 0);
new_note_time += _region->start();
double duration = m.frames_per_bar(t, trackview.session().frame_rate()) / m.beats_per_bar();
*/
- // we need to snap here again in nframes_t in order to be sample accurate
+ // we need to snap here again in nframes64_t in order to be sample accurate
// since note time is region-absolute but snap_to_frame expects position-relative
// time we have to coordinate transform back and forth here.
- nframes_t new_note_time_position_relative = new_note_time - _region->start();
+ nframes64_t new_note_time_position_relative = new_note_time - _region->start();
new_note_time = snap_to_frame(new_note_time_position_relative) + _region->start();
// we need to snap the duration too to be sample accurate
- nframes_t new_note_duration = nframes_t(duration);
+ nframes64_t new_note_duration = nframes_t(duration);
new_note_duration = snap_to_frame(new_note_time_position_relative + new_note_duration) + _region->start()
- new_note_time;
- const boost::shared_ptr<Note> new_note(new Note(0, new_note_time, new_note_duration, (uint8_t)note, 0x40));
+ const boost::shared_ptr<Evoral::Note> new_note(new Evoral::Note(
+ 0, new_note_time, new_note_duration, (uint8_t)note, 0x40));
view->update_bounds(new_note->note());
MidiModel::DeltaCommand* cmd = _model->new_delta_command("add note");
cmd->add(new_note);
- _model->apply_command(cmd);
-
- //add_note(new_note);
+ _model->apply_command(trackview.session(), cmd);
}
}
}
- for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i)
+ for (std::vector<CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i)
delete *i;
_events.clear();
+ _pgm_changes.clear();
}
if (_enable_display)
redisplay_model();
}
+
+
+void
+MidiRegionView::start_delta_command(string name)
+{
+ if (!_delta_command)
+ _delta_command = _model->new_delta_command(name);
+}
+
+void
+MidiRegionView::command_add_note(const boost::shared_ptr<Evoral::Note> note, bool selected)
+{
+ if (_delta_command)
+ _delta_command->add(note);
+
+ if (selected)
+ _marked_for_selection.insert(note);
+}
+
+void
+MidiRegionView::command_remove_note(ArdourCanvas::CanvasNoteEvent* ev)
+{
+ if (_delta_command && ev->note()) {
+ _delta_command->remove(ev->note());
+ }
+}
+
+void
+MidiRegionView::apply_command()
+{
+ if (!_delta_command) {
+ return;
+ }
+
+ // Mark all selected notes for selection when model reloads
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ _marked_for_selection.insert((*i)->note());
+ }
+
+ _model->apply_command(trackview.session(), _delta_command);
+ _delta_command = NULL;
+ midi_view()->midi_track()->diskstream()->playlist_modified();
+
+ _marked_for_selection.clear();
+}
+
+
+void
+MidiRegionView::abort_command()
+{
+ delete _delta_command;
+ _delta_command = NULL;
+ clear_selection();
+}
void
if (_model) {
clear_events();
- begin_write();
-
_model->read_lock();
-
- /*
- MidiModel::Notes notes = _model->notes();
- cerr << endl << "Model contains " << notes.size() << " Notes:" << endl;
- for(MidiModel::Notes::iterator i = notes.begin(); i != notes.end(); ++i) {
- Note note = *(*i).get();
- cerr << "MODEL: Note time: " << note.time() << " duration: " << note.duration()
- << " end-time: " << note.end_time()
- << " velocity: " << int(note.velocity())
- //<< " Note-on: " << note.on_event().
- //<< " Note-off: " << note.off_event()
+
+ /*MidiModel::Notes notes = _model->notes();
+ cerr << endl << _model->midi_source()->name() << " : redisplaying " << notes.size() << " notes:" << endl;
+ for (MidiModel::Notes::iterator i = notes.begin(); i != notes.end(); ++i) {
+ cerr << "NOTE time: " << (*i)->time()
+ << " pitch: " << int((*i)->note())
+ << " duration: " << (*i)->duration()
+ << " end-time: " << (*i)->end_time()
+ << " velocity: " << int((*i)->velocity())
<< endl;
}*/
- for (size_t i=0; i < _model->n_notes(); ++i) {
+ for (size_t i = 0; i < _model->n_notes(); ++i)
add_note(_model->note_at(i));
- }
- end_write();
+ // Draw program change 'flags'
+ for (Automatable::Controls::iterator control = _model->controls().begin();
+ control != _model->controls().end(); ++control) {
+ if (control->first.type() == MidiPgmChangeAutomation) {
+ Glib::Mutex::Lock list_lock (control->second->list()->lock());
+
+ for (AutomationList::const_iterator event = control->second->list()->begin();
+ event != control->second->list()->end(); ++event) {
+ Evoral::ControlIterator iter(control->second->list(), (*event)->when, (*event)->value);
+ boost::shared_ptr<Evoral::Event> event(new Evoral::Event());
+ _model->control_to_midi_event(event, iter);
+ add_pgm_change(event);
+ }
+ break;
+ }
+ }
+ // Is this necessary?
/*for (Automatable::Controls::const_iterator i = _model->controls().begin();
i != _model->controls().end(); ++i) {
RegionViewGoingAway (this); /* EMIT_SIGNAL */
- if (_active_notes)
+ if (_active_notes) {
end_write();
+ }
_selection.clear();
clear_events();
}
void
-MidiRegionView::set_y_position_and_height (double y, double h)
+MidiRegionView::set_height (gdouble height)
{
- RegionView::set_y_position_and_height(y, h - 1);
-
+ RegionView::set_height(height);
+
+ // FIXME: ick
+ height -= 2;
+
+ _height = height;
+
if (_enable_display) {
_model->read_lock();
- for (std::vector<CanvasMidiEvent*>::const_iterator i = _events.begin(); i != _events.end(); ++i) {
- CanvasNote* note = dynamic_cast<CanvasNote*>(*i);
- if (note && note->note()) {
- if (note->note()->note() < midi_stream_view()->lowest_note() ||
- note->note()->note() > midi_stream_view()->highest_note()) {
- if (canvas_item_visible(note)) {
- note->hide();
+ for (std::vector<CanvasNoteEvent*>::const_iterator i = _events.begin(); i != _events.end(); ++i) {
+ CanvasNoteEvent* event = *i;
+ Item* item = dynamic_cast<Item*>(event);
+ assert(item);
+ if (event && event->note()) {
+ if (event->note()->note() < midi_stream_view()->lowest_note() ||
+ event->note()->note() > midi_stream_view()->highest_note()) {
+
+ if (canvas_item_visible(item)) {
+ item->hide();
}
- }
- else {
- const double y1 = midi_stream_view()->note_to_y(note->note()->note());
- const double y2 = y1 + floor(midi_stream_view()->note_height());
-
- if (!canvas_item_visible(note)) {
- note->show();
+ } else {
+ if (!canvas_item_visible(item)) {
+ item->show();
}
- note->hide_velocity();
- note->property_y1() = y1;
- note->property_y2() = y2;
- if(note->selected()) {
- note->show_velocity();
+ event->hide_velocity();
+ if (CanvasNote* note = dynamic_cast<CanvasNote*>(event)) {
+ const double y1 = midi_stream_view()->note_to_y(event->note()->note());
+ const double y2 = y1 + floor(midi_stream_view()->note_height());
+
+ note->property_y1() = y1;
+ note->property_y2() = y2;
+ }
+ if (CanvasHit* hit = dynamic_cast<CanvasHit*>(event)) {
+ double x = trackview.editor.frame_to_pixel((nframes64_t)
+ event->note()->time() - _region->start());
+ const double diamond_size = midi_stream_view()->note_height() / 2.0;
+ double y = midi_stream_view()->note_to_y(event->note()->note())
+ + ((diamond_size-2.0) / 4.0);
+
+ hit->set_height(diamond_size);
+ hit->move(x-hit->x1(), y-hit->y1());
+ hit->show();
+ }
+ if (event->selected()) {
+ event->show_velocity();
+ }
}
}
}
- }
_model->read_unlock();
}
ghost->set_duration (_region->length() / samples_per_unit);
ghosts.push_back (ghost);
- for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+ for (std::vector<CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
if ((note = dynamic_cast<CanvasNote*>(*i)) != 0) {
ghost->add_note(note);
}
{
assert(!_active_notes);
_active_notes = new CanvasNote*[128];
- for (unsigned i=0; i < 128; ++i)
+ for (unsigned i=0; i < 128; ++i) {
_active_notes[i] = NULL;
+ }
}
return;
if (_active_notes && _active_notes[note]) {
- _active_notes[note]->property_x2() = trackview.editor.frame_to_pixel((nframes_t)end_time);
+ _active_notes[note]->property_x2() = trackview.editor.frame_to_pixel((nframes64_t)end_time);
_active_notes[note]->property_outline_what() = (guint32) 0xF; // all edges
_active_notes[note] = NULL;
}
void
MidiRegionView::extend_active_notes()
{
- if (!_active_notes)
+ if (!_active_notes) {
return;
+ }
- for (unsigned i=0; i < 128; ++i)
- if (_active_notes[i])
+ for (unsigned i=0; i < 128; ++i) {
+ if (_active_notes[i]) {
_active_notes[i]->property_x2() = trackview.editor.frame_to_pixel(_region->length());
+ }
+ }
}
* event arrives, to properly display the note.
*/
void
-MidiRegionView::add_note(const boost::shared_ptr<Note> note)
+MidiRegionView::add_note(const boost::shared_ptr<Evoral::Note> note)
{
assert(note->time() >= 0);
assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
// dont display notes beyond the region bounds
- if(
- note->time() - _region->start() >= _region->length() ||
- note->time() < _region->start() ||
- note->note() < midi_stream_view()->lowest_note() ||
- note->note() > midi_stream_view()->highest_note()
- ) {
+ if ( note->time() - _region->start() >= _region->length() ||
+ note->time() < _region->start() ||
+ note->note() < midi_stream_view()->lowest_note() ||
+ note->note() > midi_stream_view()->highest_note() ) {
return;
}
ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
- CanvasMidiEvent *event = 0;
+ CanvasNoteEvent* event = 0;
- const double x = trackview.editor.frame_to_pixel((nframes_t)note->time() - _region->start());
+ const double x = trackview.editor.frame_to_pixel((nframes64_t)note->time() - _region->start());
if (midi_view()->note_mode() == Sustained) {
- //cerr << "MRV::add_note sustained " << note->note() << " @ " << note->time()
- // << " .. " << note->end_time() << endl;
-
const double y1 = midi_stream_view()->note_to_y(note->note());
const double note_endpixel =
- trackview.editor.frame_to_pixel((nframes_t)note->end_time() - _region->start());
+ trackview.editor.frame_to_pixel((nframes64_t)note->end_time() - _region->start());
CanvasNote* ev_rect = new CanvasNote(*this, *group, note);
ev_rect->property_x1() = x;
ev_rect->property_x2() = trackview.editor.frame_to_pixel(_region->length());
ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height());
- ev_rect->property_fill_color_rgba() = note_fill_color(note->velocity());
- ev_rect->property_outline_color_rgba() = note_outline_color(note->velocity());
-
if (note->duration() == 0) {
- _active_notes[note->note()] = ev_rect;
+
+ if (_active_notes) {
+ assert(note->note() < 128);
+ // If this note is already active there's a stuck note,
+ // finish the old note rectangle
+ if (_active_notes[note->note()]) {
+ CanvasNote* const old_rect = _active_notes[note->note()];
+ boost::shared_ptr<Evoral::Note> old_note = old_rect->note();
+ cerr << "MidiModel: WARNING: Note has duration 0: chan " << old_note->channel()
+ << "note " << (int)old_note->note() << " @ " << old_note->time() << endl;
+ /* FIXME: How large to make it? Make it a diamond? */
+ old_rect->property_x2() = old_rect->property_x1() + 2.0;
+ old_rect->property_outline_what() = (guint32) 0xF;
+ }
+ _active_notes[note->note()] = ev_rect;
+ }
/* outline all but right edge */
ev_rect->property_outline_what() = (guint32) (0x1 & 0x4 & 0x8);
} else {
CanvasHit* ev_diamond = new CanvasHit(*this, *group, diamond_size, note);
ev_diamond->move(x, y);
ev_diamond->show();
- ev_diamond->property_fill_color_rgba() = note_fill_color(note->velocity());
- ev_diamond->property_outline_color_rgba() = note_outline_color(note->velocity());
_events.push_back(ev_diamond);
event = ev_diamond;
} else {
event = 0;
}
- if(event) {
- if(_marked_for_selection.find(event->note()) != _marked_for_selection.end()) {
- note_selected(event, true);
+ if (event) {
+ if (_marked_for_selection.find(note) != _marked_for_selection.end()) {
+ note_selected(event, true);
}
+ event->on_channel_selection_change(_last_channel_selection);
}
}
+void
+MidiRegionView::add_pgm_change(boost::shared_ptr<Evoral::Event> event)
+{
+ assert(event->time() >= 0);
+
+ // dont display notes beyond the region bounds
+ if (event->time() - _region->start() >= _region->length() || event->time() < _region->start())
+ return;
+
+ ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
+ const double x = trackview.editor.frame_to_pixel((nframes64_t)event->time() - _region->start());
+
+ double height = midi_stream_view()->contents_height();
+ _pgm_changes.push_back(
+ boost::shared_ptr<CanvasProgramChange>(
+ new CanvasProgramChange(*this, *group, event, height, x, 1.0)));
+}
+
void
MidiRegionView::delete_selection()
{
assert(_delta_command);
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
- if ((*i)->selected())
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ if ((*i)->selected()) {
_delta_command->remove((*i)->note());
+ }
+ }
_selection.clear();
}
void
-MidiRegionView::clear_selection_except(ArdourCanvas::CanvasMidiEvent* ev)
+MidiRegionView::clear_selection_except(ArdourCanvas::CanvasNoteEvent* ev)
{
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
- if ((*i)->selected() && (*i) != ev)
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ if ((*i)->selected() && (*i) != ev) {
(*i)->selected(false);
+ }
+ }
_selection.clear();
}
void
-MidiRegionView::unique_select(ArdourCanvas::CanvasMidiEvent* ev)
+MidiRegionView::unique_select(ArdourCanvas::CanvasNoteEvent* ev)
{
- for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i)
- if ((*i) != ev)
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
+ if ((*i) != ev) {
(*i)->selected(false);
+ }
+ }
_selection.clear();
_selection.insert(ev);
- if ( ! ev->selected())
+ if ( ! ev->selected()) {
ev->selected(true);
+ }
}
void
-MidiRegionView::note_selected(ArdourCanvas::CanvasMidiEvent* ev, bool add)
+MidiRegionView::note_selected(ArdourCanvas::CanvasNoteEvent* ev, bool add)
{
- if ( ! add)
+ if ( ! add) {
clear_selection_except(ev);
+ }
_selection.insert(ev);
- if ( ! ev->selected())
+ if ( ! ev->selected()) {
ev->selected(true);
+ }
}
void
-MidiRegionView::note_deselected(ArdourCanvas::CanvasMidiEvent* ev, bool add)
+MidiRegionView::note_deselected(ArdourCanvas::CanvasNoteEvent* ev, bool add)
{
- if ( ! add)
+ if ( ! add) {
clear_selection_except(ev);
+ }
_selection.erase(ev);
- if (ev->selected())
+ if (ev->selected()) {
ev->selected(false);
+ }
}
const double last_y = std::min(y1, y2);
const double y = std::max(y1, y2);
- // FIXME: so, so, so much slower than this should be
+ // TODO: Make this faster by storing the last updated selection rect, and only
+ // adjusting things that are in the area that appears/disappeared.
+ // We probably need a tree to be able to find events in O(log(n)) time.
+
+#ifndef NDEBUG
+ double last_x1 = 0.0;
+#endif
if (x1 < x2) {
- for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+ for (std::vector<CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+#ifndef NDEBUG
+ // Events should always be sorted by increasing x1() here
+ assert((*i)->x1() >= last_x1);
+ last_x1 = (*i)->x1();
+#endif
+ // Inside rectangle
if ((*i)->x1() >= x1 && (*i)->x1() <= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
- (*i)->selected(true);
- _selection.insert(*i);
- } else {
+ if (!(*i)->selected()) {
+ (*i)->selected(true);
+ _selection.insert(*i);
+ }
+ // Not inside rectangle
+ } else if ((*i)->selected()) {
(*i)->selected(false);
_selection.erase(*i);
}
}
} else {
- for (std::vector<CanvasMidiEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+ for (std::vector<CanvasNoteEvent*>::iterator i = _events.begin(); i != _events.end(); ++i) {
+#ifndef NDEBUG
+ // Events should always be sorted by increasing x1() here
+ assert((*i)->x1() >= last_x1);
+ last_x1 = (*i)->x1();
+#endif
+ // Inside rectangle
if ((*i)->x2() <= x1 && (*i)->x2() >= x2 && (*i)->y1() >= last_y && (*i)->y1() <= y) {
- (*i)->selected(true);
- _selection.insert(*i);
- } else {
+ if (!(*i)->selected()) {
+ (*i)->selected(true);
+ _selection.insert(*i);
+ }
+ // Not inside rectangle
+ } else if ((*i)->selected()) {
(*i)->selected(false);
_selection.erase(*i);
}
void
-MidiRegionView::note_dropped(CanvasMidiEvent* ev, double dt, uint8_t dnote)
+MidiRegionView::note_dropped(CanvasNoteEvent* ev, double dt, uint8_t dnote)
{
// TODO: This would be faster/nicer with a MoveCommand that doesn't need to copy...
if (_selection.find(ev) != _selection.end()) {
uint8_t highest_note_difference = 0;
// find highest and lowest notes first
- for (Selection::iterator i = _selection.begin(); i != _selection.end() ; ) {
- Selection::iterator next = i;
- ++next;
-
+ for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
uint8_t pitch = (*i)->note()->note();
lowest_note_in_selection = std::min(lowest_note_in_selection, pitch);
highest_note_in_selection = std::max(highest_note_in_selection, pitch);
-
- i = next;
}
/*
Selection::iterator next = i;
++next;
- const boost::shared_ptr<Note> copy(new Note(*(*i)->note().get()));
+ const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(*i)->note().get()));
- // we need to snap here again in nframes_t in order to be sample accurate
+ // we need to snap here again in nframes64_t in order to be sample accurate
double new_note_time = (*i)->note()->time();
new_note_time += dt;
// keep notes inside region if dragged beyond left region bound
- if(new_note_time < _region->start()) {
+ if (new_note_time < _region->start()) {
new_note_time = _region->start();
}
// since note time is region-absolute but snap_to_frame expects position-relative
// time we have to coordinate transform back and forth here.
- new_note_time = snap_to_frame(nframes_t(new_note_time) - _region->start()) + _region->start();
+ new_note_time = snap_to_frame(nframes64_t(new_note_time) - _region->start()) + _region->start();
copy->set_time(new_note_time);
clamp_0_to_127(new_pitch);
//notes which are dragged beyond the standard midi range snap back to their original place
- if((original_pitch != 0 && new_pitch == 0) || (original_pitch != 127 && new_pitch == 127)) {
+ if ((original_pitch != 0 && new_pitch == 0) || (original_pitch != 127 && new_pitch == 127)) {
new_pitch = original_pitch;
}
copy->set_note(new_pitch);
command_remove_note(*i);
- command_add_note(copy);
+ command_add_note(copy, true);
- _marked_for_selection.insert(copy);
i = next;
}
+
apply_command();
// care about notes being moved beyond the upper/lower bounds on the canvas
- if(lowest_note_in_selection < midi_stream_view()->lowest_note() ||
- highest_note_in_selection > midi_stream_view()->highest_note()
- ) {
+ if (lowest_note_in_selection < midi_stream_view()->lowest_note() ||
+ highest_note_in_selection > midi_stream_view()->highest_note()) {
midi_stream_view()->set_note_range(MidiStreamView::ContentsRange);
+ }
}
}
-}
-nframes_t
+nframes64_t
MidiRegionView::snap_to_frame(double x)
{
PublicEditor &editor = trackview.editor;
// x is region relative
// convert x to global frame
- nframes_t frame = editor.pixel_to_frame(x) + _region->position();
+ nframes64_t frame = editor.pixel_to_frame(x) + _region->position();
editor.snap_to(frame);
// convert event_frame back to local coordinates relative to position
frame -= _region->position();
return frame;
}
-nframes_t
-MidiRegionView::snap_to_frame(nframes_t x)
+nframes64_t
+MidiRegionView::snap_to_frame(nframes64_t x)
{
PublicEditor &editor = trackview.editor;
// x is region relative
// convert x to global frame
- nframes_t frame = x + _region->position();
+ nframes64_t frame = x + _region->position();
editor.snap_to(frame);
// convert event_frame back to local coordinates relative to position
frame -= _region->position();
double
MidiRegionView::get_position_pixels(void)
{
- nframes_t region_frame = get_position();
+ nframes64_t region_frame = get_position();
return trackview.editor.frame_to_pixel(region_frame);
}
CanvasNote *note = dynamic_cast<CanvasNote *> (*i);
// only insert CanvasNotes into the map
- if(note) {
+ if (note) {
NoteResizeData *resize_data = new NoteResizeData();
resize_data->canvas_note = note;
note->y2());
// calculate the colors: get the color settings
- uint fill_color =
+ uint32_t fill_color =
UINT_RGBA_CHANGE_A(
ARDOUR_UI::config()->canvasvar_MidiNoteSelectedOutline.get(),
128);
resize_data->resize_rect = resize_rect;
- if(note_end == CanvasNote::NOTE_ON) {
+ if (note_end == CanvasNote::NOTE_ON) {
resize_data->current_x = note->x1();
} else { // NOTE_OFF
resize_data->current_x = note->x2();
const double region_start = get_position_pixels();
- if(relative) {
+ if (relative) {
(*i)->current_x = (*i)->current_x + x;
} else {
// x is in track relative, transform it to region relative
double current_x = (*i)->current_x;
- if(note_end == CanvasNote::NOTE_ON) {
+ if (note_end == CanvasNote::NOTE_ON) {
resize_rect->property_x1() = snap_to_pixel(current_x);
resize_rect->property_x2() = canvas_note->x2();
} else {
start_delta_command(_("resize notes"));
for (std::vector<NoteResizeData *>::iterator i = _resize_data.begin(); i != _resize_data.end(); ++i) {
- CanvasNote *canvas_note = (*i)->canvas_note;
- SimpleRect *resize_rect = (*i)->resize_rect;
- double current_x = (*i)->current_x;
- const double position = get_position_pixels();
+ CanvasNote* canvas_note = (*i)->canvas_note;
+ SimpleRect* resize_rect = (*i)->resize_rect;
+ double current_x = (*i)->current_x;
+ const double position = get_position_pixels();
- if(!relative) {
+ if (!relative) {
// event_x is in track relative, transform it to region relative
current_x = event_x - position;
}
// because snapping works on world coordinates we have to transform current_x
// to world coordinates before snapping and transform it back afterwards
- nframes_t current_frame = snap_to_frame(current_x);
+ nframes64_t current_frame = snap_to_frame(current_x);
// transform to region start relative
current_frame += _region->start();
- const boost::shared_ptr<Note> copy(new Note(*(canvas_note->note().get())));
+ const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(canvas_note->note().get())));
// resize beginning of note
if (note_end == CanvasNote::NOTE_ON && current_frame < copy->end_time()) {
command_remove_note(canvas_note);
copy->on_event().time() = current_frame;
- command_add_note(copy);
- _marked_for_selection.insert(copy);
+ command_add_note(copy, _selection.find(canvas_note) != _selection.end());
}
// resize end of note
if (note_end == CanvasNote::NOTE_OFF && current_frame > copy->time()) {
- command_remove_note(canvas_note);
command_remove_note(canvas_note);
copy->off_event().time() = current_frame;
- command_add_note(copy);
- _marked_for_selection.insert(copy);
+ command_add_note(copy, _selection.find(canvas_note) != _selection.end());
}
delete resize_rect;
Selection::iterator next = i;
++next;
- CanvasMidiEvent *event = *i;
- const boost::shared_ptr<Note> copy(new Note(*(event->note().get())));
+ CanvasNoteEvent *event = *i;
+ const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(event->note().get())));
- if(relative) {
+ if (relative) {
uint8_t new_velocity = copy->velocity() + velocity;
clamp_0_to_127(new_velocity);
}
command_remove_note(event);
- command_add_note(copy);
+ command_add_note(copy, true);
- _marked_for_selection.insert(copy);
i = next;
}
- // dont keep notes selected if tweaking a single note
- if(_marked_for_selection.size() == 1) {
- _marked_for_selection.clear();
- }
-
apply_command();
}
Selection::iterator next = i;
++next;
- CanvasMidiEvent *event = *i;
- const boost::shared_ptr<Note> copy(new Note(*(event->note().get())));
+ CanvasNoteEvent *event = *i;
+ const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(event->note().get())));
copy->set_channel(channel);
command_remove_note(event);
- command_add_note(copy);
+ command_add_note(copy, true);
- _marked_for_selection.insert(copy);
i = next;
}
- // dont keep notes selected if tweaking a single note
- if(_marked_for_selection.size() == 1) {
- _marked_for_selection.clear();
- }
-
apply_command();
}
void
-MidiRegionView::note_entered(ArdourCanvas::CanvasMidiEvent* ev)
+MidiRegionView::note_entered(ArdourCanvas::CanvasNoteEvent* ev)
{
if (ev->note() && _mouse_state == EraseTouchDragging) {
start_delta_command(_("note entered"));
}
}
}
+
+void
+MidiRegionView::midi_channel_mode_changed(ChannelMode mode, uint16_t mask)
+{
+ switch (mode) {
+ case AllChannels:
+ case FilterChannels:
+ _force_channel = -1;
+ break;
+ case ForceChannel:
+ _force_channel = mask;
+ mask = 0xFFFF; // Show all notes as active (below)
+ };
+
+ // Update notes for selection
+ for (std::vector<ArdourCanvas::CanvasNoteEvent*>::iterator i = _events.begin();
+ i != _events.end(); ++i) {
+ (*i)->on_channel_selection_change(mask);
+ }
+
+ _last_channel_selection = mask;
+}
+
projects / ardour.git / blobdiff