X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=e8174ce9e6b64ffbe6772fb93721cf4ec7e19959;hb=22b07e0233a29d9633ffa825a79503befaf2e16e;hp=d965eb2384382f4e142248817ca5f142bf2302d2;hpb=e234e98f13808826122e39dc3562be96eaa7671e;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index d965eb2384..e8174ce9e6 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -61,7 +61,6 @@ #include "canvas/canvas.h" #include "actions.h" -#include "ardour_ui.h" #include "audio_region_view.h" #include "audio_streamview.h" #include "audio_time_axis.h" @@ -76,7 +75,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" @@ -98,6 +97,7 @@ #include "time_axis_view.h" #include "transpose_dialog.h" #include "transform_dialog.h" +#include "ui_config.h" #include "i18n.h" @@ -119,7 +119,7 @@ Editor::undo (uint32_t n) if (_drags->active ()) { _drags->abort (); } - + if (_session) { _session->undo (n); if (_session->undo_depth() == 0) { @@ -136,7 +136,7 @@ Editor::redo (uint32_t n) if (_drags->active ()) { _drags->abort (); } - + if (_session) { _session->redo (n); if (_session->redo_depth() == 0) { @@ -237,7 +237,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) 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))); } - + while (used_playlists.size() > 0) { list >::iterator i = used_playlists.begin(); (*i)->thaw(); @@ -336,9 +336,9 @@ Editor::move_range_selection_start_or_end_to_region_boundary (bool move_end, boo return; } - begin_reversible_command (_("alter selection")); + begin_reversible_selection_op (_("alter selection")); selection->set_preserving_all_ranges (start, end); - commit_reversible_command (); + commit_reversible_selection_op (); } bool @@ -400,8 +400,7 @@ Editor::nudge_forward (bool next, bool force_playhead) } else if (!force_playhead && !selection->markers.empty()) { bool is_start; - - begin_reversible_command (_("nudge location forward")); + bool in_command = false; for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { @@ -432,13 +431,18 @@ Editor::nudge_forward (bool next, bool force_playhead) loc->set_end (max_framepos); } } + if (!in_command) { + begin_reversible_command (_("nudge location forward")); + in_command = true; + } XMLNode& after (loc->get_state()); _session->add_command (new MementoCommand(*loc, &before, &after)); } } - commit_reversible_command (); - + if (in_command) { + commit_reversible_command (); + } } else { distance = get_nudge_distance (playhead_cursor->current_frame (), next_distance); _session->request_locate (playhead_cursor->current_frame () + distance); @@ -485,8 +489,7 @@ Editor::nudge_backward (bool next, bool force_playhead) } else if (!force_playhead && !selection->markers.empty()) { bool is_start; - - begin_reversible_command (_("nudge location forward")); + bool in_command = false; for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { @@ -519,13 +522,17 @@ Editor::nudge_backward (bool next, bool force_playhead) loc->set_end (loc->length()); } } - + if (!in_command) { + begin_reversible_command (_("nudge location forward")); + in_command = true; + } XMLNode& after (loc->get_state()); _session->add_command (new MementoCommand(*loc, &before, &after)); } } - - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } else { @@ -615,7 +622,8 @@ Editor::sequence_regions () if (!rs.empty()) { - begin_reversible_command (_("sequence regions")); + bool in_command = false; + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr r ((*i)->region()); @@ -635,15 +643,22 @@ Editor::sequence_regions () r->set_position(r_end_prev); } + if (!in_command) { + begin_reversible_command (_("sequence regions")); + in_command = true; + } _session->add_command (new StatefulDiffCommand (r)); r_end=r->position() + r->length(); iCount++; } - commit_reversible_command (); - } -} + + if (in_command) { + commit_reversible_command (); + } + } +} /* DISPLAY MOTION */ @@ -698,7 +713,7 @@ Editor::build_region_boundary_cache () TimeAxisView *ontrack = 0; TrackViewList tlist; - + if (!selection->tracks.empty()) { tlist = selection->tracks.filter_to_unique_playlists (); } else { @@ -1472,33 +1487,33 @@ Editor::scroll_down_one_track (bool skip_child_views) } /* move to the track below the first one that covers the */ - + if (next != track_views.rend()) { ensure_time_axis_view_is_visible (**next, true); return true; } return false; -} +} bool Editor::scroll_up_one_track (bool skip_child_views) { TrackViewList::iterator prev = track_views.end(); double top_of_trackviews = vertical_adjustment.get_value (); - + for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { if ((*t)->hidden()) { continue; } - /* find the trackview at the top of the trackview group + /* 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; @@ -1506,7 +1521,7 @@ Editor::scroll_up_one_track (bool skip_child_views) /* 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 + * - 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 @@ -1547,7 +1562,7 @@ Editor::scroll_up_one_track (bool skip_child_views) prev = t; } - + if (prev != track_views.end()) { // move to bottom-most automation-lane of the previous track TimeAxisView::Children kids = (*prev)->get_child_list(); @@ -1586,7 +1601,7 @@ Editor::tav_zoom_step (bool coarser) } else { ts = &selection->tracks; } - + for (TrackViewList::iterator i = ts->begin(); i != ts->end(); ++i) { TimeAxisView *tv = (static_cast(*i)); tv->step_height (coarser); @@ -1605,7 +1620,7 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all) } else { ts = &selection->tracks; } - + for (TrackViewList::iterator i = ts->begin(); i != ts->end(); ++i) { TimeAxisView *tv = (static_cast(*i)); uint32_t h = tv->current_height (); @@ -1663,7 +1678,7 @@ Editor::temporal_zoom (framecnt_t fpp) return; } - // Imposing an arbitrary limit to zoom out as too much zoom out produces + // Imposing an arbitrary limit to zoom out as too much zoom out produces // segfaults for lack of memory. If somebody decides this is not high enough I // believe it can be raisen to higher values but some limit must be in place. // @@ -1810,7 +1825,7 @@ Editor::temporal_zoom_region (bool both_axes) if ( !get_selection_extents(start, end) ) return; - + calc_extra_zoom_edges (start, end); /* if we're zooming on both axes we need to save track heights etc. @@ -1821,7 +1836,7 @@ Editor::temporal_zoom_region (bool both_axes) PBD::Unwinder nsv (no_save_visual, true); temporal_zoom_by_frame (start, end); - + if (both_axes) { uint32_t per_track_height = (uint32_t) floor ((_visible_canvas_height - 10.0) / tracks.size()); @@ -1854,7 +1869,7 @@ Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) 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 @@ -1876,15 +1891,15 @@ Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) } else if (!selection->time.empty()) { start = selection->time.start(); end = selection->time.end_frame(); - } else + } else ret = false; //no selection found //range check if ((start == 0 && end == 0) || end < start) { ret = false; } - - return ret; + + return ret; } @@ -1909,7 +1924,7 @@ Editor::temporal_zoom_selection (bool both_axes) calc_extra_zoom_edges(start, end); temporal_zoom_by_frame (start, end); } - + if (both_axes) fit_selection(); } @@ -1959,7 +1974,7 @@ Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end) framepos_t range = end - start; 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)); @@ -2012,7 +2027,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame) /* zoom focus is automatically taken as @param frame when this method is used. */ - + framepos_t new_leftmost = frame - (framepos_t)range_before; if (new_leftmost > frame) { @@ -2030,7 +2045,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame) bool Editor::choose_new_marker_name(string &name) { - if (!ARDOUR_UI::config()->get_name_new_markers()) { + if (!UIConfiguration::instance().get_name_new_markers()) { /* don't prompt user for a new name */ return true; } @@ -2083,12 +2098,12 @@ Editor::add_location_from_selection () Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker); 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)); - + commit_reversible_command (); } @@ -2105,12 +2120,12 @@ Editor::add_location_mark (framepos_t where) } Location *location = new Location (*_session, where, where, markername, Location::IsMark); 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)); - + commit_reversible_command (); } @@ -2119,7 +2134,7 @@ Editor::set_session_start_from_playhead () { if (!_session) return; - + Location* loc; if ((loc = _session->locations()->session_range_location()) == 0) { //should never happen _session->set_session_extents ( _session->audible_frame(), _session->audible_frame() ); @@ -2131,7 +2146,7 @@ Editor::set_session_start_from_playhead () XMLNode &after = loc->get_state(); begin_reversible_command (_("Set session start")); - + _session->add_command (new MementoCommand(*loc, &before, &after)); commit_reversible_command (); @@ -2143,7 +2158,7 @@ Editor::set_session_end_from_playhead () { if (!_session) return; - + Location* loc; if ((loc = _session->locations()->session_range_location()) == 0) { //should never happen _session->set_session_extents ( _session->audible_frame(), _session->audible_frame() ); @@ -2172,10 +2187,7 @@ void Editor::remove_location_at_playhead_cursor () { if (_session) { - //set up for undo - begin_reversible_command (_("remove marker")); - XMLNode &before = _session->locations()->get_state(); bool removed = false; @@ -2188,12 +2200,12 @@ Editor::remove_location_at_playhead_cursor () removed = true; } } - + //store undo if (removed) { + begin_reversible_command (_("remove marker")); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); - commit_reversible_command (); } } @@ -2208,9 +2220,8 @@ Editor::add_locations_from_region () if (rs.empty()) { return; } + bool commit = false; - 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) { @@ -2220,12 +2231,15 @@ Editor::add_locations_from_region () Location *location = new Location (*_session, region->position(), region->last_frame(), region->name(), Location::IsRangeMarker); _session->locations()->add (location, true); + commit = true; } - XMLNode &after = _session->locations()->get_state(); - _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); - - commit_reversible_command (); + if (commit) { + begin_reversible_command (selection->regions.size () > 1 ? _("add markers") : _("add marker")); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); + commit_reversible_command (); + } } /** Add a single range marker around all selected regions */ @@ -2238,8 +2252,6 @@ Editor::add_location_from_region () return; } - begin_reversible_command (_("add marker")); - XMLNode &before = _session->locations()->get_state(); string markername; @@ -2260,9 +2272,9 @@ Editor::add_location_from_region () Location *location = new Location (*_session, selection->regions.start(), selection->regions.end_frame(), markername, Location::IsRangeMarker); _session->locations()->add (location, true); + begin_reversible_command (_("add marker")); XMLNode &after = _session->locations()->get_state(); _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); - commit_reversible_command (); } @@ -2280,7 +2292,7 @@ Editor::jump_forward_to_mark () if (pos < 0) { return; } - + _session->request_locate (pos, _session->transport_rolling()); } @@ -2320,12 +2332,12 @@ Editor::clear_markers () { if (_session) { 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)); - + commit_reversible_command (); } } @@ -2335,14 +2347,14 @@ Editor::clear_ranges () { if (_session) { 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)); - + commit_reversible_command (); } } @@ -2351,12 +2363,12 @@ void Editor::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)); - + commit_reversible_command (); } @@ -2525,18 +2537,18 @@ Editor::get_preroll () void Editor::maybe_locate_with_edit_preroll ( framepos_t location ) { - if ( _session->transport_rolling() || !ARDOUR_UI::config()->get_follow_edits() || _ignore_follow_edits ) + if ( _session->transport_rolling() || !UIConfiguration::instance().get_follow_edits() || _ignore_follow_edits ) return; location -= get_preroll(); - + //don't try to locate before the beginning of time - if ( location < 0 ) + if ( location < 0 ) location = 0; - + //if follow_playhead is on, keep the playhead on the screen if ( _follow_playhead ) - if ( location < leftmost_frame ) + if ( location < leftmost_frame ) location = leftmost_frame; _session->request_locate( location ); @@ -2547,16 +2559,16 @@ Editor::play_with_preroll () { { framepos_t preroll = get_preroll(); - + framepos_t start, end; if (!get_selection_extents ( start, end)) return; if (start > preroll) start = start - preroll; - + end = end + preroll; //"post-roll" - + AudioRange ar (start, end, 0); list lar; lar.push_back (ar); @@ -2617,7 +2629,7 @@ Editor::do_layer_operation (LayerOperation op) begin_reversible_command (_("raise region to top")); } break; - + case Lower: if (multiple) { begin_reversible_command (_("lower regions")); @@ -2625,7 +2637,7 @@ Editor::do_layer_operation (LayerOperation op) begin_reversible_command (_("lower region")); } break; - + case LowerToBottom: if (multiple) { begin_reversible_command (_("lower regions to bottom")); @@ -2639,7 +2651,7 @@ Editor::do_layer_operation (LayerOperation op) for (set >::iterator i = playlists.begin(); i != playlists.end(); ++i) { (*i)->clear_owned_changes (); } - + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { boost::shared_ptr r = (*i)->region (); switch (op) { @@ -2662,7 +2674,7 @@ Editor::do_layer_operation (LayerOperation op) (*i)->rdiff (cmds); _session->add_commands (cmds); } - + commit_reversible_command (); } @@ -2755,25 +2767,6 @@ Editor::rename_region () } } -void -Editor::audition_playlist_region_via_route (boost::shared_ptr region, Route& route) -{ - if (_session->is_auditioning()) { - _session->cancel_audition (); - } - - // note: some potential for creativity here, because region doesn't - // have to belong to the playlist that Route is handling - - // bool was_soloed = route.soloed(); - - route.set_solo (true, this); - - _session->request_bounded_roll (region->position(), region->position() + region->length()); - - /* XXX how to unset the solo state ? */ -} - /** Start an audition of the first selected region */ void Editor::play_edit_range () @@ -3264,8 +3257,7 @@ Editor::crop_region_to (framepos_t start, framepos_t end) framepos_t the_start; framepos_t the_end; framepos_t cnt; - - begin_reversible_command (_("trim to selection")); + bool in_command = false; for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { @@ -3290,12 +3282,18 @@ Editor::crop_region_to (framepos_t start, framepos_t end) the_end = min (end, the_end); cnt = the_end - the_start + 1; + if(!in_command) { + begin_reversible_command (_("trim to selection")); + in_command = true; + } region->clear_changes (); region->trim_to (the_start, cnt); _session->add_command (new StatefulDiffCommand (region)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -3308,8 +3306,8 @@ Editor::region_fill_track () } framepos_t const end = _session->current_end_frame (); - - begin_reversible_command (Operations::region_fill); + RegionSelection foo; + bool in_command = false; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { @@ -3318,21 +3316,39 @@ Editor::region_fill_track () boost::shared_ptr pl = region->playlist(); if (end <= region->last_frame()) { - return; + continue; } double times = (double) (end - region->last_frame()) / (double) region->length(); if (times == 0) { - return; + continue; + } + + if (!in_command) { + begin_reversible_command (Operations::region_fill); + in_command = true; } + TimeAxisView& tv = (*i)->get_time_axis_view(); + RouteTimeAxisView* rtv = dynamic_cast (&tv); + latest_regionviews.clear (); + sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)); pl->clear_changes (); pl->add_region (RegionFactory::create (region, true), region->last_frame(), times); _session->add_command (new StatefulDiffCommand (pl)); + + c.disconnect (); + + foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } - commit_reversible_command (); + if (in_command) { + if (!foo.empty()) { + selection->set (foo); + } + commit_reversible_command (); + } } void @@ -3362,10 +3378,10 @@ Editor::region_fill_selection () framepos_t selection_length = end - start; float times = (float)selection_length / region->length(); - - begin_reversible_command (Operations::fill_selection); + bool in_command = false; TrackViewList ts = selection->tracks.filter_to_unique_playlists (); + RegionSelection foo; for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { @@ -3373,12 +3389,27 @@ Editor::region_fill_selection () continue; } + if (!in_command) { + begin_reversible_command (Operations::fill_selection); + in_command = true; + } + RouteTimeAxisView* rtv = dynamic_cast (*i); + latest_regionviews.clear (); + sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)); + playlist->clear_changes (); playlist->add_region (RegionFactory::create (region, true), start, times); _session->add_command (new StatefulDiffCommand (playlist)); + c.disconnect (); + foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } - commit_reversible_command (); + if (in_command) { + if (!foo.empty()) { + selection->set (foo); + } + commit_reversible_command (); + } } void @@ -3676,8 +3707,7 @@ void Editor::trim_region_to_location (const Location& loc, const char* str) { RegionSelection rs = get_regions_from_selection_and_entered (); - - begin_reversible_command (str); + bool in_command = false; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { RegionView* rv = (*x); @@ -3708,10 +3738,17 @@ Editor::trim_region_to_location (const Location& loc, const char* str) rv->region()->clear_changes (); rv->region()->trim_to (start, (end - start)); + + if (!in_command) { + begin_reversible_command (str); + in_command = true; + } _session->add_command(new StatefulDiffCommand (rv->region())); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -3730,8 +3767,7 @@ void Editor::trim_to_region(bool forward) { RegionSelection rs = get_regions_from_selection_and_entered (); - - begin_reversible_command (_("trim to region")); + bool in_command = false; boost::shared_ptr next_region; @@ -3746,7 +3782,7 @@ Editor::trim_to_region(bool forward) AudioTimeAxisView* atav = dynamic_cast (&arv->get_time_axis_view()); if (!atav) { - return; + continue; } float speed = 1.0; @@ -3785,10 +3821,16 @@ Editor::trim_to_region(bool forward) arv->region_changed (ARDOUR::bounds_change); } + if (!in_command) { + begin_reversible_command (_("trim to region")); + in_command = true; + } _session->add_command(new StatefulDiffCommand (region)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -3828,7 +3870,7 @@ Editor::freeze_route () /* stop transport before we start. this is important */ _session->request_transport_speed (0.0); - + /* wait for just a little while, because the above call is asynchronous */ Glib::usleep (250000); @@ -3913,8 +3955,7 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) framepos_t start = selection->time[clicked_selection].start; framepos_t end = selection->time[clicked_selection].end; framepos_t cnt = end - start + 1; - - begin_reversible_command (_("bounce range")); + bool in_command = false; for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) { @@ -3927,7 +3968,7 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) boost::shared_ptr playlist; if ((playlist = rtv->playlist()) == 0) { - return; + continue; } InterThreadInfo itt; @@ -3954,6 +3995,10 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) playlist->add_region (r, start); } + if (!in_command) { + begin_reversible_command (_("bounce range")); + in_command = true; + } vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); @@ -3961,7 +4006,9 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) _session->add_command (new StatefulDiffCommand (playlist)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } /** Delete selected regions, automation points or a time range */ @@ -4078,15 +4125,15 @@ Editor::cut_copy (CutCopyOp op) if (!selection->regions.empty()) { cut_copy_regions (op, selection->regions); - + if (op == Cut || op == Delete) { selection->clear_regions (); } } - + if (!selection->points.empty()) { cut_copy_points (op); - + if (op == Cut || op == Delete) { selection->clear_points (); } @@ -4104,19 +4151,19 @@ Editor::cut_copy (CutCopyOp op) did_edit = true; cut_copy_ranges (op); - + if (op == Cut || op == Delete) { selection->clear_time (); } } - + if (did_edit) { /* reset repeated paste state */ paste_count = 0; last_paste_pos = 0; - commit_reversible_command (); + commit_reversible_command (); } - + if (op == Delete || op == Cut || op == Clear) { _drags->abort (); } @@ -4125,7 +4172,7 @@ Editor::cut_copy (CutCopyOp op) struct AutomationRecord { 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 @@ -4211,10 +4258,10 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid cut_buffer->add (i->second.copy); } } - + if (op == Delete || op == Cut) { /* This operation needs to remove things from the main AutomationList, so do that now */ - + for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) { i->first->freeze (); } @@ -4299,7 +4346,7 @@ Editor::remove_clicked_region () vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); } @@ -4315,8 +4362,6 @@ Editor::remove_selected_regions () return; } - begin_reversible_command (_("remove region")); - list > regions_to_remove; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { @@ -4360,6 +4405,7 @@ Editor::remove_selected_regions () } vector >::iterator pl; + bool in_command = false; for (pl = playlists.begin(); pl != playlists.end(); ++pl) { (*pl)->thaw (); @@ -4367,14 +4413,21 @@ Editor::remove_selected_regions () /* We might have removed regions, which alters other regions' layering_index, so we need to do a recursive diff here. */ + + if (!in_command) { + begin_reversible_command (_("remove region")); + in_command = true; + } vector cmds; (*pl)->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (*pl)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } /** Cut, copy or clear selected regions. @@ -4460,15 +4513,15 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) if (op != Delete) { vector::iterator z; - + for (z = pmap.begin(); z != pmap.end(); ++z) { if ((*z).tv == &tv) { break; } } - + assert (z != pmap.end()); - + if (!(*z).pl) { npl = PlaylistFactory::create (pl->data_type(), *_session, "cutlist", true); npl->freeze(); @@ -4489,7 +4542,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) if (Config->get_edit_mode() == Ripple) pl->ripple (r->position(), -r->length(), boost::shared_ptr()); break; - + case Cut: _xx = RegionFactory::create (r); npl->add_region (_xx, r->position() - first_position); @@ -4516,20 +4569,20 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) if (op != Delete) { list > foo; - + /* the pmap is in the same order as the tracks in which selected regions occured */ - + for (vector::iterator i = pmap.begin(); i != pmap.end(); ++i) { if ((*i).pl) { (*i).pl->thaw(); foo.push_back ((*i).pl); } } - + if (!foo.empty()) { cut_buffer->set (foo); } - + if (pmap.empty()) { _last_cut_copy_source_track = 0; } else { @@ -4546,7 +4599,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) vector cmds; (*pl)->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command (new StatefulDiffCommand (*pl)); } } @@ -4569,7 +4622,7 @@ Editor::cut_copy_ranges (CutCopyOp op) return; } ts.push_back (entered_track); - } + } for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { (*i)->cut_copy_clear (*selection, op); @@ -4710,12 +4763,17 @@ Editor::paste_internal (framepos_t position, float times) void Editor::duplicate_some_regions (RegionSelection& regions, float times) { + if (regions.empty ()) { + return; + } + boost::shared_ptr playlist; RegionSelection sel = regions; // clear (below) may clear the argument list if its the current region selection RegionSelection foo; framepos_t const start_frame = regions.start (); framepos_t const end_frame = regions.end_frame (); + framecnt_t const gap = end_frame - start_frame; begin_reversible_command (Operations::duplicate_region); @@ -4730,9 +4788,10 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) latest_regionviews.clear (); sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)); + framepos_t const position = end_frame + (r->first_frame() - start_frame); playlist = (*i)->region()->playlist(); playlist->clear_changes (); - playlist->duplicate (r, end_frame + (r->first_frame() - start_frame), times); + playlist->duplicate (r, position, gap, times); _session->add_command(new StatefulDiffCommand (playlist)); c.disconnect (); @@ -4764,11 +4823,10 @@ Editor::duplicate_selection (float times) return; } - begin_reversible_command (_("duplicate selection")); - ri = new_regions.begin(); TrackViewList ts = selection->tracks.filter_to_unique_playlists (); + bool in_command = false; for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { if ((playlist = (*i)->playlist()) == 0) { @@ -4782,6 +4840,11 @@ Editor::duplicate_selection (float times) end = selection->time.end_frame(); } playlist->duplicate (*ri, end, times); + + if (!in_command) { + begin_reversible_command (_("duplicate selection")); + in_command = true; + } _session->add_command (new StatefulDiffCommand (playlist)); ++ri; @@ -4790,7 +4853,9 @@ Editor::duplicate_selection (float times) } } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } /** Reset all selected points to the relevant default value */ @@ -4848,9 +4913,8 @@ Editor::nudge_track (bool use_edit, bool forwards) return; } - begin_reversible_command (_("nudge track")); - TrackViewList ts = selection->tracks.filter_to_unique_playlists (); + bool in_command = false; for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { @@ -4863,6 +4927,10 @@ Editor::nudge_track (bool use_edit, bool forwards) playlist->nudge_after (start, distance, forwards); + if (!in_command) { + begin_reversible_command (_("nudge track")); + in_command = true; + } vector cmds; playlist->rdiff (cmds); @@ -4871,7 +4939,9 @@ Editor::nudge_track (bool use_edit, bool forwards) _session->add_command (new StatefulDiffCommand (playlist)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -4951,9 +5021,8 @@ Editor::normalize_region () } } - begin_reversible_command (_("normalize")); - list::const_iterator a = max_amps.begin (); + bool in_command = false; for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { AudioRegionView* const arv = dynamic_cast (*r); @@ -4966,12 +5035,19 @@ Editor::normalize_region () double const amp = dialog.normalize_individually() ? *a : max_amp; arv->audio_region()->normalize (amp, dialog.target ()); + + if (!in_command) { + begin_reversible_command (_("normalize")); + in_command = true; + } _session->add_command (new StatefulDiffCommand (arv->region())); ++a; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } @@ -4988,7 +5064,7 @@ Editor::reset_region_scale_amplitude () return; } - begin_reversible_command ("reset gain"); + bool in_command = false; for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { AudioRegionView* const arv = dynamic_cast(*r); @@ -4996,10 +5072,17 @@ Editor::reset_region_scale_amplitude () continue; arv->region()->clear_changes (); arv->audio_region()->set_scale_amplitude (1.0f); + + if(!in_command) { + begin_reversible_command ("reset gain"); + in_command = true; + } _session->add_command (new StatefulDiffCommand (arv->region())); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5011,7 +5094,7 @@ Editor::adjust_region_gain (bool up) return; } - begin_reversible_command ("adjust region gain"); + bool in_command = false; for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { AudioRegionView* const arv = dynamic_cast(*r); @@ -5030,10 +5113,17 @@ Editor::adjust_region_gain (bool up) } arv->audio_region()->set_scale_amplitude (dB_to_coefficient (dB)); + + if (!in_command) { + begin_reversible_command ("adjust region gain"); + in_command = true; + } _session->add_command (new StatefulDiffCommand (arv->region())); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } @@ -5070,6 +5160,8 @@ Editor::strip_region_silence () } } + assert (!audio_only.empty()); + StripSilenceDialog d (_session, audio_only); int const r = d.run (); @@ -5105,7 +5197,7 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs) return; } - begin_reversible_command (op.name ()); + bool in_command = false; for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ) { RegionSelection::const_iterator tmp = r; @@ -5116,6 +5208,10 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs) if (mrv) { Command* cmd = apply_midi_note_edit_op_to_region (op, *mrv); if (cmd) { + if (!in_command) { + begin_reversible_command (op.name ()); + in_command = true; + } (*cmd)(); _session->add_command (cmd); } @@ -5124,7 +5220,9 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs) r = tmp; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5136,9 +5234,9 @@ Editor::fork_region () return; } - begin_reversible_command (_("Fork Region(s)")); - CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); + bool in_command = false; + gdk_flush (); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { @@ -5152,7 +5250,11 @@ Editor::fork_region () boost::shared_ptr playlist = mrv->region()->playlist(); boost::shared_ptr new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track()); boost::shared_ptr newregion = mrv->midi_region()->clone (new_source); - + + if (!in_command) { + begin_reversible_command (_("Fork Region(s)")); + in_command = true; + } playlist->clear_changes (); playlist->replace_region (mrv->region(), newregion, mrv->region()->position()); _session->add_command(new StatefulDiffCommand (playlist)); @@ -5164,7 +5266,9 @@ Editor::fork_region () r = tmp; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5182,16 +5286,22 @@ Editor::quantize_regions (const RegionSelection& rs) return; } - QuantizeDialog* qd = new QuantizeDialog (*this); + if (!quantize_dialog) { + quantize_dialog = new QuantizeDialog (*this); + } - qd->present (); - const int r = qd->run (); - qd->hide (); + quantize_dialog->present (); + const int r = quantize_dialog->run (); + quantize_dialog->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()); + Quantize quant (quantize_dialog->snap_start(), + quantize_dialog->snap_end(), + quantize_dialog->start_grid_size(), + quantize_dialog->end_grid_size(), + quantize_dialog->strength(), + quantize_dialog->swing(), + quantize_dialog->threshold()); apply_midi_note_edit_op (quant, rs); } @@ -5286,9 +5396,9 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress return; } - begin_reversible_command (command); - CursorContext::Handle cursor_ctx = CursorContext::create(*this, _cursors->wait); + bool in_command = false; + gdk_flush (); int n = 0; @@ -5331,17 +5441,19 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress } } - /* We might have removed regions, which alters other regions' layering_index, so we need to do a recursive diff here. */ + + if (!in_command) { + begin_reversible_command (command); + in_command = true; + } vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (playlist)); - } else { - return; } if (progress) { @@ -5353,7 +5465,9 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress ++n; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5371,8 +5485,8 @@ Editor::reset_region_gain_envelopes () return; } - begin_reversible_command (_("reset region gain")); - + bool in_command = false; + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { @@ -5380,11 +5494,18 @@ Editor::reset_region_gain_envelopes () XMLNode& before (alist->get_state()); arv->audio_region()->set_default_envelope (); + + if (!in_command) { + begin_reversible_command (_("reset region gain")); + in_command = true; + } _session->add_command (new MementoCommand(*arv->audio_region()->envelope().get(), &before, &alist->get_state())); } } - - commit_reversible_command (); + + if (in_command) { + commit_reversible_command (); + } } void @@ -5424,18 +5545,25 @@ Editor::toggle_gain_envelope_active () return; } - begin_reversible_command (_("region gain envelope active")); - + bool in_command = false; + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { arv->region()->clear_changes (); arv->audio_region()->set_envelope_active (!arv->audio_region()->envelope_active()); + + if (!in_command) { + begin_reversible_command (_("region gain envelope active")); + in_command = true; + } _session->add_command (new StatefulDiffCommand (arv->region())); } } - - commit_reversible_command (); + + if (in_command) { + commit_reversible_command (); + } } void @@ -5452,13 +5580,13 @@ Editor::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())); } - + commit_reversible_command (); } @@ -5476,13 +5604,13 @@ Editor::toggle_region_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())); } - + commit_reversible_command (); } @@ -5500,14 +5628,14 @@ Editor::toggle_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())); } - + commit_reversible_command (); } @@ -5525,13 +5653,13 @@ Editor::toggle_opaque_region () } 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())); } - + commit_reversible_command (); } @@ -5665,13 +5793,13 @@ Editor::set_fade_length (bool in) cmd = _("set fade out length"); } - begin_reversible_command (cmd); + bool in_command = false; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { AudioRegionView* tmp = dynamic_cast (*x); if (!tmp) { - return; + continue; } boost::shared_ptr alist; @@ -5691,11 +5819,17 @@ Editor::set_fade_length (bool in) tmp->audio_region()->set_fade_out_active (true); } + if (!in_command) { + begin_reversible_command (cmd); + in_command = true; + } XMLNode &after = alist->get_state(); _session->add_command(new MementoCommand(*alist, &before, &after)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5706,14 +5840,13 @@ Editor::set_fade_in_shape (FadeShape shape) if (rs.empty()) { return; } - - begin_reversible_command (_("set fade in shape")); + bool in_command = false; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { AudioRegionView* tmp = dynamic_cast (*x); if (!tmp) { - return; + continue; } boost::shared_ptr alist = tmp->audio_region()->fade_in(); @@ -5721,12 +5854,17 @@ Editor::set_fade_in_shape (FadeShape shape) tmp->audio_region()->set_fade_in_shape (shape); + if (!in_command) { + begin_reversible_command (_("set fade in shape")); + in_command = true; + } XMLNode &after = alist->get_state(); _session->add_command(new MementoCommand(*alist.get(), &before, &after)); } - commit_reversible_command (); - + if (in_command) { + commit_reversible_command (); + } } void @@ -5737,14 +5875,13 @@ Editor::set_fade_out_shape (FadeShape shape) if (rs.empty()) { return; } - - begin_reversible_command (_("set fade out shape")); + bool in_command = false; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { AudioRegionView* tmp = dynamic_cast (*x); if (!tmp) { - return; + continue; } boost::shared_ptr alist = tmp->audio_region()->fade_out(); @@ -5752,11 +5889,17 @@ Editor::set_fade_out_shape (FadeShape shape) tmp->audio_region()->set_fade_out_shape (shape); + if(!in_command) { + begin_reversible_command (_("set fade out shape")); + in_command = true; + } XMLNode &after = alist->get_state(); _session->add_command(new MementoCommand(*alist.get(), &before, &after)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5767,14 +5910,13 @@ Editor::set_fade_in_active (bool yn) if (rs.empty()) { return; } - - begin_reversible_command (_("set fade in active")); + bool in_command = false; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { AudioRegionView* tmp = dynamic_cast (*x); if (!tmp) { - return; + continue; } @@ -5782,10 +5924,17 @@ Editor::set_fade_in_active (bool yn) ar->clear_changes (); ar->set_fade_in_active (yn); + + if (!in_command) { + begin_reversible_command (_("set fade in active")); + in_command = true; + } _session->add_command (new StatefulDiffCommand (ar)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5796,24 +5945,30 @@ Editor::set_fade_out_active (bool yn) if (rs.empty()) { return; } - - begin_reversible_command (_("set fade out active")); + bool in_command = false; for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { AudioRegionView* tmp = dynamic_cast (*x); if (!tmp) { - return; + continue; } boost::shared_ptr ar (tmp->audio_region()); ar->clear_changes (); ar->set_fade_out_active (yn); + + if (!in_command) { + begin_reversible_command (_("set fade out active")); + in_command = true; + } _session->add_command(new StatefulDiffCommand (ar)); } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5822,7 +5977,7 @@ Editor::toggle_region_fades (int dir) if (_ignore_region_action) { return; } - + boost::shared_ptr ar; bool yn = false; @@ -5849,11 +6004,14 @@ Editor::toggle_region_fades (int dir) } /* XXX should this undo-able? */ + bool in_command = false; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { if ((ar = boost::dynamic_pointer_cast((*i)->region())) == 0) { continue; } + ar->clear_changes (); + if (dir == 1 || dir == 0) { ar->set_fade_in_active (!yn); } @@ -5861,6 +6019,15 @@ Editor::toggle_region_fades (int dir) if (dir == -1 || dir == 0) { ar->set_fade_out_active (!yn); } + if (!in_command) { + begin_reversible_command (_("toggle fade active")); + in_command = true; + } + _session->add_command(new StatefulDiffCommand (ar)); + } + + if (in_command) { + commit_reversible_command (); } } @@ -5930,7 +6097,7 @@ Editor::set_playhead_cursor () } } - if (ARDOUR_UI::config()->get_follow_edits()) { + if (UIConfiguration::instance().get_follow_edits()) { cancel_time_selection(); } } @@ -5938,6 +6105,10 @@ Editor::set_playhead_cursor () void Editor::split_region () { + if (_drags->active ()) { + return; + } + //if a range is selected, separate it if ( !selection->time.empty()) { separate_regions_between (selection->time); @@ -5946,7 +6117,7 @@ Editor::split_region () //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 (); @@ -6081,7 +6252,7 @@ Editor::set_session_extents_from_selection () if (_session == 0) { return; } - + framepos_t start, end; if (!get_selection_extents ( start, end)) return; @@ -6104,6 +6275,127 @@ Editor::set_session_extents_from_selection () } } +void +Editor::set_punch_start_from_edit_point () +{ + if (_session) { + + framepos_t start = 0; + framepos_t end = max_framepos; + + //use the existing punch end, if any + Location* tpl = transport_punch_location(); + if (tpl) { + end = tpl->end(); + } + + if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { + start = _session->audible_frame(); + } else { + start = get_preferred_edit_position(); + } + + //snap the selection start/end + snap_to(start); + + //if there's not already a sensible selection endpoint, go "forever" + if ( start > end ) { + end = max_framepos; + } + + set_punch_range (start, end, _("set punch start from EP")); + } + +} + +void +Editor::set_punch_end_from_edit_point () +{ + if (_session) { + + framepos_t start = 0; + framepos_t end = max_framepos; + + //use the existing punch start, if any + Location* tpl = transport_punch_location(); + if (tpl) { + start = tpl->start(); + } + + if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { + end = _session->audible_frame(); + } else { + end = get_preferred_edit_position(); + } + + //snap the selection start/end + snap_to(end); + + set_punch_range (start, end, _("set punch end from EP")); + + } +} + +void +Editor::set_loop_start_from_edit_point () +{ + if (_session) { + + framepos_t start = 0; + framepos_t end = max_framepos; + + //use the existing loop end, if any + Location* tpl = transport_loop_location(); + if (tpl) { + end = tpl->end(); + } + + if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { + start = _session->audible_frame(); + } else { + start = get_preferred_edit_position(); + } + + //snap the selection start/end + snap_to(start); + + //if there's not already a sensible selection endpoint, go "forever" + if ( start > end ) { + end = max_framepos; + } + + set_loop_range (start, end, _("set loop start from EP")); + } + +} + +void +Editor::set_loop_end_from_edit_point () +{ + if (_session) { + + framepos_t start = 0; + framepos_t end = max_framepos; + + //use the existing loop start, if any + Location* tpl = transport_loop_location(); + if (tpl) { + start = tpl->start(); + } + + if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { + end = _session->audible_frame(); + } else { + end = get_preferred_edit_position(); + } + + //snap the selection start/end + snap_to(end); + + set_loop_range (start, end, _("set loop end from EP")); + } +} + void Editor::set_punch_from_region () { @@ -6282,7 +6574,7 @@ Editor::split_region_at_transients () } begin_reversible_command (_("split regions")); - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) { RegionSelection::iterator tmp; @@ -6299,7 +6591,7 @@ Editor::split_region_at_transients () i = tmp; } - + commit_reversible_command (); } @@ -6462,7 +6754,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList vector cmds; pl->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command (new StatefulDiffCommand (pl)); if (select_new) { @@ -6489,12 +6781,12 @@ Editor::place_transient() framepos_t where = get_preferred_edit_position(); 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); } - + commit_reversible_command (); } @@ -6524,7 +6816,7 @@ Editor::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(); @@ -6547,7 +6839,7 @@ Editor::snap_regions_to_grid () (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); } @@ -6607,7 +6899,7 @@ Editor::close_region_gaps () /* Iterate over the region list and make adjacent regions overlap by crossfade_len_ms */ begin_reversible_command (_("close region gaps")); - + int idx = 0; boost::shared_ptr last_region; @@ -6646,7 +6938,7 @@ Editor::close_region_gaps () (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); } @@ -6736,7 +7028,7 @@ Editor::playhead_forward_to_grid () if (!_session) { return; } - + framepos_t pos = playhead_cursor->current_frame (); if (pos < max_framepos - 1) { pos += 2; @@ -6752,7 +7044,7 @@ Editor::playhead_backward_to_grid () if (!_session) { return; } - + framepos_t pos = playhead_cursor->current_frame (); if (pos > 2) { pos -= 2; @@ -6871,7 +7163,7 @@ edit your ardour.rc file to set the\n\ 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" @@ -6926,7 +7218,7 @@ Editor::do_insert_time () return; } - InsertTimeDialog d (*this); + InsertRemoveTimeDialog d (*this); int response = d.run (); if (response != RESPONSE_OK) { @@ -6958,13 +7250,11 @@ Editor::insert_time ( bool all_playlists, bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too ) { - bool commit = false; if (Config->get_edit_mode() == Lock) { return; } - - begin_reversible_command (_("insert time")); + bool in_command = false; TrackViewList ts = selection->tracks.filter_to_unique_playlists (); @@ -6981,7 +7271,7 @@ Editor::insert_time ( if (all_playlists) { RouteTimeAxisView* rtav = dynamic_cast (*x); - if (rtav) { + if (rtav && rtav->track ()) { vector > all = _session->playlists->playlists_for_track (rtav->track ()); for (vector >::iterator p = all.begin(); p != all.end(); ++p) { pl.insert (*p); @@ -6992,7 +7282,7 @@ Editor::insert_time ( pl.insert ((*x)->playlist ()); } } - + for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { (*i)->clear_changes (); @@ -7004,19 +7294,25 @@ Editor::insert_time ( (*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); + if (!in_command) { + begin_reversible_command (_("insert time")); + in_command = true; + } vector cmds; (*i)->rdiff (cmds); _session->add_commands (cmds); _session->add_command (new StatefulDiffCommand (*i)); - commit = true; } /* automation */ RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav) { + if (!in_command) { + begin_reversible_command (_("insert time")); + in_command = true; + } rtav->route ()->shift (pos, frames); - commit = true; } } @@ -7052,94 +7348,111 @@ Editor::insert_time ( } if (moved) { + if (!in_command) { + begin_reversible_command (_("insert time")); + in_command = true; + } XMLNode& after (_session->locations()->get_state()); _session->add_command (new MementoCommand(*_session->locations(), &before, &after)); } } if (tempo_too) { + if (!in_command) { + begin_reversible_command (_("insert time")); + in_command = true; + } + XMLNode& before (_session->tempo_map().get_state()); _session->tempo_map().insert_time (pos, frames); + XMLNode& after (_session->tempo_map().get_state()); + _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); } - if (commit) { + if (in_command) { 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 (); if (response != RESPONSE_OK) { return; } - + framecnt_t distance = d.distance(); if (distance == 0) { return; } - cut_time ( + remove_time ( pos, distance, SplitIntersected, d.move_glued(), d.move_markers(), + d.move_glued_markers(), + d.move_locked_markers(), d.move_tempos() ); } void -Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, - bool ignore_music_glue, bool markers_too, bool tempo_too) +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; - if (Config->get_edit_mode() == Lock) { error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg; return; } - - begin_reversible_command (_("cut time")); + bool in_command = false; for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { /* regions */ boost::shared_ptr pl = (*x)->playlist(); - + if (pl) { XMLNode &before = pl->get_state(); - + std::list rl; AudioRange ar(pos, pos+frames, 0); rl.push_back(ar); pl->cut (rl); pl->shift (pos, -frames, true, ignore_music_glue); - + + if (!in_command) { + begin_reversible_command (_("cut time")); + in_command = true; + } XMLNode &after = pl->get_state(); - + _session->add_command (new MementoCommand (*pl, &before, &after)); - commit = true; } - + /* automation */ RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav) { + if (!in_command) { + begin_reversible_command (_("cut time")); + in_command = true; + } rtav->route ()->shift (pos, -frames); - commit = true; } } std::list loc_kill_list; - + /* markers */ if (markers_too) { bool moved = false; @@ -7147,61 +7460,85 @@ Editor::cut_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, Locations::LocationList copy (_session->locations()->list()); for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) { - - if (!(*i)->is_mark()) { //range; have to handle both start and end + if ((*i)->position_lock_style() == AudioTime || glued_markers_too) { + + bool const was_locked = (*i)->locked (); + if (locked_markers_too) { + (*i)->unlock (); + } + + if (!(*i)->is_mark()) { // it's a range; have to handle both start and end if ((*i)->end() >= pos && (*i)->end() < pos+frames && (*i)->start() >= pos - && (*i)->end() < pos+frames) { //range is completely enclosed; kill it + && (*i)->end() < pos+frames) { // range is completely enclosed; kill it moved = true; loc_kill_list.push_back(*i); - } else { //ony start or end is included, try to do the right thing - if ((*i)->end() >= pos && (*i)->end() < pos+frames) { - (*i)->set_end (pos); //bring the end to the cut + } else { // only start or end is included, try to do the right thing + // move start before moving end, to avoid trying to move the end to before the start + // if we're removing more time than the length of the range + if ((*i)->start() >= pos && (*i)->start() < pos+frames) { + // start is within cut + (*i)->set_start (pos); // bring the start marker to the beginning of the cut moved = true; - } else if ((*i)->end() >= pos) { - (*i)->set_end ((*i)->end()-frames); //slip the end marker back + } else if ((*i)->start() >= pos+frames) { + // start (and thus entire range) lies beyond end of cut + (*i)->set_start ((*i)->start() - frames); // slip the start marker back moved = true; } - if ((*i)->start() >= pos && (*i)->start() < pos+frames) { - (*i)->set_start (pos); //bring the start marker to the beginning of the cut + if ((*i)->end() >= pos && (*i)->end() < pos+frames) { + // end is inside cut + (*i)->set_end (pos); // bring the end to the cut moved = true; - } else if ((*i)->start() >= pos) { - (*i)->set_start ((*i)->start() -frames); //slip the end marker back + } else if ((*i)->end() >= pos+frames) { + // end is beyond end of cut + (*i)->set_end ((*i)->end() - frames); // slip the end marker back moved = true; } + } - } else if ((*i)->start() >= pos && (*i)->start() < pos+frames ) { - loc_kill_list.push_back(*i); - moved = true; - } else if ((*i)->start() >= pos) { - (*i)->set_start ((*i)->start() -frames); - moved = true; + } else if ((*i)->start() >= pos && (*i)->start() < pos+frames ) { + loc_kill_list.push_back(*i); + moved = true; + } else if ((*i)->start() >= pos) { + (*i)->set_start ((*i)->start() -frames); + moved = true; + } + + if (was_locked) { + (*i)->lock (); + } } } for (list::iterator i = loc_kill_list.begin(); i != loc_kill_list.end(); ++i) { _session->locations()->remove( *i ); } - + if (moved) { + if (!in_command) { + begin_reversible_command (_("cut time")); + in_command = true; + } XMLNode& after (_session->locations()->get_state()); _session->add_command (new MementoCommand(*_session->locations(), &before, &after)); - commit = true; } } - + if (tempo_too) { XMLNode& before (_session->tempo_map().get_state()); - if (_session->tempo_map().cut_time (pos, frames) ) { + if (_session->tempo_map().remove_time (pos, frames) ) { + if (!in_command) { + begin_reversible_command (_("remove time")); + in_command = true; + } XMLNode& after (_session->tempo_map().get_state()); _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); - commit = true; } } - - if (commit) { + + if (in_command) { commit_reversible_command (); } } @@ -7259,9 +7596,9 @@ Editor::fit_tracks (TrackViewList & tracks) /* compute the per-track height from: - total canvas visible height - + total canvas visible height - height that will be taken by visible children of selected - tracks - height of the ruler/hscroll area + tracks - height of the ruler/hscroll area */ uint32_t h = (uint32_t) floor ((trackviews_height() - child_heights) / visible_tracks); double first_y_pos = DBL_MAX; @@ -7364,7 +7701,7 @@ void Editor::start_visual_state_op (uint32_t n) { save_visual_state (n); - + PopUp* pup = new PopUp (WIN_POS_MOUSE, 1000, true); char buf[32]; snprintf (buf, sizeof (buf), _("Saved view %u"), n+1); @@ -7498,7 +7835,7 @@ Editor::toggle_midi_input_active (bool flip_others) onoff = !mt->input_active(); } } - + _session->set_exclusive_input_active (rl, onoff, flip_others); } @@ -7516,19 +7853,14 @@ Editor::lock () b->set_text (_("Click to unlock")); b->signal_clicked.connect (sigc::mem_fun (*this, &Editor::unlock)); lock_dialog->get_vbox()->pack_start (*b); - + lock_dialog->get_vbox()->show_all (); lock_dialog->set_size_request (200, 200); } - -#ifdef __APPLE__ - /* The global menu bar continues to be accessible to applications - with modal dialogs, which means that we need to desensitize - all items in the menu bar. Since those items are really just - proxies for actions, that means disabling all actions. - */ - ActionManager::disable_all_actions (); -#endif + + delete _main_menu_disabler; + _main_menu_disabler = new MainMenuDisabler; + lock_dialog->present (); } @@ -7536,12 +7868,10 @@ void Editor::unlock () { lock_dialog->hide (); - -#ifdef __APPLE__ - ActionManager::pop_action_state (); -#endif - if (ARDOUR_UI::config()->get_lock_gui_after_seconds()) { + delete _main_menu_disabler; + + if (UIConfiguration::instance().get_lock_gui_after_seconds()) { start_lock_event_timing (); } } @@ -7570,11 +7900,11 @@ Editor::bring_all_sources_into_session () ArdourDialog w (_("Moving embedded files into session folder")); w.get_vbox()->pack_start (msg); w.present (); - + /* flush all pending GUI events because we're about to start copying * files */ - + Gtkmm2ext::UI::instance()->flush_pending (); cerr << " Do it\n";