diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-01-02 00:17:55 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-01-02 00:17:55 +0000 |
| commit | 042997e5ed35778c5309b6119ca1dcf8f696c3cc (patch) | |
| tree | f96471702eeeb27211afe7baf53fd3d3e230fa32 /gtk2_ardour/canvas-note-event.cc | |
| parent | 69ed2a3c2784ff5c02b68435bcb0c3f2b80e0b4b (diff) | |
Cleanups and a few comments.
git-svn-id: svn://localhost/ardour2/branches/3.0@4374 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-note-event.cc')
| -rw-r--r-- | gtk2_ardour/canvas-note-event.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc index 022787d6b9..326d502104 100644 --- a/gtk2_ardour/canvas-note-event.cc +++ b/gtk2_ardour/canvas-note-event.cc @@ -222,7 +222,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) bool select_mod; uint8_t d_velocity = 10; - if (_region.get_time_axis_view().editor.current_mouse_mode() != Editing::MouseNote) + if (_region.get_time_axis_view().editor().current_mouse_mode() != Editing::MouseNote) return false; switch (ev->type) { @@ -284,7 +284,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) switch (_state) { case Pressed: // Drag begin - if (_region.midi_view()->editor.current_midi_edit_mode() == Editing::MidiEditSelect + if (_region.midi_view()->editor().current_midi_edit_mode() == Editing::MidiEditSelect && _region.mouse_state() != MidiRegionView::SelectTouchDragging && _region.mouse_state() != MidiRegionView::EraseTouchDragging) { _item->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, @@ -356,7 +356,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) switch (_state) { case Pressed: // Clicked - if (_region.midi_view()->editor.current_midi_edit_mode() == Editing::MidiEditSelect) { + if (_region.midi_view()->editor().current_midi_edit_mode() == Editing::MidiEditSelect) { _state = None; if (_selected && !select_mod && _region.selection_size() > 1) @@ -365,7 +365,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) _region.note_deselected(this, select_mod); else _region.note_selected(this, select_mod); - } else if (_region.midi_view()->editor.current_midi_edit_mode() == Editing::MidiEditErase) { + } else if (_region.midi_view()->editor().current_midi_edit_mode() == Editing::MidiEditErase) { _region.start_delta_command(); _region.command_remove_note(this); _region.apply_command(); @@ -378,7 +378,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) if (_note) _region.note_dropped(this, - _region.midi_view()->editor.pixel_to_frame(abs(drag_delta_x)) + _region.midi_view()->editor().pixel_to_frame(abs(drag_delta_x)) * ((drag_delta_x < 0.0) ? -1 : 1), drag_delta_note); return true; |