diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-23 17:18:16 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-23 17:18:16 +0000 |
| commit | da6609a0776716afa047a198293ffbe15473ba86 (patch) | |
| tree | 70552b5942bb2897627e3478b67597e4c37dc50c /gtk2_ardour | |
| parent | 210f54bc09540710aa21317e4d08fb9cfe6b542e (diff) | |
make region trim keybinding work again; don't show quantize dialog if its not relevant (no MIDI regions selected
git-svn-id: svn://localhost/ardour2/branches/3.0@8076 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 27 | ||||
| -rw-r--r-- | gtk2_ardour/mnemonic-us.bindings.in | 4 |
2 files changed, 29 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 2396c362d1..1f5b53ddab 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3345,10 +3345,15 @@ Editor::trim_region (bool front) framepos_t where = get_preferred_edit_position(); RegionSelection rs = get_regions_from_selection_and_edit_point (); + cerr << "trim regions\n"; + if (rs.empty()) { + cerr << " no regions\n"; return; } + cerr << "where = " << where << endl; + begin_reversible_command (front ? _("trim front") : _("trim back")); for (list<RegionView*>::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) { @@ -4642,10 +4647,32 @@ Editor::fork_region () void Editor::quantize_region () { + int selected_midi_region_cnt = 0; + if (!_session) { return; } + RegionSelection rs = get_regions_from_selection_and_entered (); + + if (rs.empty()) { + return; + } + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { + RegionSelection::iterator tmp = r; + ++tmp; + + MidiRegionView* const mrv = dynamic_cast<MidiRegionView*> (*r); + if (mrv) { + selected_midi_region_cnt++; + } + } + + if (selected_midi_region_cnt == 0) { + return; + } + QuantizeDialog* qd = new QuantizeDialog (*this); qd->present (); diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in index 2f8e269009..8cc99fc225 100644 --- a/gtk2_ardour/mnemonic-us.bindings.in +++ b/gtk2_ardour/mnemonic-us.bindings.in @@ -186,8 +186,8 @@ This mode provides many different operations on both regions and control points, @wvis|Region/show-rhythm-ferret|<@WINDOW@>f|show rhythm ferret window @mmode|MouseMode/set-mouse-mode-gain|g|region gain mode @epp|Region/play-selected-regions|h|play selected region(s) -@eep|Editor/trim-front|j|trim front -@eep|Editor/trim-back|k|trim back +@eep|Region/trim-front|j|trim front +@eep|Region/trim-back|k|trim back @wvis|Common/ToggleKeyEditor|<@WINDOW@>k|toggle key bindings editor @trans|Transport/Loop|l|loop play (the loop range) @select|Editor/select-all-in-loop-range|<@PRIMARY@>l|select all in loop range |