void
MidiRegionView::init (Gdk::Color& basic_color, bool wfd)
{
- if (wfd)
+ if (wfd) {
midi_region()->midi_source(0)->load_model();
+ }
const Meter& m = trackview.session().tempo_map().meter_at(_region->position());
const Tempo& t = trackview.session().tempo_map().tempo_at(_region->position());
static ArdourCanvas::SimpleRect* drag_rect = NULL;
- if (trackview.editor.current_mouse_mode() != MouseNote)
+ if (trackview.editor().current_mouse_mode() != MouseNote)
return false;
// Mmmm, spaghetti
case GDK_KEY_PRESS:
if (ev->key.keyval == GDK_Delete && !delete_mod) {
delete_mod = true;
- original_mode = trackview.editor.current_midi_edit_mode();
- trackview.editor.set_midi_edit_mode(MidiEditErase);
+ original_mode = trackview.editor().current_midi_edit_mode();
+ trackview.editor().set_midi_edit_mode(MidiEditErase);
start_delta_command(_("erase notes"));
_mouse_state = EraseTouchDragging;
return true;
apply_command();
}
if (delete_mod) {
- trackview.editor.set_midi_edit_mode(original_mode);
+ trackview.editor().set_midi_edit_mode(original_mode);
_mouse_state = None;
delete_mod = false;
}
group->w2i(event_x, event_y);
// convert event_x to global frame
- event_frame = trackview.editor.pixel_to_frame(event_x) + _region->position();
- trackview.editor.snap_to(event_frame);
+ event_frame = trackview.editor().pixel_to_frame(event_x) + _region->position();
+ trackview.editor().snap_to(event_frame);
// convert event_frame back to local coordinates relative to position
event_frame -= _region->position();
case Pressed: // Drag start
// Select drag start
- if (_pressed_button == 1 && trackview.editor.current_midi_edit_mode() == MidiEditSelect) {
+ if (_pressed_button == 1 && trackview.editor().current_midi_edit_mode() == MidiEditSelect) {
group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
last_x = event_x;
return true;
// Add note drag start
- } else if (trackview.editor.current_midi_edit_mode() == MidiEditPencil) {
+ } else if (trackview.editor().current_midi_edit_mode() == MidiEditPencil) {
group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
last_x = event_x;
drag_start_y = event_y;
drag_rect = new ArdourCanvas::SimpleRect(*group);
- drag_rect->property_x1() = trackview.editor.frame_to_pixel(event_frame);
+ drag_rect->property_x1() = trackview.editor().frame_to_pixel(event_frame);
drag_rect->property_y1() = midi_stream_view()->note_to_y(midi_stream_view()->y_to_note(event_y));
drag_rect->property_x2() = event_x;
}
if (_mouse_state == AddDragging)
- event_x = trackview.editor.frame_to_pixel(event_frame);
+ event_x = trackview.editor().frame_to_pixel(event_frame);
if (drag_rect) {
if (event_x > drag_start_x)
event_y = ev->motion.y;
group->w2i(event_x, event_y);
group->ungrab(ev->button.time);
- event_frame = trackview.editor.pixel_to_frame(event_x);
+ event_frame = trackview.editor().pixel_to_frame(event_x);
if (_pressed_button != 1) {
return false;
switch (_mouse_state) {
case Pressed: // Clicked
- switch (trackview.editor.current_midi_edit_mode()) {
+ switch (trackview.editor().current_midi_edit_mode()) {
case MidiEditSelect:
case MidiEditResize:
clear_selection();
_mouse_state = None;
if (drag_rect->property_x2() > drag_rect->property_x1() + 2) {
const double x = drag_rect->property_x1();
- const double length = trackview.editor.pixel_to_frame(
+ const double length = trackview.editor().pixel_to_frame(
drag_rect->property_x2() - drag_rect->property_x1());
create_note_at(x, drag_rect->property_y1(), length);
assert(note >= 0.0);
assert(note <= 127.0);
- nframes64_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();
new_note_length = snap_to_frame(new_note_time_position_relative + new_note_length) + _region->start()
- new_note_time;
- const boost::shared_ptr<Evoral::Note> new_note(new Evoral::Note(
+ const boost::shared_ptr<NoteType> new_note(new NoteType(
0, new_note_time, new_note_length, (uint8_t)note, 0x40));
view->update_note_range(new_note->note());
}
void
-MidiRegionView::command_add_note(const boost::shared_ptr<Evoral::Note> note, bool selected)
+MidiRegionView::command_add_note(const boost::shared_ptr<NoteType> note, bool selected)
{
if (_delta_command)
_delta_command->add(note);
note->property_y1() = y1;
note->property_y2() = y2;
} else if (CanvasHit* hit = dynamic_cast<CanvasHit*>(event)) {
- double x = trackview.editor.frame_to_pixel((nframes64_t)
+ 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())
return;
if (_active_notes && _active_notes[note]) {
- _active_notes[note]->property_x2() = trackview.editor.frame_to_pixel((nframes64_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;
}
for (unsigned i=0; i < 128; ++i) {
if (_active_notes[i]) {
- _active_notes[i]->property_x2() = trackview.editor.frame_to_pixel(_region->length());
+ _active_notes[i]->property_x2() = trackview.editor().frame_to_pixel(_region->length());
}
}
}
void
-MidiRegionView::play_midi_note(boost::shared_ptr<Evoral::Note> note)
+MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
{
- if (!trackview.editor.is_midi_sound_notes_active()) {
- cerr << "not_active " << endl;
+ if (!trackview.editor().sound_notes()) {
return;
}
-
+
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
assert(route_ui);
route_ui->midi_track()->write_immediate_event(note->on_event().size(), note->on_event().buffer());
- Glib::Thread::create(bind(mem_fun(this, &MidiRegionView::play_midi_note_off), note), false);
-
+ nframes_t note_length_ms = (note->off_event().time() - note->on_event().time())
+ * (1000 / (double)route_ui->session().nominal_frame_rate());
+ Glib::signal_timeout().connect(bind(mem_fun(this, &MidiRegionView::play_midi_note_off), note),
+ note_length_ms, G_PRIORITY_DEFAULT);
}
-void
-MidiRegionView::play_midi_note_off(boost::shared_ptr<Evoral::Note> note)
+bool
+MidiRegionView::play_midi_note_off(boost::shared_ptr<NoteType> note)
{
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
assert(route_ui);
- Glib::usleep(
- (note->off_event().time() - note->on_event().time()) *
- (1000000 / route_ui->session().nominal_frame_rate())
- );
route_ui->midi_track()->write_immediate_event(note->off_event().size(), note->off_event().buffer());
+
+ return false;
}
* event arrives, to properly display the note.
*/
void
-MidiRegionView::add_note(const boost::shared_ptr<Evoral::Note> note)
+MidiRegionView::add_note(const boost::shared_ptr<NoteType> note)
{
assert(note->time() >= 0);
assert(midi_view()->note_mode() == Sustained || midi_view()->note_mode() == Percussive);
CanvasNoteEvent* event = 0;
- const double x = trackview.editor.frame_to_pixel((nframes64_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) {
const double y1 = midi_stream_view()->note_to_y(note->note());
const double note_endpixel =
- trackview.editor.frame_to_pixel((nframes64_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;
if (note->length() > 0)
ev_rect->property_x2() = note_endpixel;
else
- ev_rect->property_x2() = trackview.editor.frame_to_pixel(_region->length());
+ ev_rect->property_x2() = trackview.editor().frame_to_pixel(_region->length());
ev_rect->property_y2() = y1 + floor(midi_stream_view()->note_height());
if (note->length() == 0) {
// 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();
+ boost::shared_ptr<NoteType> old_note = old_rect->note();
cerr << "MidiModel: WARNING: Note has length 0: chan " << old_note->channel()
<< "note " << (int)old_note->note() << " @ " << old_note->time() << endl;
/* FIXME: How large to make it? Make it a diamond? */
event = 0;
}
- if (event) {
+ if (event) {
if (_marked_for_selection.find(note) != _marked_for_selection.end()) {
note_selected(event, true);
}
return;
ArdourCanvas::Group* const group = (ArdourCanvas::Group*)get_canvas_group();
- const double x = trackview.editor.frame_to_pixel((nframes64_t)program.time - _region->start());
+ const double x = trackview.editor().frame_to_pixel((nframes64_t)program.time - _region->start());
double height = midi_stream_view()->contents_height();
clear_selection_except(ev);
}
- _selection.insert(ev);
- play_midi_note(ev->note());
+ if (_selection.insert(ev).second) {
+ play_midi_note(ev->note());
+ }
if ( ! ev->selected()) {
ev->selected(true);
if (!(*i)->selected()) {
(*i)->selected(true);
_selection.insert(*i);
+ play_midi_note((*i)->note());
}
// Not inside rectangle
} else if ((*i)->selected()) {
if (!(*i)->selected()) {
(*i)->selected(true);
_selection.insert(*i);
+ play_midi_note((*i)->note());
}
// Not inside rectangle
} else if ((*i)->selected()) {
Selection::iterator next = i;
++next;
- const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(*i)->note().get()));
+ const boost::shared_ptr<NoteType> copy(new NoteType(*(*i)->note().get()));
// we need to snap here again in nframes64_t in order to be sample accurate
double new_note_time = (*i)->note()->time();
nframes64_t
MidiRegionView::snap_to_frame(double x)
{
- PublicEditor &editor = trackview.editor;
+ PublicEditor &editor = trackview.editor();
// x is region relative
// convert x to global frame
nframes64_t frame = editor.pixel_to_frame(x) + _region->position();
nframes64_t
MidiRegionView::snap_to_frame(nframes64_t x)
{
- PublicEditor &editor = trackview.editor;
+ PublicEditor &editor = trackview.editor();
// x is region relative
// convert x to global frame
nframes64_t frame = x + _region->position();
double
MidiRegionView::snap_to_pixel(double x)
{
- return (double) trackview.editor.frame_to_pixel(snap_to_frame(x));
+ return (double) trackview.editor().frame_to_pixel(snap_to_frame(x));
}
double
MidiRegionView::get_position_pixels()
{
nframes64_t region_frame = get_position();
- return trackview.editor.frame_to_pixel(region_frame);
+ return trackview.editor().frame_to_pixel(region_frame);
}
void
// transform to region start relative
current_frame += _region->start();
- const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(canvas_note->note().get())));
+ const boost::shared_ptr<NoteType> copy(new NoteType(*(canvas_note->note().get())));
// resize beginning of note
if (note_end == CanvasNote::NOTE_ON && current_frame < copy->end_time()) {
void
MidiRegionView::change_note_velocity(CanvasNoteEvent* event, int8_t velocity, bool relative)
{
- const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(event->note().get())));
+ const boost::shared_ptr<NoteType> copy(new NoteType(*(event->note().get())));
if (relative) {
uint8_t new_velocity = copy->velocity() + velocity;
for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
Selection::iterator next = i;
++next;
- change_note_velocity(*i, velocity, relative);
+ if ( !(*((*i)->note()) == *(ev->note())) ) {
+ change_note_velocity(*i, velocity, relative);
+ }
i = next;
}
++next;
CanvasNoteEvent* event = *i;
- const boost::shared_ptr<Evoral::Note> copy(new Evoral::Note(*(event->note().get())));
+ const boost::shared_ptr<NoteType> copy(new NoteType(*(event->note().get())));
copy->set_channel(channel);
projects / ardour.git / blobdiff