X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=c208e551654e1ce44640f76ec907df676d06972c;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=d536bf94d5540d4c42c4ae7bce72a96dde72808e;hpb=6b019a495359909a3d1a778ca10cd7df7cc302cc;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index d536bf94d5..c208e55165 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,6 +58,7 @@ #include "ardour/session_playlists.h" #include "ardour/strip_silence.h" #include "ardour/transient_detector.h" +#include "ardour/transpose.h" #include "canvas/canvas.h" @@ -95,11 +97,12 @@ #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" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -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) { @@ -148,7 +151,7 @@ Editor::redo (uint32_t n) } void -Editor::split_regions_at (framepos_t where, RegionSelection& regions) +Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t sub_num) { bool frozen = false; @@ -223,7 +226,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) if (pl) { pl->clear_changes (); - pl->split_region ((*a)->region(), where); + pl->split_region ((*a)->region(), where, sub_num); _session->add_command (new StatefulDiffCommand (pl)); } @@ -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(); @@ -430,6 +433,9 @@ Editor::nudge_forward (bool next, bool force_playhead) } else { loc->set_end (max_framepos); } + if (loc->is_session_range()) { + _session->set_end_is_free (false); + } } if (!in_command) { begin_reversible_command (_("nudge location forward")); @@ -521,6 +527,9 @@ Editor::nudge_backward (bool next, bool force_playhead) } else { loc->set_end (loc->length()); } + if (loc->is_session_range()) { + _session->set_end_is_free (false); + } } if (!in_command) { begin_reversible_command (_("nudge location forward")); @@ -657,8 +666,8 @@ Editor::sequence_regions () if (in_command) { commit_reversible_command (); } - } -} + } +} /* DISPLAY MOTION */ @@ -713,7 +722,7 @@ Editor::build_region_boundary_cache () TimeAxisView *ontrack = 0; TrackViewList tlist; - + if (!selection->tracks.empty()) { tlist = selection->tracks.filter_to_unique_playlists (); } else { @@ -1487,33 +1496,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; @@ -1521,7 +1530,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 @@ -1562,7 +1571,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(); @@ -1587,6 +1596,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 @@ -1601,7 +1657,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); @@ -1620,7 +1676,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 (); @@ -1638,6 +1694,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) @@ -1678,7 +1742,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. // @@ -1825,7 +1889,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. @@ -1836,7 +1900,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()); @@ -1864,12 +1928,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 @@ -1891,15 +1955,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; } @@ -1924,7 +1988,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(); } @@ -1974,7 +2038,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)); @@ -2027,7 +2091,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) { @@ -2098,12 +2162,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 (); } @@ -2120,12 +2184,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 (); } @@ -2134,7 +2198,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() ); @@ -2146,7 +2210,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 (); @@ -2158,7 +2222,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() ); @@ -2175,6 +2239,8 @@ Editor::set_session_end_from_playhead () commit_reversible_command (); } + + _session->set_end_is_free (false); } void @@ -2200,7 +2266,7 @@ Editor::remove_location_at_playhead_cursor () removed = true; } } - + //store undo if (removed) { begin_reversible_command (_("remove marker")); @@ -2221,7 +2287,7 @@ Editor::add_locations_from_region () return; } bool commit = false; - + XMLNode &before = _session->locations()->get_state(); for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) { @@ -2292,7 +2358,7 @@ Editor::jump_forward_to_mark () if (pos < 0) { return; } - + _session->request_locate (pos, _session->transport_rolling()); } @@ -2332,12 +2398,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 (); } } @@ -2347,14 +2413,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 (); } } @@ -2363,12 +2429,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 (); } @@ -2516,7 +2582,7 @@ Editor::play_from_edit_point_and_return () void Editor::play_selection () { - framepos_t start, end; + framepos_t start, end; if (!get_selection_extents ( start, end)) return; @@ -2530,25 +2596,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() || !UIConfiguration::instance().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 ); @@ -2559,16 +2625,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); @@ -2629,7 +2695,7 @@ Editor::do_layer_operation (LayerOperation op) begin_reversible_command (_("raise region to top")); } break; - + case Lower: if (multiple) { begin_reversible_command (_("lower regions")); @@ -2637,7 +2703,7 @@ Editor::do_layer_operation (LayerOperation op) begin_reversible_command (_("lower region")); } break; - + case LowerToBottom: if (multiple) { begin_reversible_command (_("lower regions to bottom")); @@ -2651,7 +2717,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) { @@ -2674,7 +2740,7 @@ Editor::do_layer_operation (LayerOperation op) (*i)->rdiff (cmds); _session->add_commands (cmds); } - + commit_reversible_command (); } @@ -2725,7 +2791,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; @@ -2767,25 +2833,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 () @@ -3004,62 +3051,63 @@ Editor::separate_regions_between (const TimeSelection& ts) for (TrackSelection::iterator i = tmptracks.begin(); i != tmptracks.end(); ++i) { - RouteTimeAxisView* rtv; - - if ((rtv = dynamic_cast ((*i))) != 0) { + RouteTimeAxisView* rtv = dynamic_cast ((*i)); - if (rtv->is_track()) { + if (!rtv) { + continue; + } - /* no edits to destructive tracks */ + if (!rtv->is_track()) { + continue; + } - if (rtv->track()->destructive()) { - continue; - } + /* no edits to destructive tracks */ - if ((playlist = rtv->playlist()) != 0) { + if (rtv->track()->destructive()) { + continue; + } - playlist->clear_changes (); + if ((playlist = rtv->playlist()) != 0) { - /* XXX need to consider musical time selections here at some point */ + playlist->clear_changes (); - double speed = rtv->track()->speed(); + /* XXX need to consider musical time selections here at some point */ + double speed = rtv->track()->speed(); - for (list::const_iterator t = ts.begin(); t != ts.end(); ++t) { + for (list::const_iterator t = ts.begin(); t != ts.end(); ++t) { - sigc::connection c = rtv->view()->RegionViewAdded.connect ( - sigc::mem_fun(*this, &Editor::collect_new_region_view)); + sigc::connection c = rtv->view()->RegionViewAdded.connect ( + sigc::mem_fun(*this, &Editor::collect_new_region_view)); - latest_regionviews.clear (); + latest_regionviews.clear (); - playlist->partition ((framepos_t)((*t).start * speed), - (framepos_t)((*t).end * speed), false); + playlist->partition ((framepos_t)((*t).start * speed), + (framepos_t)((*t).end * speed), false); - c.disconnect (); + c.disconnect (); - if (!latest_regionviews.empty()) { + if (!latest_regionviews.empty()) { - rtv->view()->foreach_regionview (sigc::bind ( - sigc::ptr_fun (add_if_covered), - &(*t), &new_selection)); + rtv->view()->foreach_regionview (sigc::bind ( + sigc::ptr_fun (add_if_covered), + &(*t), &new_selection)); - if (!in_command) { - begin_reversible_command (_("separate")); - in_command = true; - } + if (!in_command) { + begin_reversible_command (_("separate")); + in_command = true; + } - /* pick up changes to existing regions */ + /* pick up changes to existing regions */ - vector cmds; - playlist->rdiff (cmds); - _session->add_commands (cmds); + vector cmds; + playlist->rdiff (cmds); + _session->add_commands (cmds); - /* pick up changes to the playlist itself (adds/removes) - */ + /* pick up changes to the playlist itself (adds/removes) + */ - _session->add_command(new StatefulDiffCommand (playlist)); - } - } + _session->add_command(new StatefulDiffCommand (playlist)); } } } @@ -3179,7 +3227,7 @@ Editor::separate_under_selected_regions () if (!playlist) { // is this check necessary? - continue; + continue; } vector::iterator i; @@ -3254,17 +3302,18 @@ Editor::crop_region_to (framepos_t start, framepos_t end) for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) { - RouteTimeAxisView* rtv; + RouteTimeAxisView* rtv = dynamic_cast ((*i)); - if ((rtv = dynamic_cast ((*i))) != 0) { + if (!rtv) { + continue; + } - boost::shared_ptr t = rtv->track(); + boost::shared_ptr t = rtv->track(); - if (t != 0 && ! t->destructive()) { + if (t != 0 && ! t->destructive()) { - if ((playlist = rtv->playlist()) != 0) { - playlists.push_back (playlist); - } + if ((playlist = rtv->playlist()) != 0) { + playlists.push_back (playlist); } } } @@ -3273,41 +3322,48 @@ Editor::crop_region_to (framepos_t start, framepos_t end) return; } - framepos_t the_start; - framepos_t the_end; - framepos_t cnt; + 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; - if(!in_command) { - begin_reversible_command (_("trim to selection")); - in_command = true; + 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)); } - region->clear_changes (); - region->trim_to (the_start, cnt); - _session->add_command (new StatefulDiffCommand (region)); } if (in_command) { @@ -3318,117 +3374,49 @@ Editor::crop_region_to (framepos_t start, framepos_t end) 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 (); - RegionSelection foo; - bool in_command = false; - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + if (regions.empty () || regions.end_frame () + 1 >= end) { + return; + } - boost::shared_ptr region ((*i)->region()); + framepos_t const start_frame = regions.start (); + framepos_t const end_frame = regions.end_frame (); + framecnt_t const gap = end_frame - start_frame + 1; - boost::shared_ptr pl = region->playlist(); + begin_reversible_command (Operations::region_fill); - if (end <= region->last_frame()) { - continue; - } + selection->clear_regions (); - double times = (double) (end - region->last_frame()) / (double) region->length(); + for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { - if (times == 0) { - continue; - } + boost::shared_ptr r ((*i)->region()); - 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)); + 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)); c.disconnect (); foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } - if (in_command) { - if (!foo.empty()) { - selection->set (foo); - } - commit_reversible_command (); - } -} - -void -Editor::region_fill_selection () -{ - if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { - return; - } - - if (selection->time.empty()) { - return; - } - - boost::shared_ptr region = _regions->get_single_selection (); - if (region == 0) { - return; - } - - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; - - boost::shared_ptr playlist; - - if (selection->tracks.empty()) { - return; - } - - framepos_t selection_length = end - start; - float times = (float)selection_length / region->length(); - bool in_command = false; - - TrackViewList ts = selection->tracks.filter_to_unique_playlists (); - RegionSelection foo; - - for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { - - if ((playlist = (*i)->playlist()) == 0) { - 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()); + if (!foo.empty()) { + selection->set (foo); } - if (in_command) { - if (!foo.empty()) { - selection->set (foo); - } - commit_reversible_command (); - } + commit_reversible_command (); } void @@ -3889,7 +3877,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); @@ -3940,6 +3928,7 @@ Editor::freeze_route () gtk_main_iteration (); } + pthread_join (itt.thread, 0); current_interthread_info = 0; } @@ -3978,9 +3967,9 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) { - RouteTimeAxisView* rtv; + RouteTimeAxisView* rtv = dynamic_cast (*i); - if ((rtv = dynamic_cast (*i)) == 0) { + if (!rtv) { continue; } @@ -4118,6 +4107,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)); } @@ -4144,15 +4134,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 (); } @@ -4170,33 +4160,38 @@ 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 (); } } + 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 }; - +struct PointsSelectionPositionSorter { + bool operator() (ControlPoint* a, ControlPoint* b) { + return (*(a->model()))->when < (*(b->model()))->when; + } +}; /** Cut, copy or clear selected automation points. * @param op Operation (Cut, Copy or Clear) */ @@ -4214,9 +4209,12 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid typedef std::map, AutomationRecord> Lists; Lists lists; + /* user could select points in any order */ + selection->points.sort(PointsSelectionPositionSorter ()); + /* Go through all selected points, making an AutomationRecord for each distinct AutomationList */ - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - const AutomationLine& line = (*i)->line(); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + const AutomationLine& line = (*sel_point)->line(); const boost::shared_ptr al = line.the_list(); if (lists.find (al) == lists.end ()) { /* We haven't seen this list yet, so make a record for it. This includes @@ -4236,17 +4234,17 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid /* Add all selected points to the relevant copy ControlLists */ framepos_t start = std::numeric_limits::max(); - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); - AutomationList::const_iterator j = (*i)->model(); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + boost::shared_ptr al = (*sel_point)->line().the_list(); + AutomationList::const_iterator ctrl_evt = (*sel_point)->model (); - lists[al].copy->fast_simple_add ((*j)->when, (*j)->value); + lists[al].copy->fast_simple_add ((*ctrl_evt)->when, (*ctrl_evt)->value); if (midi) { /* Update earliest MIDI start time in beats */ - earliest = std::min(earliest, Evoral::Beats((*j)->when)); + earliest = std::min(earliest, Evoral::Beats((*ctrl_evt)->when)); } else { /* Update earliest session start time in frames */ - start = std::min(start, (*i)->line().session_position(j)); + start = std::min(start, (*sel_point)->line().session_position(ctrl_evt)); } } @@ -4269,26 +4267,40 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid start time, so relative ordering between points is preserved when copying from several lists and the paste starts at the earliest copied piece of data. */ - for (AutomationList::iterator j = i->second.copy->begin(); j != i->second.copy->end(); ++j) { - (*j)->when -= line_offset; + boost::shared_ptr &al_cpy = i->second.copy; + for (AutomationList::iterator ctrl_evt = al_cpy->begin(); ctrl_evt != al_cpy->end(); ++ctrl_evt) { + (*ctrl_evt)->when -= line_offset; } /* And add it to the cut buffer */ - cut_buffer->add (i->second.copy); + cut_buffer->add (al_cpy); } } - + 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 (); } /* Remove each selected point from its AutomationList */ - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); - al->erase ((*i)->model ()); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + AutomationLine& line = (*sel_point)->line (); + boost::shared_ptr al = line.the_list(); + + bool erase = true; + + if (dynamic_cast (&line)) { + /* removing of first and last gain point in region gain lines is prohibited*/ + if (line.is_last_point (*(*sel_point)) || line.is_first_point (*(*sel_point))) { + erase = false; + } + } + + if(erase) { + al->erase ((*sel_point)->model ()); + } } /* Thaw the lists and add undo records for them */ @@ -4365,7 +4377,7 @@ Editor::remove_clicked_region () vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); } @@ -4404,7 +4416,7 @@ Editor::remove_selected_regions () if (!playlist) { // is this check necessary? - continue; + continue; } /* get_regions_from_selection_and_entered() guarantees that @@ -4440,7 +4452,7 @@ Editor::remove_selected_regions () vector cmds; (*pl)->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command(new StatefulDiffCommand (*pl)); } @@ -4532,15 +4544,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(); @@ -4561,7 +4573,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); @@ -4588,20 +4600,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 { @@ -4618,7 +4630,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) vector cmds; (*pl)->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command (new StatefulDiffCommand (*pl)); } } @@ -4641,7 +4653,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); @@ -4653,7 +4665,7 @@ Editor::paste (float times, bool from_context) { DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); - paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times); + paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times, get_grid_music_divisions (0)); } void @@ -4667,11 +4679,11 @@ Editor::mouse_paste () } snap_to (where); - paste_internal (where, 1); + paste_internal (where, 1, get_grid_music_divisions (0)); } void -Editor::paste_internal (framepos_t position, float times) +Editor::paste_internal (framepos_t position, float times, const int32_t sub_num) { DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position)); @@ -4764,7 +4776,7 @@ Editor::paste_internal (framepos_t position, float times) "greedy" paste from one automation type to another. */ PasteContext ctx(paste_count, times, ItemCounts(), true); - ts.front()->paste (position, *cut_buffer, ctx); + ts.front()->paste (position, *cut_buffer, ctx, sub_num); } else { @@ -4772,7 +4784,7 @@ Editor::paste_internal (framepos_t position, float times) PasteContext ctx(paste_count, times, ItemCounts(), false); for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { - (*i)->paste (position, *cut_buffer, ctx); + (*i)->paste (position, *cut_buffer, ctx, sub_num); } } @@ -4792,6 +4804,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) 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); @@ -4806,9 +4819,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)); - playlist = (*i)->region()->playlist(); + 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 (); @@ -4831,18 +4845,9 @@ 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; - } - - 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) { @@ -4850,27 +4855,34 @@ Editor::duplicate_selection (float times) 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); if (!in_command) { - begin_reversible_command (_("duplicate selection")); + begin_reversible_command (_("duplicate range selection")); in_command = true; } _session->add_command (new StatefulDiffCommand (playlist)); - ++ri; - if (ri == new_regions.end()) { - --ri; - } } 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 (); } } @@ -5177,15 +5189,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); } } @@ -5356,18 +5371,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) { @@ -5436,6 +5475,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 */ @@ -5456,22 +5500,15 @@ 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 { - continue; + _session->add_command(new StatefulDiffCommand (playlist)); } if (progress) { @@ -5504,7 +5541,7 @@ Editor::reset_region_gain_envelopes () } bool in_command = false; - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { @@ -5598,13 +5635,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 (); } @@ -5622,13 +5659,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 (); } @@ -5646,14 +5683,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 (); } @@ -5671,13 +5708,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 (); } @@ -5694,11 +5731,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); } } @@ -5707,7 +5744,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); @@ -5721,10 +5758,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 @@ -5749,7 +5786,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, &Stripable::mute_control), new_state, Controllable::UseGroup); } void @@ -5995,7 +6032,7 @@ Editor::toggle_region_fades (int dir) if (_ignore_region_action) { return; } - + boost::shared_ptr ar; bool yn = false; @@ -6115,7 +6152,7 @@ Editor::set_playhead_cursor () } } - if (UIConfiguration::instance().get_follow_edits()) { + if (UIConfiguration::instance().get_follow_edits() && (!_session || !_session->config.get_external_sync())) { cancel_time_selection(); } } @@ -6135,7 +6172,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 (); @@ -6144,16 +6181,14 @@ Editor::split_region () return; } - split_regions_at (where, rs); + if (snap_musical()) { + split_regions_at (where, rs, get_grid_music_divisions (0)); + } else { + split_regions_at (where, rs, 0); + } } } -struct EditorOrderRouteSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key () < b->order_key (); - } -}; - void Editor::select_next_route() { @@ -6167,6 +6202,7 @@ Editor::select_next_route() RouteUI *rui; do { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + if (*i == current) { ++i; if (i != track_views.end()) { @@ -6178,10 +6214,12 @@ Editor::select_next_route() break; } } + rui = dynamic_cast(current); - } while ( current->hidden() || (rui != NULL && !rui->route()->active())); - selection->set(current); + } while (current->hidden() || (rui == NULL) || !rui->route()->active()); + + selection->set (current); ensure_time_axis_view_is_visible (*current, false); } @@ -6199,6 +6237,7 @@ Editor::select_prev_route() RouteUI *rui; do { for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) { + if (*i == current) { ++i; if (i != track_views.rend()) { @@ -6210,7 +6249,8 @@ Editor::select_prev_route() } } rui = dynamic_cast(current); - } while ( current->hidden() || (rui != NULL && !rui->route()->active())); + + } while (current->hidden() || (rui == NULL) || !rui->route()->active()); selection->set (current); @@ -6270,18 +6310,18 @@ Editor::set_session_extents_from_selection () if (_session == 0) { return; } - + framepos_t start, end; if (!get_selection_extents ( start, end)) return; Location* loc; if ((loc = _session->locations()->session_range_location()) == 0) { - _session->set_session_extents ( start, end ); // this will create a new session range; no need for UNDO + _session->set_session_extents (start, end); // this will create a new session range; no need for UNDO } else { XMLNode &before = loc->get_state(); - _session->set_session_extents ( start, end ); + _session->set_session_extents (start, end); XMLNode &after = loc->get_state(); @@ -6291,6 +6331,8 @@ Editor::set_session_extents_from_selection () commit_reversible_command (); } + + _session->set_end_is_free (false); } void @@ -6300,27 +6342,27 @@ Editor::set_punch_start_from_edit_point () 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")); } @@ -6333,13 +6375,13 @@ Editor::set_punch_end_from_edit_point () 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 { @@ -6348,7 +6390,7 @@ Editor::set_punch_end_from_edit_point () //snap the selection start/end snap_to(end); - + set_punch_range (start, end, _("set punch end from EP")); } @@ -6361,22 +6403,22 @@ Editor::set_loop_start_from_edit_point () 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; @@ -6394,13 +6436,13 @@ Editor::set_loop_end_from_edit_point () 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 { @@ -6409,7 +6451,7 @@ Editor::set_loop_end_from_edit_point () //snap the selection start/end snap_to(end); - + set_loop_range (start, end, _("set loop end from EP")); } } @@ -6443,30 +6485,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 () { @@ -6495,11 +6513,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 ... */ @@ -6518,7 +6538,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; @@ -6569,9 +6589,8 @@ 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); + const Tempo tempo (beats_per_minute, t.note_type()); + _session->tempo_map().add_tempo (tempo, 0.0, start, TempoSection::Constant, AudioTime); } XMLNode& after (_session->tempo_map().get_state()); @@ -6592,7 +6611,7 @@ Editor::split_region_at_transients () } begin_reversible_command (_("split regions")); - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) { RegionSelection::iterator tmp; @@ -6602,14 +6621,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 (); } @@ -6631,7 +6651,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, @@ -6684,27 +6703,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; @@ -6724,14 +6744,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); @@ -6772,7 +6793,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) { @@ -6799,12 +6820,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 (); } @@ -6834,7 +6854,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(); @@ -6857,7 +6877,7 @@ Editor::snap_regions_to_grid () (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); } @@ -6917,7 +6937,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; @@ -6956,7 +6976,7 @@ Editor::close_region_gaps () (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); } @@ -7046,7 +7066,7 @@ Editor::playhead_forward_to_grid () if (!_session) { return; } - + framepos_t pos = playhead_cursor->current_frame (); if (pos < max_framepos - 1) { pos += 2; @@ -7062,7 +7082,7 @@ Editor::playhead_backward_to_grid () if (!_session) { return; } - + framepos_t pos = playhead_cursor->current_frame (); if (pos > 2) { pos -= 2; @@ -7118,6 +7138,7 @@ Editor::remove_tracks () bool Editor::idle_remove_tracks () { + Session::StateProtector sp (_session); _remove_tracks (); return false; /* do not call again */ } @@ -7181,7 +7202,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" @@ -7221,12 +7242,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 @@ -7247,12 +7273,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(), @@ -7300,14 +7324,15 @@ Editor::insert_time ( pl.insert ((*x)->playlist ()); } } - + for (set >::iterator i = pl.begin(); i != pl.end(); ++i) { (*i)->clear_changes (); (*i)->clear_owned_changes (); if (opt == SplitIntersected) { - (*i)->split (pos); + /* non musical split */ + (*i)->split (pos, 0); } (*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); @@ -7406,7 +7431,7 @@ Editor::do_remove_time () if (response != RESPONSE_OK) { return; } - + framecnt_t distance = d.distance(); if (distance == 0) { @@ -7426,7 +7451,7 @@ Editor::do_remove_time () } void -Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, +Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too) { if (Config->get_edit_mode() == Lock) { @@ -7438,31 +7463,31 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, 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")); + begin_reversible_command (_("remove time")); in_command = true; } XMLNode &after = pl->get_state(); - + _session->add_command (new MementoCommand (*pl, &before, &after)); } - + /* automation */ RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav) { if (!in_command) { - begin_reversible_command (_("cut time")); + begin_reversible_command (_("remove time")); in_command = true; } rtav->route ()->shift (pos, -frames); @@ -7470,7 +7495,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, } std::list loc_kill_list; - + /* markers */ if (markers_too) { bool moved = false; @@ -7532,17 +7557,17 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, 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")); + 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) { XMLNode& before (_session->tempo_map().get_state()); @@ -7555,7 +7580,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); } } - + if (in_command) { commit_reversible_command (); } @@ -7614,15 +7639,15 @@ 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; } @@ -7719,7 +7744,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); @@ -7853,7 +7878,7 @@ Editor::toggle_midi_input_active (bool flip_others) onoff = !mt->input_active(); } } - + _session->set_exclusive_input_active (rl, onoff, flip_others); } @@ -7871,14 +7896,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); } delete _main_menu_disabler; _main_menu_disabler = new MainMenuDisabler; - + lock_dialog->present (); } @@ -7886,8 +7911,9 @@ void Editor::unlock () { lock_dialog->hide (); - + delete _main_menu_disabler; + _main_menu_disabler = 0; if (UIConfiguration::instance().get_lock_gui_after_seconds()) { start_lock_event_timing (); @@ -7903,8 +7929,9 @@ 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 (); + Gtkmm2ext::UI::instance()->flush_pending (1); } void @@ -7918,12 +7945,13 @@ 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 (); + + Timers::TimerSuspender t; + Gtkmm2ext::UI::instance()->flush_pending (3); cerr << " Do it\n";