diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 20:51:28 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 20:51:28 +0000 |
commit | 3ae28868ff02abf44102fff9954e7e8d6359867f (patch) | |
tree | 6202724eba77a9844d9079614c5ea91f91c110e5 /gtk2_ardour/canvas-note-event.cc | |
parent | 5eaf61242f16c7638c0e71a9c82af5a781c24e87 (diff) |
remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route
git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas-note-event.cc')
-rw-r--r-- | gtk2_ardour/canvas-note-event.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk2_ardour/canvas-note-event.cc b/gtk2_ardour/canvas-note-event.cc index 77ef7b263f..74632d7ddf 100644 --- a/gtk2_ardour/canvas-note-event.cc +++ b/gtk2_ardour/canvas-note-event.cc @@ -212,6 +212,12 @@ CanvasNoteEvent::base_color() bool CanvasNoteEvent::on_event(GdkEvent* ev) { + PublicEditor& editor (_region.get_time_axis_view().editor()); + + if (!editor.internal_editing()) { + return false; + } + MidiStreamView *streamview = _region.midi_stream_view(); static uint8_t drag_delta_note = 0; static double drag_delta_x = 0; @@ -220,13 +226,6 @@ 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) { - return false; - } - - const Editing::MidiEditMode midi_edit_mode - = _region.midi_view()->editor().current_midi_edit_mode(); - switch (ev->type) { case GDK_SCROLL: if (Keyboard::modifier_state_equals (ev->scroll.state, Keyboard::Level4Modifier)) { @@ -286,8 +285,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) switch (_state) { case Pressed: // Drag begin - if (midi_edit_mode == Editing::MidiEditSelect - && _region.mouse_state() != MidiRegionView::SelectTouchDragging) { + if (editor.current_mouse_mode() == Editing::MouseRange && _region.mouse_state() != MidiRegionView::SelectTouchDragging) { _item->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, Gdk::Cursor(Gdk::FLEUR), ev->motion.time); _state = Dragging; @@ -355,7 +353,7 @@ CanvasNoteEvent::on_event(GdkEvent* ev) switch (_state) { case Pressed: // Clicked - if (midi_edit_mode == Editing::MidiEditSelect) { + if (editor.current_mouse_mode() == Editing::MouseRange) { _state = None; if (_selected && !select_mod && _region.selection_size() > 1) { _region.unique_select(this); @@ -364,10 +362,12 @@ CanvasNoteEvent::on_event(GdkEvent* ev) } else { _region.note_selected(this, select_mod); } +#if 0 } else if (midi_edit_mode == Editing::MidiEditErase) { _region.start_delta_command(); _region.command_remove_note(this); _region.apply_command(); +#endif } return true; |