summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_region_view.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-08-10 20:55:27 +0000
committerDavid Robillard <d@drobilla.net>2007-08-10 20:55:27 +0000
commitf32a6d0f040be35104d692e1503b99e8f31ff911 (patch)
tree697a8aad8be51999fb2168a492e2a98e41280774 /gtk2_ardour/midi_region_view.h
parent1ead67fbd7a8990064df7c0b35d10b19d9970d46 (diff)
Fix some evil "tabs".
Switch canvas cursor for MIDI tools. Fix delete tool bug (touch delete always on). git-svn-id: svn://localhost/ardour2/trunk@2287 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_region_view.h')
-rw-r--r--gtk2_ardour/midi_region_view.h22
1 files changed, 6 insertions, 16 deletions
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index a625fdeff3..a15ce31e92 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -97,27 +97,16 @@ class MidiRegionView : public RegionView
if (!_delta_command)
_delta_command = _model->new_delta_command();
}
-
- void command_remove_note(ArdourCanvas::CanvasMidiEvent* ev) {
- if (_delta_command && ev->note()) {
- _delta_command->remove(*ev->note());
- ev->selected(true);
- }
- }
void command_add_note(ARDOUR::MidiModel::Note& note) {
- if (_delta_command) {
+ if (_delta_command)
_delta_command->add(note);
- }
}
- void note_entered(ArdourCanvas::CanvasMidiEvent* ev) {
- if (ev->note() && _mouse_state == EraseTouchDragging) {
- start_delta_command();
- ev->selected(true);
+ void command_remove_note(ArdourCanvas::CanvasMidiEvent* ev) {
+ if (_delta_command && ev->note()) {
_delta_command->remove(*ev->note());
- } else if (_mouse_state == SelectTouchDragging) {
- note_selected(ev, true);
+ ev->selected(true);
}
}
@@ -134,7 +123,8 @@ class MidiRegionView : public RegionView
}
midi_view()->midi_track()->diskstream()->playlist_modified();
}
-
+
+ void note_entered(ArdourCanvas::CanvasMidiEvent* ev);
void unique_select(ArdourCanvas::CanvasMidiEvent* ev);
void note_selected(ArdourCanvas::CanvasMidiEvent* ev, bool add);
void note_deselected(ArdourCanvas::CanvasMidiEvent* ev, bool add);