diff options
| author | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2015-06-16 11:23:50 +0100 |
|---|---|---|
| committer | Colin Fletcher <colin.m.fletcher@googlemail.com> | 2015-06-17 17:15:21 +0100 |
| commit | b56bb944f6b48e8071f7b54bb60c777f5a66907d (patch) | |
| tree | 709299b4e151ef5b68925791e5d9a19195ed77ea /gtk2_ardour/editor_ops.cc | |
| parent | 721608aef31f1a57f806edfac93630c33845ba01 (diff) | |
Rename 'Cut time' to 'Remove time'
'Cut time' implies that the cut timeline items might end up on the
clipboard to be pasted somewhere: this isn't the case at present, so rename
the functions, class, &c. to say 'remove' rather than 'cut'.
Rename insert_time_dialog.{cc|h} to insert_remove_time_dialog while we're
at it.
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index fe4cf7ecad..2c44508b12 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -76,7 +76,7 @@ #include "editor_regions.h" #include "editor_routes.h" #include "gui_thread.h" -#include "insert_time_dialog.h" +#include "insert_remove_time_dialog.h" #include "interthread_progress_window.h" #include "item_counts.h" #include "keyboard.h" @@ -6926,7 +6926,7 @@ Editor::do_insert_time () return; } - InsertTimeDialog d (*this); + InsertRemoveTimeDialog d (*this); int response = d.run (); if (response != RESPONSE_OK) { @@ -7065,15 +7065,16 @@ Editor::insert_time ( commit_reversible_command (); } } + void -Editor::do_cut_time () +Editor::do_remove_time () { if (selection->tracks.empty()) { return; } framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE); - InsertTimeDialog d (*this, true); + InsertRemoveTimeDialog d (*this, true); int response = d.run (); @@ -7087,7 +7088,7 @@ Editor::do_cut_time () return; } - cut_time ( + remove_time ( pos, distance, SplitIntersected, @@ -7100,7 +7101,7 @@ Editor::do_cut_time () } void -Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, +Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too) { bool commit = false; |