X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=598725c72cd3ab019d192e3d4eeb7773f32e7d61;hb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;hp=8d73e5e56cbe7612aa5472c1440b65ad541a4594;hpb=f121d04d6d2eb668edbf7076602d196257bd21c9;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 8d73e5e56c..598725c72c 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -42,6 +42,7 @@ #include "ardour/audio_track.h" #include "ardour/audioregion.h" +#include "ardour/boost_debug.h" #include "ardour/dB.h" #include "ardour/location.h" #include "ardour/midi_region.h" @@ -57,11 +58,11 @@ #include "ardour/session_playlists.h" #include "ardour/strip_silence.h" #include "ardour/transient_detector.h" +#include "ardour/transpose.h" #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 +77,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" @@ -96,8 +97,10 @@ #include "streamview.h" #include "strip_silence_dialog.h" #include "time_axis_view.h" +#include "timers.h" #include "transpose_dialog.h" #include "transform_dialog.h" +#include "ui_config.h" #include "i18n.h" @@ -119,7 +122,7 @@ Editor::undo (uint32_t n) if (_drags->active ()) { _drags->abort (); } - + if (_session) { _session->undo (n); if (_session->undo_depth() == 0) { @@ -136,7 +139,7 @@ Editor::redo (uint32_t n) if (_drags->active ()) { _drags->abort (); } - + if (_session) { _session->redo (n); if (_session->redo_depth() == 0) { @@ -237,7 +240,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 +339,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 +403,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 +434,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 +492,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 +525,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 +625,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 +646,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 +716,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 +1490,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 +1524,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 +1565,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(); @@ -1572,6 +1590,53 @@ Editor::scroll_up_one_track (bool skip_child_views) return false; } +void +Editor::scroll_left_step () +{ + framepos_t xdelta = (current_page_samples() / 8); + + if (leftmost_frame > xdelta) { + reset_x_origin (leftmost_frame - xdelta); + } else { + reset_x_origin (0); + } +} + + +void +Editor::scroll_right_step () +{ + framepos_t xdelta = (current_page_samples() / 8); + + if (max_framepos - xdelta > leftmost_frame) { + reset_x_origin (leftmost_frame + xdelta); + } else { + reset_x_origin (max_framepos - current_page_samples()); + } +} + +void +Editor::scroll_left_half_page () +{ + framepos_t xdelta = (current_page_samples() / 2); + if (leftmost_frame > xdelta) { + reset_x_origin (leftmost_frame - xdelta); + } else { + reset_x_origin (0); + } +} + +void +Editor::scroll_right_half_page () +{ + framepos_t xdelta = (current_page_samples() / 2); + if (max_framepos - xdelta > leftmost_frame) { + reset_x_origin (leftmost_frame + xdelta); + } else { + reset_x_origin (max_framepos - current_page_samples()); + } +} + /* ZOOM */ void @@ -1586,7 +1651,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 +1670,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 (); @@ -1623,6 +1688,14 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all) } } +void +Editor::temporal_zoom_step_mouse_focus (bool coarser) +{ + Editing::ZoomFocus temp_focus = zoom_focus; + zoom_focus = Editing::ZoomFocusMouse; + temporal_zoom_step (coarser); + zoom_focus = temp_focus; +} void Editor::temporal_zoom_step (bool coarser) @@ -1663,7 +1736,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 +1883,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 +1894,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()); @@ -1849,12 +1922,12 @@ Editor::temporal_zoom_region (bool both_axes) bool -Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) +Editor::get_selection_extents (framepos_t &start, framepos_t &end) const { 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 +1949,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 +1982,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 +2032,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 +2085,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 +2103,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 +2156,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,15 +2178,63 @@ 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 (); } +void +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() ); + } else { + XMLNode &before = loc->get_state(); + + _session->set_session_extents ( _session->audible_frame(), loc->end() ); + + XMLNode &after = loc->get_state(); + + begin_reversible_command (_("Set session start")); + + _session->add_command (new MementoCommand(*loc, &before, &after)); + + commit_reversible_command (); + } +} + +void +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() ); + } else { + XMLNode &before = loc->get_state(); + + _session->set_session_extents ( loc->start(), _session->audible_frame() ); + + XMLNode &after = loc->get_state(); + + begin_reversible_command (_("Set session start")); + + _session->add_command (new MementoCommand(*loc, &before, &after)); + + commit_reversible_command (); + } +} + void Editor::add_location_from_playhead_cursor () { @@ -2124,10 +2245,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; @@ -2140,12 +2258,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 (); } } @@ -2160,9 +2278,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) { @@ -2172,12 +2289,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 */ @@ -2190,8 +2310,6 @@ Editor::add_location_from_region () return; } - begin_reversible_command (_("add marker")); - XMLNode &before = _session->locations()->get_state(); string markername; @@ -2212,9 +2330,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 (); } @@ -2232,7 +2350,7 @@ Editor::jump_forward_to_mark () if (pos < 0) { return; } - + _session->request_locate (pos, _session->transport_rolling()); } @@ -2272,12 +2390,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 (); } } @@ -2287,14 +2405,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 (); } } @@ -2303,12 +2421,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 (); } @@ -2435,7 +2553,7 @@ Editor::play_from_edit_point_and_return () framepos_t start_frame; framepos_t return_frame; - start_frame = get_preferred_edit_position (true); + start_frame = get_preferred_edit_position ( EDIT_IGNORE_PHEAD ); if (_session->transport_rolling()) { _session->request_locate (start_frame, false); @@ -2470,25 +2588,25 @@ Editor::play_selection () framepos_t Editor::get_preroll () { - return 1.0 /*Config->get_edit_preroll_seconds()*/ * _session->frame_rate(); + return Config->get_preroll_seconds() * _session->frame_rate(); } 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 || _session->config.get_external_sync() ) 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 ); @@ -2499,16 +2617,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); @@ -2569,7 +2687,7 @@ Editor::do_layer_operation (LayerOperation op) begin_reversible_command (_("raise region to top")); } break; - + case Lower: if (multiple) { begin_reversible_command (_("lower regions")); @@ -2577,7 +2695,7 @@ Editor::do_layer_operation (LayerOperation op) begin_reversible_command (_("lower region")); } break; - + case LowerToBottom: if (multiple) { begin_reversible_command (_("lower regions to bottom")); @@ -2591,7 +2709,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) { @@ -2614,7 +2732,7 @@ Editor::do_layer_operation (LayerOperation op) (*i)->rdiff (cmds); _session->add_commands (cmds); } - + commit_reversible_command (); } @@ -2665,7 +2783,7 @@ Editor::rename_region () return; } - ArdourDialog d (*this, _("Rename Region"), true, false); + ArdourDialog d (_("Rename Region"), true, false); Entry entry; Label label (_("New name:")); HBox hbox; @@ -2707,25 +2825,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 () @@ -3213,121 +3312,98 @@ Editor::crop_region_to (framepos_t start, framepos_t end) return; } - framepos_t the_start; - framepos_t the_end; - framepos_t cnt; - - begin_reversible_command (_("trim to selection")); + framepos_t pos; + framepos_t new_start; + framepos_t new_end; + framecnt_t new_length; + bool in_command = false; for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { - boost::shared_ptr region; + /* Only the top regions at start and end have to be cropped */ + boost::shared_ptr region_at_start = (*i)->top_region_at(start); + boost::shared_ptr region_at_end = (*i)->top_region_at(end); - the_start = start; + vector > regions; - if ((region = (*i)->top_region_at(the_start)) == 0) { - continue; + if (region_at_start != 0) { + regions.push_back (region_at_start); + } + if (region_at_end != 0) { + regions.push_back (region_at_end); } - /* now adjust lengths to that we do the right thing - if the selection extends beyond the region - */ + /* now adjust lengths */ + for (vector >::iterator i = regions.begin(); i != regions.end(); ++i) { - the_start = max (the_start, (framepos_t) region->position()); - if (max_framepos - the_start < region->length()) { - the_end = the_start + region->length() - 1; - } else { - the_end = max_framepos; - } - the_end = min (end, the_end); - cnt = the_end - the_start + 1; + pos = (*i)->position(); + new_start = max (start, pos); + if (max_framepos - pos > (*i)->length()) { + new_end = pos + (*i)->length() - 1; + } else { + new_end = max_framepos; + } + new_end = min (end, new_end); + new_length = new_end - new_start + 1; - region->clear_changes (); - region->trim_to (the_start, cnt); - _session->add_command (new StatefulDiffCommand (region)); + if(!in_command) { + begin_reversible_command (_("trim to selection")); + in_command = true; + } + (*i)->clear_changes (); + (*i)->trim_to (new_start, new_length); + _session->add_command (new StatefulDiffCommand (*i)); + } } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void Editor::region_fill_track () { - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (!_session || rs.empty()) { - return; - } + boost::shared_ptr playlist; + RegionSelection regions = get_regions_from_selection_and_entered (); + RegionSelection foo; framepos_t const end = _session->current_end_frame (); - begin_reversible_command (Operations::region_fill); - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - - boost::shared_ptr region ((*i)->region()); - - boost::shared_ptr pl = region->playlist(); - - if (end <= region->last_frame()) { - return; - } - - double times = (double) (end - region->last_frame()) / (double) region->length(); - - if (times == 0) { - return; - } - - pl->clear_changes (); - pl->add_region (RegionFactory::create (region, true), region->last_frame(), times); - _session->add_command (new StatefulDiffCommand (pl)); - } - - commit_reversible_command (); -} - -void -Editor::region_fill_selection () -{ - if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { - return; - } - - if (selection->time.empty()) { + if (regions.empty () || regions.end_frame () + 1 >= end) { return; } - boost::shared_ptr region = _regions->get_single_selection (); - if (region == 0) { - return; - } + framepos_t const start_frame = regions.start (); + framepos_t const end_frame = regions.end_frame (); + framecnt_t const gap = end_frame - start_frame + 1; - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; + begin_reversible_command (Operations::region_fill); - boost::shared_ptr playlist; + selection->clear_regions (); - if (selection->tracks.empty()) { - return; - } + for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { - framepos_t selection_length = end - start; - float times = (float)selection_length / region->length(); + boost::shared_ptr r ((*i)->region()); - begin_reversible_command (Operations::fill_selection); + 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)); - TrackViewList ts = selection->tracks.filter_to_unique_playlists (); + framepos_t const position = end_frame + (r->first_frame() - start_frame + 1); + playlist = (*i)->region()->playlist(); + playlist->clear_changes (); + playlist->duplicate_until (r, position, gap, end); + _session->add_command(new StatefulDiffCommand (playlist)); - for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { + c.disconnect (); - if ((playlist = (*i)->playlist()) == 0) { - continue; - } + foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); + } - playlist->clear_changes (); - playlist->add_region (RegionFactory::create (region, true), start, times); - _session->add_command (new StatefulDiffCommand (playlist)); + if (!foo.empty()) { + selection->set (foo); } commit_reversible_command (); @@ -3628,8 +3704,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); @@ -3660,10 +3735,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 @@ -3682,8 +3764,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; @@ -3698,7 +3779,7 @@ Editor::trim_to_region(bool forward) AudioTimeAxisView* atav = dynamic_cast (&arv->get_time_axis_view()); if (!atav) { - return; + continue; } float speed = 1.0; @@ -3737,11 +3818,17 @@ 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 Editor::unfreeze_route () @@ -3780,7 +3867,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); @@ -3831,6 +3918,7 @@ Editor::freeze_route () gtk_main_iteration (); } + pthread_join (itt.thread, 0); current_interthread_info = 0; } @@ -3865,8 +3953,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) { @@ -3879,7 +3966,7 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) boost::shared_ptr playlist; if ((playlist = rtv->playlist()) == 0) { - return; + continue; } InterThreadInfo itt; @@ -3906,6 +3993,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); @@ -3913,7 +4004,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 */ @@ -4004,6 +4097,7 @@ Editor::cut_copy (CutCopyOp op) Location* loc = find_location_from_marker (entered_marker, ignored); if (_session && loc) { + entered_marker = NULL; Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc)); } @@ -4030,15 +4124,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 (); } @@ -4056,19 +4150,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 (); } @@ -4077,7 +4171,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 @@ -4163,10 +4257,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 (); } @@ -4251,7 +4345,7 @@ Editor::remove_clicked_region () vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); } @@ -4267,8 +4361,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) { @@ -4312,6 +4404,7 @@ Editor::remove_selected_regions () } vector >::iterator pl; + bool in_command = false; for (pl = playlists.begin(); pl != playlists.end(); ++pl) { (*pl)->thaw (); @@ -4319,14 +4412,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. @@ -4412,15 +4512,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(); @@ -4441,7 +4541,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); @@ -4468,20 +4568,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 */ - + + /* the pmap is in the same order as the tracks in which selected regions occurred */ + 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 { @@ -4498,7 +4598,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) vector cmds; (*pl)->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command (new StatefulDiffCommand (*pl)); } } @@ -4521,7 +4621,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); @@ -4533,7 +4633,7 @@ Editor::paste (float times, bool from_context) { DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); - paste_internal (get_preferred_edit_position (false, from_context), times); + paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times); } void @@ -4662,12 +4762,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 + 1; begin_reversible_command (Operations::duplicate_region); @@ -4682,9 +4787,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 + 1); 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 (); @@ -4707,42 +4813,46 @@ Editor::duplicate_selection (float times) } boost::shared_ptr playlist; - vector > new_regions; - vector >::iterator ri; - - create_region_from_selection (new_regions); - - if (new_regions.empty()) { - 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) { continue; } playlist->clear_changes (); - framepos_t end; + if (clicked_selection) { - end = selection->time[clicked_selection].end; + playlist->duplicate_range (selection->time[clicked_selection], times); } else { - end = selection->time.end_frame(); + playlist->duplicate_ranges (selection->time, times); } - playlist->duplicate (*ri, end, times); - _session->add_command (new StatefulDiffCommand (playlist)); - ++ri; - if (ri == new_regions.end()) { - --ri; + if (!in_command) { + begin_reversible_command (_("duplicate range selection")); + in_command = true; } + _session->add_command (new StatefulDiffCommand (playlist)); + } - commit_reversible_command (); + if (in_command) { + // now "move" range selection to after the current range selection + framecnt_t distance = 0; + + if (clicked_selection) { + distance = selection->time[clicked_selection].end - + selection->time[clicked_selection].start; + } else { + distance = selection->time.end_frame() - selection->time.start(); + } + + selection->move_time (distance); + + commit_reversible_command (); + } } /** Reset all selected points to the relevant default value */ @@ -4800,9 +4910,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) { @@ -4815,6 +4924,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); @@ -4823,7 +4936,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 @@ -4903,9 +5018,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); @@ -4918,12 +5032,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 (); + } } @@ -4940,7 +5061,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); @@ -4948,10 +5069,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 @@ -4963,7 +5091,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); @@ -4982,10 +5110,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 (); + } } @@ -5022,15 +5157,18 @@ Editor::strip_region_silence () } } + assert (!audio_only.empty()); + StripSilenceDialog d (_session, audio_only); int const r = d.run (); - d.drop_rects (); + d.drop_rects (); - if (r == Gtk::RESPONSE_OK) { - ARDOUR::AudioIntervalMap silences; - d.silences (silences); + if (r == Gtk::RESPONSE_OK) { + ARDOUR::AudioIntervalMap silences; + d.silences (silences); StripSilence s (*_session, silences, d.fade_length()); + apply_filter (s, _("strip silence"), &d); } } @@ -5057,7 +5195,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; @@ -5068,6 +5206,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); } @@ -5076,7 +5218,9 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs) r = tmp; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5088,9 +5232,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(); ) { @@ -5104,7 +5248,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)); @@ -5116,7 +5264,9 @@ Editor::fork_region () r = tmp; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5134,16 +5284,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); } @@ -5183,18 +5339,42 @@ Editor::transform_regions (const RegionSelection& rs) return; } - TransformDialog* td = new TransformDialog(); + TransformDialog td; - td->present(); - const int r = td->run(); - td->hide(); + td.present(); + const int r = td.run(); + td.hide(); if (r == Gtk::RESPONSE_OK) { - Transform transform(td->get()); + Transform transform(td.get()); apply_midi_note_edit_op(transform, rs); } } +void +Editor::transpose_region () +{ + if (_session) { + transpose_regions(get_regions_from_selection_and_entered ()); + } +} + +void +Editor::transpose_regions (const RegionSelection& rs) +{ + if (rs.n_midi_regions() == 0) { + return; + } + + TransposeDialog d; + int const r = d.run (); + + if (r == RESPONSE_ACCEPT) { + Transpose transpose(d.semitones ()); + apply_midi_note_edit_op (transpose, rs); + } +} + void Editor::insert_patch_change (bool from_context) { @@ -5204,7 +5384,7 @@ Editor::insert_patch_change (bool from_context) return; } - const framepos_t p = get_preferred_edit_position (false, from_context); + const framepos_t p = get_preferred_edit_position (EDIT_IGNORE_NONE, from_context); /* XXX: bit of a hack; use the MIDNAM from the first selected region; there may be more than one, but the PatchChangeDialog can only offer @@ -5238,9 +5418,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; @@ -5263,6 +5443,11 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress playlist->clear_changes (); playlist->clear_owned_changes (); + if (!in_command) { + begin_reversible_command (command); + in_command = true; + } + if (filter.results.empty ()) { /* no regions returned; remove the old one */ @@ -5290,10 +5475,8 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (playlist)); - } else { - return; } if (progress) { @@ -5305,7 +5488,9 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress ++n; } - commit_reversible_command (); + if (in_command) { + commit_reversible_command (); + } } void @@ -5323,8 +5508,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) { @@ -5332,11 +5517,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 @@ -5376,18 +5568,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 @@ -5404,13 +5603,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 (); } @@ -5428,13 +5627,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 (); } @@ -5452,14 +5651,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 (); } @@ -5477,13 +5676,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 (); } @@ -5500,11 +5699,11 @@ Editor::toggle_record_enable () continue; if (first) { - new_state = !rtav->track()->record_enabled(); + new_state = !rtav->track()->rec_enable_control()->get_value(); first = false; } - rtav->track()->set_record_enabled (new_state, this); + rtav->track()->rec_enable_control()->set_value (new_state, Controllable::UseGroup); } } @@ -5513,7 +5712,7 @@ Editor::toggle_solo () { bool new_state = false; bool first = true; - boost::shared_ptr rl (new RouteList); + boost::shared_ptr cl (new ControlList); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { RouteTimeAxisView *rtav = dynamic_cast(*i); @@ -5527,10 +5726,10 @@ Editor::toggle_solo () first = false; } - rl->push_back (rtav->route()); + cl->push_back (rtav->route()->solo_control()); } - _session->set_solo (rl, new_state, Session::rt_cleanup, true); + _session->set_controls (cl, new_state ? 1.0 : 0.0, Controllable::UseGroup); } void @@ -5555,7 +5754,7 @@ Editor::toggle_mute () rl->push_back (rtav->route()); } - _session->set_mute (rl, new_state, Session::rt_cleanup, true); + _session->set_controls (route_list_to_control_list (rl, &Route::mute_control), new_state, Controllable::UseGroup); } void @@ -5617,13 +5816,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; @@ -5643,11 +5842,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 @@ -5658,14 +5863,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(); @@ -5673,12 +5877,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 @@ -5689,14 +5898,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(); @@ -5704,11 +5912,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 @@ -5719,14 +5933,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; } @@ -5734,10 +5947,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 @@ -5748,24 +5968,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 @@ -5774,7 +6000,7 @@ Editor::toggle_region_fades (int dir) if (_ignore_region_action) { return; } - + boost::shared_ptr ar; bool yn = false; @@ -5801,11 +6027,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); } @@ -5813,6 +6042,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 (); } } @@ -5882,7 +6120,7 @@ Editor::set_playhead_cursor () } } - if (ARDOUR_UI::config()->get_follow_edits()) { + if (UIConfiguration::instance().get_follow_edits() && (!_session || !_session->config.get_external_sync())) { cancel_time_selection(); } } @@ -5890,6 +6128,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); @@ -5898,7 +6140,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 (); @@ -5911,12 +6153,6 @@ Editor::split_region () } } -struct EditorOrderRouteSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key () < b->order_key (); - } -}; - void Editor::select_next_route() { @@ -6033,13 +6269,11 @@ Editor::set_session_extents_from_selection () if (_session == 0) { return; } - + framepos_t start, end; if (!get_selection_extents ( start, end)) return; - begin_reversible_command (_("set session start/stop from selection")); - 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 @@ -6050,12 +6284,135 @@ Editor::set_session_extents_from_selection () XMLNode &after = loc->get_state(); + begin_reversible_command (_("set session start/end from selection")); + _session->add_command (new MementoCommand(*loc, &before, &after)); commit_reversible_command (); } } +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 () { @@ -6085,30 +6442,6 @@ Editor::pitch_shift_region () pitch_shift (audio_rs, 1.2); } -void -Editor::transpose_region () -{ - RegionSelection rs = get_regions_from_selection_and_entered (); - - list midi_region_views; - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - MidiRegionView* mrv = dynamic_cast (*i); - if (mrv) { - midi_region_views.push_back (mrv); - } - } - - TransposeDialog d; - int const r = d.run (); - if (r != RESPONSE_ACCEPT) { - return; - } - - for (list::iterator i = midi_region_views.begin(); i != midi_region_views.end(); ++i) { - (*i)->midi_region()->transpose (d.semitones ()); - } -} - void Editor::set_tempo_from_region () { @@ -6137,11 +6470,13 @@ Editor::define_one_bar (framepos_t start, framepos_t end) { framepos_t length = end - start; - const Meter& m (_session->tempo_map().meter_at (start)); + const Meter& m (_session->tempo_map().meter_at_frame (start)); /* length = 1 bar */ - /* now we want frames per beat. + /* We're going to deliver a constant tempo here, + so we can use frames per beat to determine length. + now we want frames per beat. we have frames per bar, and beats per bar, so ... */ @@ -6160,7 +6495,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end) */ - const TempoSection& t (_session->tempo_map().tempo_section_at (start)); + const TempoSection& t (_session->tempo_map().tempo_section_at_frame (start)); bool do_global = false; @@ -6211,9 +6546,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end) } else if (t.frame() == start) { _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type()); } else { - Timecode::BBT_Time bbt; - _session->tempo_map().bbt_time (start, bbt); - _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), bbt); + _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), 0.0, start, TempoSection::Constant, AudioTime); } XMLNode& after (_session->tempo_map().get_state()); @@ -6234,7 +6567,7 @@ Editor::split_region_at_transients () } begin_reversible_command (_("split regions")); - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) { RegionSelection::iterator tmp; @@ -6244,14 +6577,15 @@ Editor::split_region_at_transients () boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i)->region()); - if (ar && (ar->get_transients (positions) == 0)) { + if (ar) { + ar->transients (positions); split_region_at_points ((*i)->region(), positions, true); positions.clear (); } i = tmp; } - + commit_reversible_command (); } @@ -6273,7 +6607,6 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList return; } - if (positions.size() > 20 && can_ferret) { std::string msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1); MessageDialog msg (msgstr, @@ -6326,27 +6659,28 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList framepos_t pos = 0; + framepos_t rstart = r->first_frame (); + framepos_t rend = r->last_frame (); + while (x != positions.end()) { /* deal with positons that are out of scope of present region bounds */ - if (*x <= 0 || *x > r->length()) { + if (*x <= rstart || *x > rend) { ++x; continue; } - /* file start = original start + how far we from the initial position ? - */ + /* file start = original start + how far we from the initial position ? */ framepos_t file_start = r->start() + pos; - /* length = next position - current position - */ + /* length = next position - current position */ - framepos_t len = (*x) - pos; + framepos_t len = (*x) - pos - rstart; /* XXX we do we really want to allow even single-sample regions? - shouldn't we have some kind of lower limit on region size? - */ + * shouldn't we have some kind of lower limit on region size? + */ if (len <= 0) { break; @@ -6366,14 +6700,15 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList plist.add (ARDOUR::Properties::length, len); plist.add (ARDOUR::Properties::name, new_name); plist.add (ARDOUR::Properties::layer, 0); + // TODO set transients_offset boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); /* because we set annouce to false, manually add the new region to the - RegionFactory map - */ + * RegionFactory map + */ RegionFactory::map_add (nr); - pl->add_region (nr, r->position() + pos); + pl->add_region (nr, rstart + pos); if (select_new) { new_regions.push_front(nr); @@ -6414,7 +6749,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) { @@ -6441,12 +6776,11 @@ 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); + (*r)->region()->add_transient(where); } - + commit_reversible_command (); } @@ -6476,7 +6810,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(); @@ -6499,7 +6833,7 @@ Editor::snap_regions_to_grid () (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); } @@ -6559,7 +6893,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; @@ -6598,7 +6932,7 @@ Editor::close_region_gaps () (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); } @@ -6688,7 +7022,7 @@ Editor::playhead_forward_to_grid () if (!_session) { return; } - + framepos_t pos = playhead_cursor->current_frame (); if (pos < max_framepos - 1) { pos += 2; @@ -6704,7 +7038,7 @@ Editor::playhead_backward_to_grid () if (!_session) { return; } - + framepos_t pos = playhead_cursor->current_frame (); if (pos > 2) { pos -= 2; @@ -6749,6 +7083,24 @@ 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 () +{ + Session::StateProtector sp (_session); + _remove_tracks (); + return false; /* do not call again */ +} + +void +Editor::_remove_tracks () { TrackSelection& ts (selection->tracks); @@ -6804,18 +7156,8 @@ 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) { @@ -6856,12 +7198,17 @@ edit your ardour.rc file to set the\n\ } { - Session::StateProtector sp (_session); DisplaySuspender ds; + boost::shared_ptr rl (new RouteList); for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { - _session->remove_route (*x); + rl->push_back (*x); } + _session->remove_routes (rl); } + /* TrackSelection and RouteList leave scope, + * destructors are called, + * diskstream drops references, save_state is called (again for every track) + */ } void @@ -6871,7 +7218,7 @@ Editor::do_insert_time () return; } - InsertTimeDialog d (*this); + InsertRemoveTimeDialog d (*this); int response = d.run (); if (response != RESPONSE_OK) { @@ -6882,12 +7229,10 @@ Editor::do_insert_time () return; } - InsertTimeOption opt = d.intersected_region_action (); - insert_time ( - get_preferred_edit_position(), + get_preferred_edit_position (EDIT_IGNORE_MOUSE), d.distance(), - opt, + d.intersected_region_action (), d.all_playlists(), d.move_glued(), d.move_markers(), @@ -6903,13 +7248,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 (); @@ -6926,7 +7269,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); @@ -6937,7 +7280,7 @@ Editor::insert_time ( pl.insert ((*x)->playlist ()); } } - + for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { (*i)->clear_changes (); @@ -6949,19 +7292,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; } } @@ -6975,39 +7324,219 @@ Editor::insert_time ( Locations::LocationList::const_iterator tmp; - bool const was_locked = (*i)->locked (); - if (locked_markers_too) { - (*i)->unlock (); - } - if ((*i)->position_lock_style() == AudioTime || glued_markers_too) { + bool const was_locked = (*i)->locked (); + if (locked_markers_too) { + (*i)->unlock (); + } if ((*i)->start() >= pos) { - (*i)->set_start ((*i)->start() + frames); + // move end first, in case we're moving by more than the length of the range if (!(*i)->is_mark()) { (*i)->set_end ((*i)->end() + frames); } + (*i)->set_start ((*i)->start() + frames); moved = true; } + if (was_locked) { + (*i)->lock (); + } + } + } + + 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 (in_command) { + commit_reversible_command (); + } +} + +void +Editor::do_remove_time () +{ + if (selection->tracks.empty()) { + return; + } + + framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE); + InsertRemoveTimeDialog d (*this, true); + + int response = d.run (); + + if (response != RESPONSE_OK) { + return; + } + + framecnt_t distance = d.distance(); + + if (distance == 0) { + return; + } + + remove_time ( + pos, + distance, + SplitIntersected, + d.move_glued(), + d.move_markers(), + d.move_glued_markers(), + d.move_locked_markers(), + d.move_tempos() + ); +} + +void +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) +{ + if (Config->get_edit_mode() == Lock) { + error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg; + return; + } + 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 (_("remove time")); + in_command = true; } + XMLNode &after = pl->get_state(); + + _session->add_command (new MementoCommand (*pl, &before, &after)); + } - if (was_locked) { - (*i)->lock (); + /* automation */ + RouteTimeAxisView* rtav = dynamic_cast (*x); + if (rtav) { + if (!in_command) { + begin_reversible_command (_("remove time")); + in_command = true; } + rtav->route ()->shift (pos, -frames); + } + } + + std::list loc_kill_list; + + /* markers */ + if (markers_too) { + bool moved = false; + XMLNode& before (_session->locations()->get_state()); + Locations::LocationList copy (_session->locations()->list()); + + for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) { + 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 + moved = true; + loc_kill_list.push_back(*i); + } 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)->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)->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)->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; + } + + 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 (_("remove time")); + in_command = true; + } XMLNode& after (_session->locations()->get_state()); _session->add_command (new MementoCommand(*_session->locations(), &before, &after)); } } if (tempo_too) { - _session->tempo_map().insert_time (pos, frames); + XMLNode& before (_session->tempo_map().get_state()); + + 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)); + } } - if (commit) { + if (in_command) { commit_reversible_command (); } } @@ -7065,21 +7594,21 @@ 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; if (h < TimeAxisView::preset_height (HeightSmall)) { - MessageDialog msg (*this, _("There are too many tracks to fit in the current window")); + MessageDialog msg (_("There are too many tracks to fit in the current window")); /* too small to be displayed */ return; } 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 */ @@ -7170,7 +7699,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); @@ -7304,7 +7833,7 @@ Editor::toggle_midi_input_active (bool flip_others) onoff = !mt->input_active(); } } - + _session->set_exclusive_input_active (rl, onoff, flip_others); } @@ -7322,19 +7851,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 (); } @@ -7342,12 +7866,11 @@ 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; + _main_menu_disabler = 0; + + if (UIConfiguration::instance().get_lock_gui_after_seconds()) { start_lock_event_timing (); } } @@ -7361,6 +7884,7 @@ Editor::bring_in_callback (Gtk::Label* label, uint32_t n, uint32_t total, string void Editor::update_bring_in_message (Gtk::Label* label, uint32_t n, uint32_t total, string name) { + Timers::TimerSuspender t; label->set_text (string_compose ("Copying %1, %2 of %3", name, n, total)); Gtkmm2ext::UI::instance()->flush_pending (); } @@ -7376,11 +7900,12 @@ 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 */ - + + Timers::TimerSuspender t; Gtkmm2ext::UI::instance()->flush_pending (); cerr << " Do it\n";