X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=116bc4571d28e2d3bd5ec78283c9a6f118cd6c50;hb=30d95bbb8c007bf4db96dff86eea9eff6c5eeab1;hp=68240871362cb21cf65749d4d3ea838d3eeb8757;hpb=c2fc7f04a7854d99e8a040ebdf52a6330bd4fe8f;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 6824087136..116bc4571d 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -49,6 +50,7 @@ #include "ardour/playlist_factory.h" #include "ardour/profile.h" #include "ardour/quantize.h" +#include "ardour/legatize.h" #include "ardour/region_factory.h" #include "ardour/reverse.h" #include "ardour/session.h" @@ -63,6 +65,7 @@ #include "audio_region_view.h" #include "audio_streamview.h" #include "audio_time_axis.h" +#include "automation_region_view.h" #include "automation_time_axis.h" #include "control_point.h" #include "debug.h" @@ -75,11 +78,14 @@ #include "gui_thread.h" #include "insert_time_dialog.h" #include "interthread_progress_window.h" +#include "item_counts.h" #include "keyboard.h" #include "midi_region_view.h" #include "mixer_strip.h" #include "mouse_cursors.h" #include "normalize_dialog.h" +#include "note.h" +#include "paste_context.h" #include "patch_change_dialog.h" #include "quantize_dialog.h" #include "region_gain_line.h" @@ -91,6 +97,7 @@ #include "strip_silence_dialog.h" #include "time_axis_view.h" #include "transpose_dialog.h" +#include "transform_dialog.h" #include "i18n.h" @@ -115,6 +122,11 @@ Editor::undo (uint32_t n) if (_session) { _session->undo (n); + if (_session->undo_depth() == 0) { + undo_action->set_sensitive(false); + } + redo_action->set_sensitive(true); + begin_selection_op_history (); } } @@ -127,6 +139,11 @@ Editor::redo (uint32_t n) if (_session) { _session->redo (n); + if (_session->redo_depth() == 0) { + redo_action->set_sensitive(false); + } + undo_action->set_sensitive(true); + begin_selection_op_history (); } } @@ -213,14 +230,14 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) a = tmp; } + latest_regionviews.clear (); + vector region_added_connections; for (list::iterator i = used_trackviews.begin(); i != used_trackviews.end(); ++i) { region_added_connections.push_back ((*i)->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view))); } - latest_regionviews.clear (); - while (used_playlists.size() > 0) { list >::iterator i = used_playlists.begin(); (*i)->thaw(); @@ -230,22 +247,51 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) for (vector::iterator c = region_added_connections.begin(); c != region_added_connections.end(); ++c) { (*c).disconnect (); } - - commit_reversible_command (); if (frozen){ EditorThaw(); /* Emit Signal */ } - if (ARDOUR::Profile->get_mixbus()) { - //IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw. - _ignore_follow_edits = true; //a split will change the region selection in mysterious ways; its not practical or wanted to follow this edit - if( working_on_selection ) { + if (working_on_selection) { + // IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw. + + _ignore_follow_edits = true; // a split will change the region selection in mysterious ways; it's not practical or wanted to follow this edit + RegionSelectionAfterSplit rsas = Config->get_region_selection_after_split(); + /* There are three classes of regions that we might want selected after + splitting selected regions: + - regions selected before the split operation, and unaffected by it + - newly-created regions before the split + - newly-created regions after the split + */ + + if (rsas & Existing) { + // region selections that existed before the split. selection->add ( pre_selected_regions ); + } + + for (RegionSelection::iterator ri = latest_regionviews.begin(); ri != latest_regionviews.end(); ri++) { + if ((*ri)->region()->position() < where) { + // new regions created before the split + if (rsas & NewlyCreatedLeft) { + selection->add (*ri); + } + } else { + // new regions created after the split + if (rsas & NewlyCreatedRight) { + selection->add (*ri); + } + } + } + _ignore_follow_edits = false; + } else { + _ignore_follow_edits = true; + if( working_on_selection ) { selection->add (latest_regionviews); //these are the new regions created after the split } _ignore_follow_edits = false; } + + commit_reversible_command (); } /** Move one extreme of the current range selection. If more than one range is selected, @@ -646,7 +692,7 @@ Editor::build_region_boundary_cache () break; default: fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), _snap_type) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return; } @@ -1365,10 +1411,9 @@ Editor::scroll_tracks_up_line () } bool -Editor::scroll_down_one_track () +Editor::scroll_down_one_track (bool skip_child_views) { - TrackViewList::reverse_iterator next = track_views.rbegin(); - std::pair res; + TrackViewList::reverse_iterator next = track_views.rend(); const double top_of_trackviews = vertical_adjustment.get_value(); for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) { @@ -1376,25 +1421,59 @@ Editor::scroll_down_one_track () continue; } - next = t; - if (next != track_views.rbegin()) { - --next; // moves "next" towards the lower/later tracks since it is a reverse iterator - } - /* If this is the upper-most visible trackview, we want to display - the one above it (next) - */ - - res = (*t)->covers_y_position (top_of_trackviews); + * the one above it (next) + * + * Note that covers_y_position() is recursive and includes child views + */ + std::pair res = (*t)->covers_y_position (top_of_trackviews); if (res.first) { + if (skip_child_views) { + break; + } + /* automation lane (one level, non-recursive) + * + * - if no automation lane exists -> move to next tack + * - if the first (here: bottom-most) matches -> move to next tack + * - if no y-axis match is found -> the current track is at the top + * -> move to last (here: top-most) automation lane + */ + TimeAxisView::Children kids = (*t)->get_child_list(); + TimeAxisView::Children::reverse_iterator nkid = kids.rend(); + + for (TimeAxisView::Children::reverse_iterator ci = kids.rbegin(); ci != kids.rend(); ++ci) { + if ((*ci)->hidden()) { + continue; + } + + std::pair dev; + dev = (*ci)->covers_y_position (top_of_trackviews); + if (dev.first) { + /* some automation lane is currently at the top */ + if (ci == kids.rbegin()) { + /* first (bottom-most) autmation lane is at the top. + * -> move to next track + */ + nkid = kids.rend(); + } + break; + } + nkid = ci; + } + + if (nkid != kids.rend()) { + ensure_time_axis_view_is_visible (**nkid, true); + return true; + } break; } + next = t; } /* move to the track below the first one that covers the */ - if (next != track_views.rbegin()) { + if (next != track_views.rend()) { ensure_time_axis_view_is_visible (**next, true); return true; } @@ -1403,10 +1482,9 @@ Editor::scroll_down_one_track () } bool -Editor::scroll_up_one_track () +Editor::scroll_up_one_track (bool skip_child_views) { TrackViewList::iterator prev = track_views.end(); - std::pair res; double top_of_trackviews = vertical_adjustment.get_value (); for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { @@ -1415,10 +1493,55 @@ Editor::scroll_up_one_track () continue; } - /* find the trackview at the top of the trackview group */ - res = (*t)->covers_y_position (top_of_trackviews); + /* find the trackview at the top of the trackview group + * + * Note that covers_y_position() is recursive and includes child views + */ + std::pair res = (*t)->covers_y_position (top_of_trackviews); if (res.first) { + if (skip_child_views) { + break; + } + /* automation lane (one level, non-recursive) + * + * - if no automation lane exists -> move to prev tack + * - if no y-axis match is found -> the current track is at the top -> move to prev track + * (actually last automation lane of previous track, see below) + * - if first (top-most) lane is at the top -> move to this track + * - else move up one lane + */ + TimeAxisView::Children kids = (*t)->get_child_list(); + TimeAxisView::Children::iterator pkid = kids.end(); + + for (TimeAxisView::Children::iterator ci = kids.begin(); ci != kids.end(); ++ci) { + if ((*ci)->hidden()) { + continue; + } + + std::pair dev; + dev = (*ci)->covers_y_position (top_of_trackviews); + if (dev.first) { + /* some automation lane is currently at the top */ + if (ci == kids.begin()) { + /* first (top-most) autmation lane is at the top. + * jump directly to this track's top + */ + ensure_time_axis_view_is_visible (**t, true); + return true; + } + else if (pkid != kids.end()) { + /* some other automation lane is at the top. + * move up to prev automation lane. + */ + ensure_time_axis_view_is_visible (**pkid, true); + return true; + } + assert(0); // not reached + break; + } + pkid = ci; + } break; } @@ -1426,7 +1549,23 @@ Editor::scroll_up_one_track () } if (prev != track_views.end()) { - ensure_time_axis_view_is_visible (**prev, true); + // move to bottom-most automation-lane of the previous track + TimeAxisView::Children kids = (*prev)->get_child_list(); + TimeAxisView::Children::reverse_iterator pkid = kids.rend(); + if (!skip_child_views) { + // find the last visible lane + for (TimeAxisView::Children::reverse_iterator ci = kids.rbegin(); ci != kids.rend(); ++ci) { + if (!(*ci)->hidden()) { + pkid = ci; + break; + } + } + } + if (pkid != kids.rend()) { + ensure_time_axis_view_is_visible (**pkid, true); + } else { + ensure_time_axis_view_is_visible (**prev, true); + } return true; } @@ -1533,7 +1672,7 @@ Editor::temporal_zoom (framecnt_t fpp) // would be 4147200000 samples, so 2592000 samples per pixel. nfpp = min (fpp, (framecnt_t) 2592000); - nfpp = max ((framecnt_t) 1, fpp); + nfpp = max ((framecnt_t) 1, nfpp); new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp); half_page_size = new_page_size / 2; @@ -1640,14 +1779,14 @@ Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end) */ GdkScreen* screen = gdk_screen_get_default (); - gint pixwidth = gdk_screen_get_width (screen); - gint mmwidth = gdk_screen_get_width_mm (screen); - double pix_per_mm = (double) pixwidth/ (double) mmwidth; - double one_centimeter_in_pixels = pix_per_mm * 10.0; + const gint pixwidth = gdk_screen_get_width (screen); + const gint mmwidth = gdk_screen_get_width_mm (screen); + const double pix_per_mm = (double) pixwidth/ (double) mmwidth; + const double one_centimeter_in_pixels = pix_per_mm * 10.0; - framepos_t range = end - start; - double new_fpp = (double) range / (double) _visible_canvas_width; - framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp); + const framepos_t range = end - start; + const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width); + const framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp); if (start > extra_samples) { start -= extra_samples; @@ -1662,7 +1801,6 @@ Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end) } } - void Editor::temporal_zoom_region (bool both_axes) { @@ -1670,30 +1808,10 @@ Editor::temporal_zoom_region (bool both_axes) framepos_t end = 0; set tracks; - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + if ( !get_selection_extents(start, end) ) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - - tracks.insert (&((*i)->get_time_axis_view())); - } - - if ((start == 0 && end == 0) || end < start) { - return; - } - - calc_extra_zoom_edges(start, end); + + calc_extra_zoom_edges (start, end); /* if we're zooming on both axes we need to save track heights etc. */ @@ -1729,35 +1847,73 @@ Editor::temporal_zoom_region (bool both_axes) redo_visual_stack.push_back (current_visual_state (both_axes)); } -void -Editor::zoom_to_region (bool both_axes) + +bool +Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) { - temporal_zoom_region (both_axes); + start = max_framepos; + end = 0; + bool ret = true; + + //ToDo: if notes are selected, set extents to that selection + + //ToDo: if control points are selected, set extents to that selection + + if ( !selection->regions.empty() ) { + RegionSelection rs = get_regions_from_selection_and_entered (); + + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + + if ((*i)->region()->position() < start) { + start = (*i)->region()->position(); + } + + if ((*i)->region()->last_frame() + 1 > end) { + end = (*i)->region()->last_frame() + 1; + } + } + + } else if (!selection->time.empty()) { + start = selection->time.start(); + end = selection->time.end_frame(); + } else + ret = false; //no selection found + + //range check + if ((start == 0 && end == 0) || end < start) { + ret = false; + } + + return ret; } + void Editor::temporal_zoom_selection (bool both_axes) { if (!selection) return; - //if a range is selected, zoom to that - if (!selection->time.empty()) { + //ToDo: if notes are selected, zoom to that - framepos_t start = selection->time.start(); - framepos_t end = selection->time.end_frame(); + //ToDo: if control points are selected, zoom to that - calc_extra_zoom_edges(start, end); + //if region(s) are selected, zoom to that + if ( !selection->regions.empty() ) + temporal_zoom_region (both_axes); - temporal_zoom_by_frame (start, end); + //if a range is selected, zoom to that + if (!selection->time.empty()) { + framepos_t start, end; + if (get_selection_extents (start, end)) { + calc_extra_zoom_edges(start, end); + temporal_zoom_by_frame (start, end); + } + if (both_axes) - fit_selected_tracks(); - - } else { - temporal_zoom_region(both_axes); + fit_selection(); } - } void @@ -1802,9 +1958,9 @@ Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end) framepos_t range = end - start; - double const new_fpp = (double) range / (double) _visible_canvas_width; - - framepos_t new_page = (framepos_t) floor (_visible_canvas_width * new_fpp); + const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width); + + framepos_t new_page = range; framepos_t middle = (framepos_t) floor ((double) start + ((double) range / 2.0f)); framepos_t new_leftmost = (framepos_t) floor ((double) middle - ((double) new_page / 2.0f)); @@ -1874,7 +2030,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame) bool Editor::choose_new_marker_name(string &name) { - if (!Config->get_name_new_markers()) { + if (!ARDOUR_UI::config()->get_name_new_markers()) { /* don't prompt user for a new name */ return true; } @@ -1926,12 +2082,14 @@ Editor::add_location_from_selection () _session->locations()->next_available_name(rangename,"selection"); Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker); - _session->begin_reversible_command (_("add marker")); + begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); _session->locations()->add (location, true); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -1946,12 +2104,14 @@ Editor::add_location_mark (framepos_t where) return; } Location *location = new Location (*_session, where, where, markername, Location::IsMark); - _session->begin_reversible_command (_("add marker")); + begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); _session->locations()->add (location, true); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -1966,7 +2126,8 @@ Editor::remove_location_at_playhead_cursor () if (_session) { //set up for undo - _session->begin_reversible_command (_("remove marker")); + begin_reversible_command (_("remove marker")); + XMLNode &before = _session->locations()->get_state(); bool removed = false; @@ -1984,7 +2145,8 @@ Editor::remove_location_at_playhead_cursor () if (removed) { XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } } } @@ -1999,7 +2161,8 @@ Editor::add_locations_from_region () return; } - _session->begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker")); + begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker")); + XMLNode &before = _session->locations()->get_state(); for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) { @@ -2013,7 +2176,8 @@ Editor::add_locations_from_region () XMLNode &after = _session->locations()->get_state(); _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } /** Add a single range marker around all selected regions */ @@ -2026,7 +2190,8 @@ Editor::add_location_from_region () return; } - _session->begin_reversible_command (_("add marker")); + begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); string markername; @@ -2049,7 +2214,8 @@ Editor::add_location_from_region () XMLNode &after = _session->locations()->get_state(); _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } /* MARKS */ @@ -2105,12 +2271,14 @@ void Editor::clear_markers () { if (_session) { - _session->begin_reversible_command (_("clear markers")); + begin_reversible_command (_("clear markers")); + XMLNode &before = _session->locations()->get_state(); _session->locations()->clear_markers (); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } } @@ -2118,27 +2286,30 @@ void Editor::clear_ranges () { if (_session) { - _session->begin_reversible_command (_("clear ranges")); + begin_reversible_command (_("clear ranges")); + XMLNode &before = _session->locations()->get_state(); _session->locations()->clear_ranges (); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); + + commit_reversible_command (); } } void Editor::clear_locations () { - _session->begin_reversible_command (_("clear locations")); + begin_reversible_command (_("clear locations")); + XMLNode &before = _session->locations()->get_state(); _session->locations()->clear (); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - _session->commit_reversible_command (); - _session->locations()->clear (); + + commit_reversible_command (); } void @@ -2285,11 +2456,15 @@ Editor::play_from_edit_point_and_return () void Editor::play_selection () { - if (selection->time.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - _session->request_play_range (&selection->time, true); + AudioRange ar (start, end, 0); + list lar; + lar.push_back (ar); + + _session->request_play_range (&lar, true); } framepos_t @@ -2302,7 +2477,7 @@ Editor::get_preroll () void Editor::maybe_locate_with_edit_preroll ( framepos_t location ) { - if ( _session->transport_rolling() || !Config->get_follow_edits() || _ignore_follow_edits ) + if ( _session->transport_rolling() || !ARDOUR_UI::config()->get_follow_edits() || _ignore_follow_edits ) return; location -= get_preroll(); @@ -2322,16 +2497,17 @@ Editor::maybe_locate_with_edit_preroll ( framepos_t location ) void Editor::play_with_preroll () { - if (selection->time.empty()) { - return; - } else { + { framepos_t preroll = get_preroll(); - framepos_t start = 0; - if (selection->time[clicked_selection].start > preroll) - start = selection->time[clicked_selection].start - preroll; + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; + + if (start > preroll) + start = start - preroll; - framepos_t end = selection->time[clicked_selection].end + preroll; + end = end + preroll; //"post-roll" AudioRange ar (start, end, 0); list lar; @@ -2644,8 +2820,14 @@ Editor::create_region_from_selection (vector >& new_re return; } - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; + framepos_t start, end; + if (clicked_selection) { + start = selection->time[clicked_selection].start; + end = selection->time[clicked_selection].end; + } else { + start = selection->time.start(); + end = selection->time.end_frame(); + } TrackViewList ts = selection->tracks.filter_to_unique_playlists (); sort_track_selection (ts); @@ -2704,6 +2886,7 @@ static void add_if_covered (RegionView* rv, const AudioRange* ar, RegionSelection* rs) { switch (rv->region()->coverage (ar->start, ar->end - 1)) { + // n.b. -1 because AudioRange::end is one past the end, but coverage expects inclusive ranges case Evoral::OverlapNone: break; default: @@ -3642,14 +3825,13 @@ Editor::freeze_route () pthread_create_and_store (X_("freezer"), &itt.thread, _freeze_thread, this); - set_canvas_cursor (_cursors->wait); + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); while (!itt.done && !itt.cancel) { gtk_main_iteration (); } current_interthread_info = 0; - set_canvas_cursor (current_canvas_cursor); } void @@ -3829,44 +4011,21 @@ Editor::cut_copy (CutCopyOp op) return; } - if (internal_editing()) { - - switch (effective_mouse_mode()) { - case MouseObject: - case MouseRange: - begin_reversible_command (opname + ' ' + X_("MIDI")); - cut_copy_midi (op); - commit_reversible_command (); - break; - default: - break; - } - + switch (mouse_mode) { + case MouseDraw: + case MouseContent: + begin_reversible_command (opname + ' ' + X_("MIDI")); + cut_copy_midi (op); + commit_reversible_command (); return; + default: + break; } bool did_edit = false; - if (!selection->points.empty()) { - begin_reversible_command (opname + _(" points")); - did_edit = true; - cut_copy_points (op); - if (op == Cut || op == Delete) { - selection->clear_points (); - } - } else if (!selection->regions.empty() || !selection->points.empty()) { - - string thing_name; - - if (selection->regions.empty()) { - thing_name = _("points"); - } else if (selection->points.empty()) { - thing_name = _("regions"); - } else { - thing_name = _("objects"); - } - - begin_reversible_command (opname + ' ' + thing_name); + if (!selection->regions.empty() || !selection->points.empty()) { + begin_reversible_command (opname + ' ' + _("objects")); did_edit = true; if (!selection->regions.empty()) { @@ -3893,7 +4052,7 @@ Editor::cut_copy (CutCopyOp op) selection->set (start, end); } } else if (!selection->time.empty()) { - begin_reversible_command (opname + _(" range")); + begin_reversible_command (opname + ' ' + _("range")); did_edit = true; cut_copy_ranges (op); @@ -3904,6 +4063,9 @@ Editor::cut_copy (CutCopyOp op) } if (did_edit) { + /* reset repeated paste state */ + paste_count = 0; + last_paste_pos = 0; commit_reversible_command (); } @@ -3913,10 +4075,11 @@ Editor::cut_copy (CutCopyOp op) } struct AutomationRecord { - AutomationRecord () : state (0) {} - AutomationRecord (XMLNode* s) : state (s) {} + AutomationRecord () : state (0) , line(NULL) {} + AutomationRecord (XMLNode* s, const AutomationLine* l) : state (s) , line (l) {} XMLNode* state; ///< state before any operation + const AutomationLine* line; ///< line this came from boost::shared_ptr copy; ///< copied events for the cut buffer }; @@ -3924,7 +4087,7 @@ struct AutomationRecord { * @param op Operation (Cut, Copy or Clear) */ void -Editor::cut_copy_points (CutCopyOp op) +Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool midi) { if (selection->points.empty ()) { return; @@ -3939,12 +4102,13 @@ Editor::cut_copy_points (CutCopyOp op) /* Go through all selected points, making an AutomationRecord for each distinct AutomationList */ for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); + const AutomationLine& line = (*i)->line(); + const boost::shared_ptr al = line.the_list(); if (lists.find (al) == lists.end ()) { /* We haven't seen this list yet, so make a record for it. This includes taking a copy of its current state, in case this is needed for undo later. */ - lists[al] = AutomationRecord (&al->get_state ()); + lists[al] = AutomationRecord (&al->get_state (), &line); } } @@ -3953,21 +4117,46 @@ Editor::cut_copy_points (CutCopyOp op) ControlList for each of our source lists to put the cut buffer data in. */ for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) { - i->second.copy = i->first->create (i->first->parameter ()); + i->second.copy = i->first->create (i->first->parameter (), i->first->descriptor()); } /* Add all selected points to the relevant copy ControlLists */ + framepos_t start = std::numeric_limits::max(); for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { boost::shared_ptr al = (*i)->line().the_list(); - AutomationList::const_iterator j = (*i)->model (); - lists[al].copy->add ((*j)->when, (*j)->value); + AutomationList::const_iterator j = (*i)->model(); + + lists[al].copy->fast_simple_add ((*j)->when, (*j)->value); + if (midi) { + /* Update earliest MIDI start time in beats */ + earliest = std::min(earliest, Evoral::Beats((*j)->when)); + } else { + /* Update earliest session start time in frames */ + start = std::min(start, (*i)->line().session_position(j)); + } } + /* Snap start time backwards, so copy/paste is snap aligned. */ + if (midi) { + if (earliest == Evoral::Beats::max()) { + earliest = Evoral::Beats(); // Weird... don't offset + } + earliest.round_down_to_beat(); + } else { + if (start == std::numeric_limits::max()) { + start = 0; // Weird... don't offset + } + snap_to(start, RoundDownMaybe); + } + + const double line_offset = midi ? earliest.to_double() : start; for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) { - /* Correct this copy list so that it starts at time 0 */ - double const start = i->second.copy->front()->when; + /* Correct this copy list so that it is relative to the earliest + start time, so relative ordering between points is preserved + when copying from several lists and the paste starts at the + earliest copied piece of data. */ for (AutomationList::iterator j = i->second.copy->begin(); j != i->second.copy->end(); ++j) { - (*j)->when -= start; + (*j)->when -= line_offset; } /* And add it to the cut buffer */ @@ -4003,13 +4192,27 @@ Editor::cut_copy_points (CutCopyOp op) void Editor::cut_copy_midi (CutCopyOp op) { + Evoral::Beats earliest = Evoral::Beats::max(); for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) { - MidiRegionView* mrv = *i; - mrv->cut_copy_clear (op); - } -} + MidiRegionView* mrv = dynamic_cast(*i); + if (mrv) { + if (!mrv->selection().empty()) { + earliest = std::min(earliest, (*mrv->selection().begin())->note()->time()); + } + mrv->cut_copy_clear (op); + /* XXX: not ideal, as there may be more than one track involved in the selection */ + _last_cut_copy_source_track = &mrv->get_time_axis_view(); + } + } + if (!selection->points.empty()) { + cut_copy_points (op, earliest, true); + if (op == Cut || op == Delete) { + selection->clear_points (); + } + } +} struct lt_playlist { bool operator () (const PlaylistState& a, const PlaylistState& b) { @@ -4032,6 +4235,8 @@ Editor::remove_clicked_region () return; } + begin_reversible_command (_("remove region")); + boost::shared_ptr playlist = clicked_routeview->playlist(); playlist->clear_changes (); @@ -4350,14 +4555,8 @@ Editor::paste_internal (framepos_t position, float times) { DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position)); - if (internal_editing()) { - if (cut_buffer->midi_notes.empty()) { - return; - } - } else { - if (cut_buffer->empty()) { - return; - } + if (cut_buffer->empty(internal_editing())) { + return; } if (position == max_framepos) { @@ -4365,60 +4564,99 @@ Editor::paste_internal (framepos_t position, float times) DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("preferred edit position is %1\n", position)); } - TrackViewList ts; - TrackViewList::iterator i; - size_t nth; + if (position == last_paste_pos) { + /* repeated paste in the same position */ + ++paste_count; + } else { + /* paste in new location, reset repeated paste state */ + paste_count = 0; + last_paste_pos = position; + } /* get everything in the correct order */ - if (_edit_point == Editing::EditAtMouse && entered_track) { - /* With the mouse edit point, paste onto the track under the mouse */ - ts.push_back (entered_track); - } else if (!selection->tracks.empty()) { - /* Otherwise, if there are some selected tracks, paste to them */ + TrackViewList ts; + if (!selection->tracks.empty()) { + /* If there is a track selection, paste into exactly those tracks and + only those tracks. This allows the user to be explicit and override + the below "do the reasonable thing" logic. */ ts = selection->tracks.filter_to_unique_playlists (); sort_track_selection (ts); - } else if (_last_cut_copy_source_track) { - /* Otherwise paste to the track that the cut/copy came from; - see discussion in mantis #3333. - */ - ts.push_back (_last_cut_copy_source_track); - } - - if (internal_editing ()) { + } else { + /* Figure out which track to base the paste at. */ + TimeAxisView* base_track = NULL; + if (_edit_point == Editing::EditAtMouse && entered_track) { + /* With the mouse edit point, paste onto the track under the mouse. */ + base_track = entered_track; + } else if (_edit_point == Editing::EditAtMouse && entered_regionview) { + /* With the mouse edit point, paste onto the track of the region under the mouse. */ + base_track = &entered_regionview->get_time_axis_view(); + } else if (_last_cut_copy_source_track) { + /* Paste to the track that the cut/copy came from (see mantis #333). */ + base_track = _last_cut_copy_source_track; + } else { + /* This is "impossible" since we've copied... well, do nothing. */ + return; + } - /* undo/redo is handled by individual tracks/regions */ + /* Walk up to parent if necessary, so base track is a route. */ + while (base_track->get_parent()) { + base_track = base_track->get_parent(); + } - for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) { + /* Add base track and all tracks below it. The paste logic will select + the appropriate object types from the cut buffer in relative order. */ + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + if ((*i)->order() >= base_track->order()) { + ts.push_back(*i); + } + } - RegionSelection rs; - RegionSelection::iterator r; - MidiNoteSelection::iterator cb; + /* Sort tracks so the nth track of type T will pick the nth object of type T. */ + sort_track_selection (ts); - get_regions_at (rs, position, ts); + /* Add automation children of each track in order, for pasting several lines. */ + for (TrackViewList::iterator i = ts.begin(); i != ts.end();) { + /* Add any automation children for pasting several lines */ + RouteTimeAxisView* rtv = dynamic_cast(*i++); + if (!rtv) { + continue; + } - for (cb = cut_buffer->midi_notes.begin(), r = rs.begin(); - cb != cut_buffer->midi_notes.end() && r != rs.end(); ++r) { - MidiRegionView* mrv = dynamic_cast (*r); - if (mrv) { - mrv->paste (position, times, **cb); - ++cb; - } + typedef RouteTimeAxisView::AutomationTracks ATracks; + const ATracks& atracks = rtv->automation_tracks(); + for (ATracks::const_iterator a = atracks.begin(); a != atracks.end(); ++a) { + i = ts.insert(i, a->second.get()); + ++i; } } - } else { + /* We now have a list of trackviews starting at base_track, including + automation children, in the order shown in the editor, e.g. R1, + R1.A1, R1.A2, R2, R2.A1, ... */ + } - /* we do redo (do you do voodoo?) */ + begin_reversible_command (Operations::paste); - begin_reversible_command (Operations::paste); + if (ts.size() == 1 && cut_buffer->lines.size() == 1 && + dynamic_cast(ts.front())) { + /* Only one line copied, and one automation track selected. Do a + "greedy" paste from one automation type to another. */ - for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) { - (*i)->paste (position, times, *cut_buffer, nth); - } + PasteContext ctx(paste_count, times, ItemCounts(), true); + ts.front()->paste (position, *cut_buffer, ctx); - commit_reversible_command (); + } else { + + /* Paste into tracks */ + + PasteContext ctx(paste_count, times, ItemCounts(), false); + for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { + (*i)->paste (position, *cut_buffer, ctx); + } } + + commit_reversible_command (); } void @@ -4454,11 +4692,11 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } - commit_reversible_command (); - if (!foo.empty()) { selection->set (foo); } + + commit_reversible_command (); } void @@ -4489,7 +4727,13 @@ Editor::duplicate_selection (float times) continue; } playlist->clear_changes (); - playlist->duplicate (*ri, selection->time[clicked_selection].end, times); + framepos_t end; + if (clicked_selection) { + end = selection->time[clicked_selection].end; + } else { + end = selection->time.end_frame(); + } + playlist->duplicate (*ri, end, times); _session->add_command (new StatefulDiffCommand (playlist)); ++ri; @@ -4631,7 +4875,7 @@ Editor::normalize_region () return; } - set_canvas_cursor (_cursors->wait); + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); gdk_flush (); /* XXX: should really only count audio regions here */ @@ -4650,7 +4894,6 @@ Editor::normalize_region () if (a == -1) { /* the user cancelled the operation */ - set_canvas_cursor (current_canvas_cursor); return; } @@ -4681,7 +4924,6 @@ Editor::normalize_region () } commit_reversible_command (); - set_canvas_cursor (current_canvas_cursor); } @@ -4796,39 +5038,35 @@ Editor::strip_region_silence () Command* Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv) { - Evoral::Sequence::Notes selected; + Evoral::Sequence::Notes selected; mrv.selection_as_notelist (selected, true); - vector::Notes> v; + vector::Notes> v; v.push_back (selected); - framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start(); - double pos_beats = _session->tempo_map().framewalk_to_beats(0, pos_frames); + framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start(); + Evoral::Beats pos_beats = _session->tempo_map().framewalk_to_beats(0, pos_frames); return op (mrv.midi_region()->model(), pos_beats, v); } void -Editor::apply_midi_note_edit_op (MidiOperator& op) +Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs) { - Command* cmd; - - RegionSelection rs = get_regions_from_selection_and_entered (); - if (rs.empty()) { return; } begin_reversible_command (op.name ()); - for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { - RegionSelection::iterator tmp = r; + for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ) { + RegionSelection::const_iterator tmp = r; ++tmp; MidiRegionView* const mrv = dynamic_cast (*r); if (mrv) { - cmd = apply_midi_note_edit_op_to_region (op, *mrv); + Command* cmd = apply_midi_note_edit_op_to_region (op, *mrv); if (cmd) { (*cmd)(); _session->add_command (cmd); @@ -4852,7 +5090,7 @@ Editor::fork_region () begin_reversible_command (_("Fork Region(s)")); - set_canvas_cursor (_cursors->wait); + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); gdk_flush (); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { @@ -4879,48 +5117,81 @@ Editor::fork_region () } commit_reversible_command (); - - set_canvas_cursor (current_canvas_cursor); } void Editor::quantize_region () { - int selected_midi_region_cnt = 0; + if (_session) { + quantize_regions(get_regions_from_selection_and_entered ()); + } +} - if (!_session) { +void +Editor::quantize_regions (const RegionSelection& rs) +{ + if (rs.n_midi_regions() == 0) { return; } - RegionSelection rs = get_regions_from_selection_and_entered (); + QuantizeDialog* qd = new QuantizeDialog (*this); - if (rs.empty()) { + qd->present (); + const int r = qd->run (); + qd->hide (); + + if (r == Gtk::RESPONSE_OK) { + Quantize quant (qd->snap_start(), qd->snap_end(), + qd->start_grid_size(), qd->end_grid_size(), + qd->strength(), qd->swing(), qd->threshold()); + + apply_midi_note_edit_op (quant, rs); + } +} + +void +Editor::legatize_region (bool shrink_only) +{ + if (_session) { + legatize_regions(get_regions_from_selection_and_entered (), shrink_only); + } +} + +void +Editor::legatize_regions (const RegionSelection& rs, bool shrink_only) +{ + if (rs.n_midi_regions() == 0) { return; } - for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { - MidiRegionView* const mrv = dynamic_cast (*r); - if (mrv) { - selected_midi_region_cnt++; - } + Legatize legatize(shrink_only); + apply_midi_note_edit_op (legatize, rs); +} + +void +Editor::transform_region () +{ + if (_session) { + transform_regions(get_regions_from_selection_and_entered ()); } +} - if (selected_midi_region_cnt == 0) { +void +Editor::transform_regions (const RegionSelection& rs) +{ + if (rs.n_midi_regions() == 0) { return; } - QuantizeDialog* qd = new QuantizeDialog (*this); + TransformDialog* td = new TransformDialog(); - qd->present (); - const int r = qd->run (); - qd->hide (); + td->present(); + const int r = td->run(); + td->hide(); if (r == Gtk::RESPONSE_OK) { - Quantize quant (*_session, qd->snap_start(), qd->snap_end(), - qd->start_grid_size(), qd->end_grid_size(), - qd->strength(), qd->swing(), qd->threshold()); - - apply_midi_note_edit_op (quant); + Transform transform(td->get()); + apply_midi_note_edit_op(transform, rs); } } @@ -4941,7 +5212,7 @@ Editor::insert_patch_change (bool from_context) */ MidiRegionView* first = dynamic_cast (rs.front ()); - Evoral::PatchChange empty (0, 0, 0, 0); + Evoral::PatchChange empty (Evoral::Beats(), 0, 0, 0); PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD); if (d.run() == RESPONSE_CANCEL) { @@ -4969,7 +5240,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress begin_reversible_command (command); - set_canvas_cursor (_cursors->wait); + CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); gdk_flush (); int n = 0; @@ -5022,7 +5293,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress _session->add_command(new StatefulDiffCommand (playlist)); } else { - goto out; + return; } if (progress) { @@ -5035,9 +5306,6 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress } commit_reversible_command (); - - out: - set_canvas_cursor (current_canvas_cursor); } void @@ -5055,8 +5323,8 @@ Editor::reset_region_gain_envelopes () return; } - _session->begin_reversible_command (_("reset region gain")); - + begin_reversible_command (_("reset region gain")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { @@ -5067,8 +5335,8 @@ Editor::reset_region_gain_envelopes () _session->add_command (new MementoCommand(*arv->audio_region()->envelope().get(), &before, &alist->get_state())); } } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -5108,8 +5376,8 @@ Editor::toggle_gain_envelope_active () return; } - _session->begin_reversible_command (_("region gain envelope active")); - + begin_reversible_command (_("region gain envelope active")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { @@ -5118,8 +5386,8 @@ Editor::toggle_gain_envelope_active () _session->add_command (new StatefulDiffCommand (arv->region())); } } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -5135,15 +5403,15 @@ Editor::toggle_region_lock () return; } - _session->begin_reversible_command (_("toggle region lock")); - + begin_reversible_command (_("toggle region lock")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_changes (); (*i)->region()->set_locked (!(*i)->region()->locked()); _session->add_command (new StatefulDiffCommand ((*i)->region())); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -5159,15 +5427,15 @@ Editor::toggle_region_video_lock () return; } - _session->begin_reversible_command (_("Toggle Video Lock")); - + begin_reversible_command (_("Toggle Video Lock")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_changes (); (*i)->region()->set_video_locked (!(*i)->region()->video_locked()); _session->add_command (new StatefulDiffCommand ((*i)->region())); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -5183,16 +5451,16 @@ Editor::toggle_region_lock_style () return; } - _session->begin_reversible_command (_("region lock style")); - + begin_reversible_command (_("region lock style")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_changes (); PositionLockStyle const ns = (*i)->region()->position_lock_style() == AudioTime ? MusicTime : AudioTime; (*i)->region()->set_position_lock_style (ns); _session->add_command (new StatefulDiffCommand ((*i)->region())); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -5208,15 +5476,15 @@ Editor::toggle_opaque_region () return; } - _session->begin_reversible_command (_("change region opacity")); - + begin_reversible_command (_("change region opacity")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_changes (); (*i)->region()->set_opaque (!(*i)->region()->opaque()); _session->add_command (new StatefulDiffCommand ((*i)->region())); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -5614,27 +5882,33 @@ Editor::set_playhead_cursor () } } - if ( Config->get_follow_edits() ) + if (ARDOUR_UI::config()->get_follow_edits()) { cancel_time_selection(); + } } void Editor::split_region () { + //if a range is selected, separate it if ( !selection->time.empty()) { separate_regions_between (selection->time); return; } - RegionSelection rs = get_regions_from_selection_and_edit_point (); + //if no range was selected, try to find some regions to split + if (current_mouse_mode() == MouseObject) { //don't try this for Internal Edit, Stretch, Draw, etc. + + RegionSelection rs = get_regions_from_selection_and_edit_point (); - framepos_t where = get_preferred_edit_position (); + framepos_t where = get_preferred_edit_position (); - if (rs.empty()) { - return; - } + if (rs.empty()) { + return; + } - split_regions_at (where, rs); + split_regions_at (where, rs); + } } struct EditorOrderRouteSorter { @@ -5708,64 +5982,28 @@ Editor::select_prev_route() void Editor::set_loop_from_selection (bool play) -{ - if (_session == 0 || selection->time.empty()) { - return; - } - - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; - - set_loop_range (start, end, _("set loop range from selection")); - - if (play) { - _session->request_locate (start, true); - _session->request_play_loop (true); - } -} - -void -Editor::set_loop_from_edit_range (bool play) { if (_session == 0) { return; } - framepos_t start; - framepos_t end; - - if (!get_edit_op_range (start, end)) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - set_loop_range (start, end, _("set loop range from edit range")); + set_loop_range (start, end, _("set loop range from selection")); if (play) { - _session->request_locate (start, true); - _session->request_play_loop (true); + _session->request_play_loop (true, true); } } void Editor::set_loop_from_region (bool play) { - framepos_t start = max_framepos; - framepos_t end = 0; - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - } set_loop_range (start, end, _("set loop range from region")); @@ -5778,53 +6016,52 @@ Editor::set_loop_from_region (bool play) void Editor::set_punch_from_selection () { - if (_session == 0 || selection->time.empty()) { + if (_session == 0) { return; } - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; set_punch_range (start, end, _("set punch range from selection")); } void -Editor::set_punch_from_edit_range () +Editor::set_session_extents_from_selection () { if (_session == 0) { return; } + + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; - framepos_t start; - framepos_t end; + begin_reversible_command (_("set session start/end from selection")); - if (!get_edit_op_range (start, end)) { - return; - } + Location* loc; + if ((loc = _session->locations()->session_range_location()) == 0) { + _session->set_session_extents ( start, end ); // this will create a new session range; no need for UNDO + } else { + XMLNode &before = loc->get_state(); + + _session->set_session_extents ( start, end ); + + XMLNode &after = loc->get_state(); + + _session->add_command (new MementoCommand(*loc, &before, &after)); - set_punch_range (start, end, _("set punch range from edit range")); + commit_reversible_command (); + } } void Editor::set_punch_from_region () { - framepos_t start = max_framepos; - framepos_t end = 0; - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - } set_punch_range (start, end, _("set punch range from region")); } @@ -5996,8 +6233,8 @@ Editor::split_region_at_transients () return; } - _session->begin_reversible_command (_("split regions")); - + begin_reversible_command (_("split regions")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) { RegionSelection::iterator tmp; @@ -6014,8 +6251,8 @@ Editor::split_region_at_transients () i = tmp; } - - _session->commit_reversible_command (); + + commit_reversible_command (); } @@ -6203,14 +6440,14 @@ Editor::place_transient() framepos_t where = get_preferred_edit_position(); - _session->begin_reversible_command (_("place transient")); - + begin_reversible_command (_("place transient")); + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { framepos_t position = (*r)->region()->position(); (*r)->region()->add_transient(where - position); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -6238,8 +6475,8 @@ Editor::snap_regions_to_grid () return; } - _session->begin_reversible_command (_("snap regions to grid")); - + begin_reversible_command (_("snap regions to grid")); + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { boost::shared_ptr pl = (*r)->region()->playlist(); @@ -6262,8 +6499,8 @@ Editor::snap_regions_to_grid () (*i)->thaw(); used_playlists.pop_front(); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -6321,8 +6558,8 @@ Editor::close_region_gaps () /* Iterate over the region list and make adjacent regions overlap by crossfade_len_ms */ - _session->begin_reversible_command (_("close region gaps")); - + begin_reversible_command (_("close region gaps")); + int idx = 0; boost::shared_ptr last_region; @@ -6361,8 +6598,8 @@ Editor::close_region_gaps () (*i)->thaw(); used_playlists.pop_front(); } - - _session->commit_reversible_command (); + + commit_reversible_command (); } void @@ -6455,7 +6692,7 @@ Editor::playhead_forward_to_grid () framepos_t pos = playhead_cursor->current_frame (); if (pos < max_framepos - 1) { pos += 2; - snap_to_internal (pos, 1, false); + snap_to_internal (pos, RoundUpAlways, false); _session->request_locate (pos); } } @@ -6471,7 +6708,7 @@ Editor::playhead_backward_to_grid () framepos_t pos = playhead_cursor->current_frame (); if (pos > 2) { pos -= 2; - snap_to_internal (pos, -1, false); + snap_to_internal (pos, RoundDownAlways, false); _session->request_locate (pos); } } @@ -6512,6 +6749,23 @@ Editor::toggle_tracks_active () void Editor::remove_tracks () +{ + /* this will delete GUI objects that may be the subject of an event + handler in which this method is called. Defer actual deletion to the + next idle callback, when all event handling is finished. + */ + Glib::signal_idle().connect (sigc::mem_fun (*this, &Editor::idle_remove_tracks)); +} + +bool +Editor::idle_remove_tracks () +{ + _remove_tracks (); + return false; /* do not call again */ +} + +void +Editor::_remove_tracks () { TrackSelection& ts (selection->tracks); @@ -6567,19 +6821,9 @@ edit your ardour.rc file to set the\n\ return; } - // XXX should be using gettext plural forms, maybe? - if (ntracks > 1) { - trackstr = _("tracks"); - } else { - trackstr = _("track"); - } - - if (nbusses > 1) { - busstr = _("busses"); - } else { - busstr = _("bus"); - } - + trackstr = P_("track", "tracks", ntracks); + busstr = P_("bus", "busses", nbusses); + if (ntracks) { if (nbusses) { prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?\n" @@ -6776,7 +7020,7 @@ Editor::insert_time ( } void -Editor::fit_selected_tracks () +Editor::fit_selection () { if (!selection->tracks.empty()) { fit_tracks (selection->tracks); @@ -6842,7 +7086,7 @@ Editor::fit_tracks (TrackViewList & tracks) } undo_visual_stack.push_back (current_visual_state (true)); - no_save_visual = true; + PBD::Unwinder nsv (no_save_visual, true); /* build a list of all tracks, including children */ @@ -6855,36 +7099,36 @@ Editor::fit_tracks (TrackViewList & tracks) } } - bool prev_was_selected = false; - bool is_selected = tracks.contains (all.front()); - bool next_is_selected; - - for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t) { - - TrackViewList::iterator next; - - next = t; - ++next; - if (next != all.end()) { - next_is_selected = tracks.contains (*next); - } else { - next_is_selected = false; + // find selection range. + // if someone knows how to user TrackViewList::iterator for this + // I'm all ears. + int selected_top = -1; + int selected_bottom = -1; + int i = 0; + for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) { + if ((*t)->marked_for_display ()) { + if (tracks.contains(*t)) { + if (selected_top == -1) { + selected_top = i; + } + selected_bottom = i; + } } + } + i = 0; + for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) { if ((*t)->marked_for_display ()) { - if (is_selected) { + if (tracks.contains(*t)) { (*t)->set_height (h); first_y_pos = std::min ((*t)->y_position (), first_y_pos); } else { - if (prev_was_selected && next_is_selected) { + if (i > selected_top && i < selected_bottom) { hide_track_in_display (*t); } } } - - prev_was_selected = is_selected; - is_selected = next_is_selected; } /* @@ -6970,7 +7214,7 @@ Editor::toggle_region_mute () (*i)->region()->playlist()->clear_changes (); (*i)->region()->set_muted (!(*i)->region()->muted ()); - _session->add_command (new StatefulDiffCommand ((*i)->region()->playlist())); + _session->add_command (new StatefulDiffCommand ((*i)->region())); }