X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=512648993c462e7ce869bf4a99936e01b92610b9;hb=e82e30992dc0f2440eac77c2b1b4a308ba929ebe;hp=370f57d848120a3e50dfbd619014f82b57814ca2;hpb=89623923bdc475381bfb8b0d318b7284920e05fc;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 370f57d848..512648993c 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -28,6 +28,8 @@ #include #include +#include + #include "pbd/error.h" #include "pbd/basename.h" #include "pbd/pthread_utils.h" @@ -36,9 +38,11 @@ #include "pbd/whitespace.h" #include "pbd/stateful_diff_command.h" -#include -#include -#include +#include "gtkmm2ext/utils.h" + +#include "widgets/choice.h" +#include "widgets/popup.h" +#include "widgets/prompter.h" #include "ardour/audio_track.h" #include "ardour/audioregion.h" @@ -110,6 +114,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; +using namespace ArdourWidgets; using namespace Editing; using Gtkmm2ext::Keyboard; @@ -166,8 +171,7 @@ Editor::redo (uint32_t n) } void -Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t sub_num, - bool snap_frame) +Editor::split_regions_at (MusicFrame where, RegionSelection& regions, bool snap_frame) { bool frozen = false; @@ -214,7 +218,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int3 have something to split. */ - if (!(*a)->region()->covers (where)) { + if (!(*a)->region()->covers (where.frame)) { ++a; continue; } @@ -246,7 +250,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int3 if (pl) { pl->clear_changes (); - pl->split_region ((*a)->region(), where, sub_num); + pl->split_region ((*a)->region(), where); _session->add_command (new StatefulDiffCommand (pl)); } @@ -278,7 +282,6 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int3 if (working_on_selection) { // IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw. - _ignore_follow_edits = true; // a split will change the region selection in mysterious ways; it's not practical or wanted to follow this edit RegionSelectionAfterSplit rsas = Config->get_region_selection_after_split(); /* There are three classes of regions that we might want selected after splitting selected regions: @@ -293,7 +296,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int3 } for (RegionSelection::iterator ri = latest_regionviews.begin(); ri != latest_regionviews.end(); ri++) { - if ((*ri)->region()->position() < where) { + if ((*ri)->region()->position() < where.frame) { // new regions created before the split if (rsas & NewlyCreatedLeft) { selection->add (*ri); @@ -305,13 +308,10 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int3 } } } - _ignore_follow_edits = false; } else { - _ignore_follow_edits = true; if( working_on_selection ) { selection->add (latest_regionviews); //these are the new regions created after the split } - _ignore_follow_edits = false; } commit_reversible_command (); @@ -424,6 +424,7 @@ Editor::nudge_forward (bool next, bool force_playhead) bool is_start; bool in_command = false; + const int32_t divisions = get_grid_music_divisions (0); for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { @@ -439,9 +440,9 @@ Editor::nudge_forward (bool next, bool force_playhead) distance = next_distance; } if (max_framepos - distance > loc->start() + loc->length()) { - loc->set_start (loc->start() + distance); + loc->set_start (loc->start() + distance, false, true, divisions); } else { - loc->set_start (max_framepos - loc->length()); + loc->set_start (max_framepos - loc->length(), false, true, divisions); } } else { distance = get_nudge_distance (loc->end(), next_distance); @@ -449,9 +450,9 @@ Editor::nudge_forward (bool next, bool force_playhead) distance = next_distance; } if (max_framepos - distance > loc->end()) { - loc->set_end (loc->end() + distance); + loc->set_end (loc->end() + distance, false, true, divisions); } else { - loc->set_end (max_framepos); + loc->set_end (max_framepos, false, true, divisions); } if (loc->is_session_range()) { _session->set_end_is_free (false); @@ -531,9 +532,9 @@ Editor::nudge_backward (bool next, bool force_playhead) distance = next_distance; } if (distance < loc->start()) { - loc->set_start (loc->start() - distance); + loc->set_start (loc->start() - distance, false, true, get_grid_music_divisions(0)); } else { - loc->set_start (0); + loc->set_start (0, false, true, get_grid_music_divisions(0)); } } else { distance = get_nudge_distance (loc->end(), next_distance); @@ -543,9 +544,9 @@ Editor::nudge_backward (bool next, bool force_playhead) } if (distance < loc->end() - loc->length()) { - loc->set_end (loc->end() - distance); + loc->set_end (loc->end() - distance, false, true, get_grid_music_divisions(0)); } else { - loc->set_end (loc->length()); + loc->set_end (loc->length(), false, true, get_grid_music_divisions(0)); } if (loc->is_session_range()) { _session->set_end_is_free (false); @@ -629,9 +630,9 @@ Editor::nudge_backward_capture_offset () } struct RegionSelectionPositionSorter { - bool operator() (RegionView* a, RegionView* b) { - return a->region()->position() < b->region()->position(); - } + bool operator() (RegionView* a, RegionView* b) { + return a->region()->position() < b->region()->position(); + } }; void @@ -1159,7 +1160,7 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir) return; } - loc->move_to (target); + loc->move_to (target, 0); } void @@ -1236,7 +1237,7 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) pos = track_frame_to_session_frame(pos, speed); - loc->move_to (pos); + loc->move_to (pos, 0); } void @@ -1283,7 +1284,7 @@ Editor::selected_marker_to_selection_start () return; } - loc->move_to (pos); + loc->move_to (pos, 0); } void @@ -1318,7 +1319,7 @@ Editor::selected_marker_to_selection_end () return; } - loc->move_to (pos); + loc->move_to (pos, 0); } void @@ -1370,6 +1371,7 @@ Editor::cursor_align (bool playhead_to_edit) _session->request_locate (selection->markers.front()->position(), _session->transport_rolling()); } else { + const int32_t divisions = get_grid_music_divisions (0); /* move selected markers to playhead */ for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { @@ -1378,10 +1380,10 @@ Editor::cursor_align (bool playhead_to_edit) Location* loc = find_location_from_marker (*i, ignored); if (loc->is_mark()) { - loc->set_start (playhead_cursor->current_frame ()); + loc->set_start (playhead_cursor->current_frame (), false, true, divisions); } else { loc->set (playhead_cursor->current_frame (), - playhead_cursor->current_frame () + loc->length()); + playhead_cursor->current_frame () + loc->length(), true, divisions); } } } @@ -1454,6 +1456,22 @@ Editor::scroll_tracks_up_line () reset_y_origin (vertical_adjustment.get_value() - 60); } +void +Editor::select_topmost_track () +{ + const double top_of_trackviews = vertical_adjustment.get_value(); + for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { + if ((*t)->hidden()) { + continue; + } + std::pair res = (*t)->covers_y_position (top_of_trackviews); + if (res.first) { + selection->set (*t); + break; + } + } +} + bool Editor::scroll_down_one_track (bool skip_child_views) { @@ -1753,7 +1771,51 @@ Editor::temporal_zoom_step_scale (bool zoom_out, double scale) nspp /= 2.0; } } - + + // ToDo: encapsulate all of this into something like editor::get_session_extents() or editor::leftmost(), rightmost() + { + //ToDo: also incorporate automation regions (in case the session has no audio/midi but is just used for automating plugins or the like) + + //calculate the extents of all regions in every playlist + framecnt_t session_extent_start = 0; + framecnt_t session_extent_end = 0; + { + boost::shared_ptr rl = _session->get_routes(); + for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { + boost::shared_ptr tr = boost::dynamic_pointer_cast (*r); + if (tr) { + boost::shared_ptr pl = tr->playlist(); + if (pl) { + pair e; + e = pl->get_extent(); + if (e.first < session_extent_start) { + session_extent_start = e.first; + } + if (e.second > session_extent_end) { + session_extent_end = e.second; + } + } + } + } + } + framecnt_t session_extents = session_extent_end - session_extent_start; + + //in a session with no regions, use the start/end markers to set max zoom + framecnt_t const session_length = _session->current_end_frame() - _session->current_start_frame (); + if ( session_length > session_extents ) + session_extents = session_length; + + //in a session with no regions or start/end markers, use 2 minutes to set max zoom + framecnt_t const min_length = _session->nominal_frame_rate()*60*2; + if ( min_length > session_extents ) + session_extents = min_length; + + //convert to samples-per-pixel and limit our zoom to this value + framecnt_t session_extents_pp = session_extents / _visible_canvas_width; + if (nspp > session_extents_pp) + nspp = session_extents_pp; + } + temporal_zoom (nspp); } @@ -2104,7 +2166,7 @@ Editor::choose_new_marker_name(string &name) { return true; } - ArdourPrompter dialog (true); + Prompter dialog (true); dialog.set_prompt (_("New Name:")); @@ -2149,7 +2211,7 @@ Editor::add_location_from_selection () framepos_t end = selection->time[clicked_selection].end; _session->locations()->next_available_name(rangename,"selection"); - Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker); + Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker, get_grid_music_divisions(0)); begin_reversible_command (_("add marker")); @@ -2172,7 +2234,7 @@ Editor::add_location_mark (framepos_t where) if (!choose_new_marker_name(markername)) { return; } - Location *location = new Location (*_session, where, where, markername, Location::IsMark); + Location *location = new Location (*_session, where, where, markername, Location::IsMark, get_grid_music_divisions (0)); begin_reversible_command (_("add marker")); XMLNode &before = _session->locations()->get_state(); @@ -2301,7 +2363,7 @@ Editor::add_locations_from_region () boost::shared_ptr region = (*i)->region (); - Location *location = new Location (*_session, region->position(), region->last_frame(), region->name(), Location::IsRangeMarker); + Location *location = new Location (*_session, region->position(), region->last_frame(), region->name(), Location::IsRangeMarker, 0); _session->locations()->add (location, true); commit = true; @@ -2342,7 +2404,7 @@ Editor::add_location_from_region () } // single range spanning all selected - Location *location = new Location (*_session, selection->regions.start(), selection->regions.end_frame(), markername, Location::IsRangeMarker); + Location *location = new Location (*_session, selection->regions.start(), selection->regions.end_frame(), markername, Location::IsRangeMarker, 0); _session->locations()->add (location, true); begin_reversible_command (_("add marker")); @@ -2378,6 +2440,14 @@ Editor::jump_backward_to_mark () framepos_t pos = _session->locations()->first_mark_before (playhead_cursor->current_frame()); + //handle the case where we are rolling, and we're less than one-half second past the mark, we want to go to the prior mark... + if ( _session->transport_rolling() ) { + if ( (playhead_cursor->current_frame() - pos) < _session->frame_rate()/2 ) { + framepos_t prior = _session->locations()->first_mark_before ( pos ); + pos = prior; + } + } + if (pos < 0) { return; } @@ -2397,7 +2467,7 @@ Editor::set_mark () return; } - _session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark), true); + _session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark, 0), true); } void @@ -2600,24 +2670,19 @@ Editor::play_selection () _session->request_play_range (&lar, true); } -framepos_t -Editor::get_preroll () -{ - return Config->get_preroll_seconds() * _session->frame_rate(); -} - void -Editor::maybe_locate_with_edit_preroll ( framepos_t location ) +Editor::maybe_locate_with_edit_preroll (framepos_t location) { - if ( _session->transport_rolling() || !UIConfiguration::instance().get_follow_edits() || _ignore_follow_edits || _session->config.get_external_sync() ) + if ( _session->transport_rolling() || !UIConfiguration::instance().get_follow_edits() || _session->config.get_external_sync() ) return; - location -= get_preroll(); + location -= _session->preroll_samples (location); //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 ) @@ -2630,15 +2695,15 @@ Editor::maybe_locate_with_edit_preroll ( framepos_t location ) void Editor::play_with_preroll () { - { - framepos_t preroll = get_preroll(); + framepos_t start, end; + if ( UIConfiguration::instance().get_follow_edits() && get_selection_extents ( start, end) ) { + const framepos_t preroll = _session->preroll_samples (start); - framepos_t start, end; - if (!get_selection_extents ( start, end)) - return; + framepos_t ret = start; - if (start > preroll) + if (start > preroll) { start = start - preroll; + } end = end + preroll; //"post-roll" @@ -2647,9 +2712,35 @@ Editor::play_with_preroll () lar.push_back (ar); _session->request_play_range (&lar, true); + _session->set_requested_return_frame (ret); //force auto-return to return to range start, without the preroll + } else { + framepos_t ph = playhead_cursor->current_frame (); + const framepos_t preroll = _session->preroll_samples (ph); + framepos_t start; + if (ph > preroll) { + start = ph - preroll; + } else { + start = 0; + } + _session->request_locate (start, true); + _session->set_requested_return_frame (ph); //force auto-return to return to playhead location, without the preroll } } +void +Editor::rec_with_preroll () +{ + framepos_t ph = playhead_cursor->current_frame (); + framepos_t preroll = _session->preroll_samples (ph); + _session->request_preroll_record_trim (ph, preroll); +} + +void +Editor::rec_with_count_in () +{ + _session->request_count_in_record (); +} + void Editor::play_location (Location& location) { @@ -3097,8 +3188,8 @@ Editor::separate_regions_between (const TimeSelection& ts) if (!latest_regionviews.empty()) { rtv->view()->foreach_regionview (sigc::bind ( - sigc::ptr_fun (add_if_covered), - &(*t), &new_selection)); + sigc::ptr_fun (add_if_covered), + &(*t), &new_selection)); if (!in_command) { begin_reversible_command (_("separate")); @@ -3128,8 +3219,8 @@ Editor::separate_regions_between (const TimeSelection& ts) } struct PlaylistState { - boost::shared_ptr playlist; - XMLNode* before; + boost::shared_ptr playlist; + XMLNode* before; }; /** Take tracks from get_tracks_for_range_action and cut any regions @@ -3232,10 +3323,10 @@ Editor::separate_under_selected_regions () boost::shared_ptr playlist = (*rl)->playlist(); - if (!playlist) { + if (!playlist) { // is this check necessary? continue; - } + } vector::iterator i; @@ -3527,9 +3618,9 @@ Editor::align_regions (RegionPoint what) } struct RegionSortByTime { - bool operator() (const RegionView* a, const RegionView* b) { - return a->region()->position() < b->region()->position(); - } + bool operator() (const RegionView* a, const RegionView* b) { + return a->region()->position() < b->region()->position(); + } }; void @@ -3683,10 +3774,8 @@ Editor::trim_region (bool front) if (front) { (*i)->region()->trim_front (where); - maybe_locate_with_edit_preroll ( where ); } else { (*i)->region()->trim_end (where); - maybe_locate_with_edit_preroll ( where ); } _session->add_command (new StatefulDiffCommand ((*i)->region())); @@ -3813,26 +3902,26 @@ Editor::trim_to_region(bool forward) if (forward) { - next_region = playlist->find_next_region (region->first_frame(), Start, 1); + next_region = playlist->find_next_region (region->first_frame(), Start, 1); - if (!next_region) { - continue; - } + if (!next_region) { + continue; + } - region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed)); - arv->region_changed (PropertyChange (ARDOUR::Properties::length)); + region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed)); + arv->region_changed (PropertyChange (ARDOUR::Properties::length)); } else { - next_region = playlist->find_next_region (region->first_frame(), Start, 0); + next_region = playlist->find_next_region (region->first_frame(), Start, 0); - if(!next_region){ - continue; - } + if(!next_region){ + continue; + } - region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed)); + region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed)); - arv->region_changed (ARDOUR::bounds_change); + arv->region_changed (ARDOUR::bounds_change); } if (!in_command) { @@ -3905,8 +3994,8 @@ Editor::freeze_route () if (clicked_routeview->track()->has_external_redirects()) { MessageDialog d (string_compose (_("%1\n\nThis track has at least one send/insert/return as part of its signal flow.\n\n" - "Freezing will only process the signal as far as the first send/insert/return."), - clicked_routeview->track()->name()), true, MESSAGE_INFO, BUTTONS_NONE, true); + "Freezing will only process the signal as far as the first send/insert/return."), + clicked_routeview->track()->name()), true, MESSAGE_INFO, BUTTONS_NONE, true); d.add_button (_("Freeze anyway"), Gtk::RESPONSE_OK); d.add_button (_("Don't freeze"), Gtk::RESPONSE_CANCEL); @@ -4103,8 +4192,9 @@ Editor::cut_copy (CutCopyOp op) } } - if ( op != Delete ) //"Delete" doesn't change copy/paste buf + if ( op != Delete ) { //"Delete" doesn't change copy/paste buf cut_buffer->clear (); + } if (entered_marker) { @@ -4194,11 +4284,13 @@ struct AutomationRecord { 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) */ @@ -4218,7 +4310,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid /* 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 sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { const AutomationLine& line = (*sel_point)->line(); @@ -4240,7 +4332,7 @@ 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(); + MusicFrame start (std::numeric_limits::max(), 0); 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 (); @@ -4251,7 +4343,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid earliest = std::min(earliest, Evoral::Beats((*ctrl_evt)->when)); } else { /* Update earliest session start time in frames */ - start = std::min(start, (*sel_point)->line().session_position(ctrl_evt)); + start.frame = std::min(start.frame, (*sel_point)->line().session_position(ctrl_evt)); } } @@ -4262,13 +4354,13 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid } earliest.round_down_to_beat(); } else { - if (start == std::numeric_limits::max()) { - start = 0; // Weird... don't offset + if (start.frame == std::numeric_limits::max()) { + start.frame = 0; // Weird... don't offset } snap_to(start, RoundDownMaybe); } - const double line_offset = midi ? earliest.to_double() : start; + const double line_offset = midi ? earliest.to_double() : start.frame; for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) { /* Correct this copy list so that it is relative to the earliest start time, so relative ordering between points is preserved @@ -4297,7 +4389,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid 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))) { @@ -4348,16 +4440,16 @@ Editor::cut_copy_midi (CutCopyOp op) } struct lt_playlist { - bool operator () (const PlaylistState& a, const PlaylistState& b) { - return a.playlist < b.playlist; - } + bool operator () (const PlaylistState& a, const PlaylistState& b) { + return a.playlist < b.playlist; + } }; struct PlaylistMapping { - TimeAxisView* tv; - boost::shared_ptr pl; + TimeAxisView* tv; + boost::shared_ptr pl; - PlaylistMapping (TimeAxisView* tvp) : tv (tvp) {} + PlaylistMapping (TimeAxisView* tvp) : tv (tvp) {} }; /** Remove `clicked_regionview' */ @@ -4421,10 +4513,10 @@ Editor::remove_selected_regions () boost::shared_ptr playlist = (*rl)->playlist(); - if (!playlist) { + if (!playlist) { // is this check necessary? continue; - } + } /* get_regions_from_selection_and_entered() guarantees that the playlists involved are unique, so there is no need @@ -4670,29 +4762,28 @@ Editor::cut_copy_ranges (CutCopyOp op) void 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, get_grid_music_divisions (0)); + DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); + MusicFrame where (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), 0); + paste_internal (where.frame, times, 0); } void Editor::mouse_paste () { - framepos_t where; + MusicFrame where (0, 0); bool ignored; - - if (!mouse_frame (where, ignored)) { + if (!mouse_frame (where.frame, ignored)) { return; } snap_to (where); - paste_internal (where, 1, get_grid_music_divisions (0)); + paste_internal (where.frame, 1, where.division); } void 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)); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position)); if (cut_buffer->empty(internal_editing())) { return; @@ -4700,7 +4791,7 @@ Editor::paste_internal (framepos_t position, float times, const int32_t sub_num) if (position == max_framepos) { position = get_preferred_edit_position(); - DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("preferred edit position is %1\n", position)); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("preferred edit position is %1\n", position)); } if (position == last_paste_pos) { @@ -4717,8 +4808,8 @@ Editor::paste_internal (framepos_t position, float times, const int32_t sub_num) TrackViewList ts; if (!selection->tracks.empty()) { /* If there is a track selection, paste into exactly those tracks and - only those tracks. This allows the user to be explicit and override - the below "do the reasonable thing" logic. */ + * only those tracks. This allows the user to be explicit and override + * the below "do the reasonable thing" logic. */ ts = selection->tracks.filter_to_unique_playlists (); sort_track_selection (ts); } else { @@ -4782,8 +4873,8 @@ Editor::paste_internal (framepos_t position, float times, const int32_t sub_num) /* Only one line copied, and one automation track selected. Do a "greedy" paste from one automation type to another. */ - PasteContext ctx(paste_count, times, ItemCounts(), true); - ts.front()->paste (position, *cut_buffer, ctx, sub_num); + PasteContext ctx(paste_count, times, ItemCounts(), true); + ts.front()->paste (position, *cut_buffer, ctx, sub_num); } else { @@ -4908,7 +4999,7 @@ Editor::reset_point_selection () { for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { ARDOUR::AutomationList::iterator j = (*i)->model (); - (*j)->value = (*i)->line().the_list()->default_value (); + (*j)->value = (*i)->line().the_list()->descriptor ().normal; } } @@ -5000,12 +5091,12 @@ Editor::remove_last_capture () if (Config->get_verify_remove_last_capture()) { prompt = _("Do you really want to destroy the last capture?" - "\n(This is destructive and cannot be undone)"); + "\n(This is destructive and cannot be undone)"); choices.push_back (_("No, do nothing.")); choices.push_back (_("Yes, destroy it.")); - Gtkmm2ext::Choice prompter (_("Destroy last capture"), prompt, choices); + Choice prompter (_("Destroy last capture"), prompt, choices); if (prompter.run () == 1) { _session->remove_last_capture (); @@ -5194,6 +5285,38 @@ Editor::adjust_region_gain (bool up) } } +void +Editor::reset_region_gain () +{ + RegionSelection rs = get_regions_from_selection_and_entered (); + + if (!_session || rs.empty()) { + return; + } + + bool in_command = false; + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { + AudioRegionView* const arv = dynamic_cast(*r); + if (!arv) { + continue; + } + + arv->region()->clear_changes (); + + arv->audio_region()->set_scale_amplitude (1.0f); + + if (!in_command) { + begin_reversible_command ("reset region gain"); + in_command = true; + } + _session->add_command (new StatefulDiffCommand (arv->region())); + } + + if (in_command) { + commit_reversible_command (); + } +} void Editor::reverse_region () @@ -5223,7 +5346,7 @@ Editor::strip_region_silence () for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast (*i); - if (arv) { + if (arv) { audio_only.push_back (arv); } } @@ -5468,7 +5591,7 @@ Editor::insert_patch_change (bool from_context) MidiRegionView* first = dynamic_cast (rs.front ()); Evoral::PatchChange empty (Evoral::Beats(), 0, 0, 0); - PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD); + PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD); if (d.run() == RESPONSE_CANCEL) { return; @@ -5725,11 +5848,17 @@ Editor::toggle_region_lock_style () return; } - begin_reversible_command (_("region lock style")); + Glib::RefPtr a = Glib::RefPtr::cast_dynamic (_region_actions->get_action("toggle-region-lock-style")); + vector proxies = a->get_proxies(); + Gtk::CheckMenuItem* cmi = dynamic_cast (proxies.front()); + + assert (cmi); + + begin_reversible_command (_("toggle 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; + PositionLockStyle const ns = ((*i)->region()->position_lock_style() == AudioTime && !cmi->get_inconsistent()) ? MusicTime : AudioTime; (*i)->region()->set_position_lock_style (ns); _session->add_command (new StatefulDiffCommand ((*i)->region())); } @@ -6151,10 +6280,10 @@ Editor::update_region_fade_visibility () void Editor::set_edit_point () { - framepos_t where; bool ignored; + MusicFrame where (0, 0); - if (!mouse_frame (where, ignored)) { + if (!mouse_frame (where.frame, ignored)) { return; } @@ -6162,7 +6291,7 @@ Editor::set_edit_point () if (selection->markers.empty()) { - mouse_add_new_marker (where); + mouse_add_new_marker (where.frame); } else { bool ignored; @@ -6170,7 +6299,7 @@ Editor::set_edit_point () Location* loc = find_location_from_marker (selection->markers.front(), ignored); if (loc) { - loc->move_to (where); + loc->move_to (where.frame, where.division); } } } @@ -6181,23 +6310,25 @@ Editor::set_playhead_cursor () if (entered_marker) { _session->request_locate (entered_marker->position(), _session->transport_rolling()); } else { - framepos_t where; + MusicFrame where (0, 0); bool ignored; - if (!mouse_frame (where, ignored)) { + if (!mouse_frame (where.frame, ignored)) { return; } snap_to (where); if (_session) { - _session->request_locate (where, _session->transport_rolling()); + _session->request_locate (where.frame, _session->transport_rolling()); } } - if (UIConfiguration::instance().get_follow_edits() && (!_session || !_session->config.get_external_sync())) { - cancel_time_selection(); - } +//not sure what this was for; remove it for now. +// if (UIConfiguration::instance().get_follow_edits() && (!_session || !_session->config.get_external_sync())) { +// cancel_time_selection(); +// } + } void @@ -6217,18 +6348,16 @@ Editor::split_region () 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 (); + const framepos_t pos = get_preferred_edit_position(); + const int32_t division = get_grid_music_divisions (0); + MusicFrame where (pos, division); if (rs.empty()) { return; } - if (snap_musical()) { - split_regions_at (where, rs, get_grid_music_divisions (0)); - } else { - split_regions_at (where, rs, 0); - } + split_regions_at (where, rs); + } } @@ -6382,7 +6511,7 @@ Editor::set_auto_punch_range () set_punch_range (tpl->start(), now, _("Auto Punch In/Out")); _session->config.set_punch_out(true); } - } else { + } else { if (_session->config.get_punch_out()) { _session->config.set_punch_out(false); } @@ -6436,7 +6565,7 @@ Editor::set_punch_start_from_edit_point () { if (_session) { - framepos_t start = 0; + MusicFrame start (0, 0); framepos_t end = max_framepos; //use the existing punch end, if any @@ -6446,20 +6575,20 @@ Editor::set_punch_start_from_edit_point () } if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { - start = _session->audible_frame(); + start.frame = _session->audible_frame(); } else { - start = get_preferred_edit_position(); + start.frame = 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 ) { + if (start.frame > end ) { end = max_framepos; } - set_punch_range (start, end, _("set punch start from EP")); + set_punch_range (start.frame, end, _("set punch start from EP")); } } @@ -6470,7 +6599,7 @@ Editor::set_punch_end_from_edit_point () if (_session) { framepos_t start = 0; - framepos_t end = max_framepos; + MusicFrame end (max_framepos, 0); //use the existing punch start, if any Location* tpl = transport_punch_location(); @@ -6479,15 +6608,15 @@ Editor::set_punch_end_from_edit_point () } if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { - end = _session->audible_frame(); + end.frame = _session->audible_frame(); } else { - end = get_preferred_edit_position(); + end.frame = get_preferred_edit_position(); } //snap the selection start/end - snap_to(end); + snap_to (end); - set_punch_range (start, end, _("set punch end from EP")); + set_punch_range (start, end.frame, _("set punch end from EP")); } } @@ -6497,7 +6626,7 @@ Editor::set_loop_start_from_edit_point () { if (_session) { - framepos_t start = 0; + MusicFrame start (0, 0); framepos_t end = max_framepos; //use the existing loop end, if any @@ -6507,20 +6636,20 @@ Editor::set_loop_start_from_edit_point () } if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { - start = _session->audible_frame(); + start.frame = _session->audible_frame(); } else { - start = get_preferred_edit_position(); + start.frame = get_preferred_edit_position(); } //snap the selection start/end - snap_to(start); + snap_to (start); //if there's not already a sensible selection endpoint, go "forever" - if ( start > end ) { + if (start.frame > end ) { end = max_framepos; } - set_loop_range (start, end, _("set loop start from EP")); + set_loop_range (start.frame, end, _("set loop start from EP")); } } @@ -6531,7 +6660,7 @@ Editor::set_loop_end_from_edit_point () if (_session) { framepos_t start = 0; - framepos_t end = max_framepos; + MusicFrame end (max_framepos, 0); //use the existing loop start, if any Location* tpl = transport_loop_location(); @@ -6540,15 +6669,15 @@ Editor::set_loop_end_from_edit_point () } if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { - end = _session->audible_frame(); + end.frame = _session->audible_frame(); } else { - end = get_preferred_edit_position(); + end.frame = get_preferred_edit_position(); } //snap the selection start/end snap_to(end); - set_loop_range (start, end, _("set loop end from EP")); + set_loop_range (start, end.frame, _("set loop end from EP")); } } @@ -6681,12 +6810,13 @@ Editor::define_one_bar (framepos_t start, framepos_t end) XMLNode& before (_session->tempo_map().get_state()); if (do_global) { - _session->tempo_map().change_initial_tempo (beats_per_minute, t.note_type()); + _session->tempo_map().change_initial_tempo (beats_per_minute, t.note_type(), t.end_note_types_per_minute()); } else if (t.frame() == start) { - _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type()); + _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type(), t.end_note_types_per_minute()); } else { + /* constant tempo */ const Tempo tempo (beats_per_minute, t.note_type()); - _session->tempo_map().add_tempo (tempo, 0.0, start, TempoSection::Constant, AudioTime); + _session->tempo_map().add_tempo (tempo, 0.0, start, AudioTime); } XMLNode& after (_session->tempo_map().get_state()); @@ -6962,10 +7092,12 @@ Editor::snap_regions_to_grid () used_playlists.push_back(pl); pl->freeze(); } + (*r)->region()->clear_changes (); - framepos_t start_frame = (*r)->region()->first_frame (); - snap_to (start_frame); - (*r)->region()->set_position (start_frame); + MusicFrame start ((*r)->region()->first_frame (), 0); + snap_to (start); + (*r)->region()->set_position (start.frame, start.division); + _session->add_command(new StatefulDiffCommand ((*r)->region())); } while (used_playlists.size() > 0) { @@ -7059,11 +7191,16 @@ Editor::close_region_gaps () continue; } + (*r)->region()->clear_changes (); (*r)->region()->trim_front( (position - pull_back_frames)); + + last_region->clear_changes (); last_region->trim_end( (position - pull_back_frames + crossfade_len)); - last_region = (*r)->region(); + _session->add_command (new StatefulDiffCommand ((*r)->region())); + _session->add_command (new StatefulDiffCommand (last_region)); + last_region = (*r)->region(); idx++; } @@ -7163,11 +7300,12 @@ Editor::playhead_forward_to_grid () return; } - framepos_t pos = playhead_cursor->current_frame (); - if (pos < max_framepos - 1) { - pos += 2; - snap_to_internal (pos, RoundUpAlways, false); - _session->request_locate (pos); + MusicFrame pos (playhead_cursor->current_frame (), 0); + + if (pos.frame < max_framepos - 1) { + pos.frame += 2; + snap_to_internal (pos, RoundUpAlways, false, true); + _session->request_locate (pos.frame); } } @@ -7179,11 +7317,12 @@ Editor::playhead_backward_to_grid () return; } - framepos_t pos = playhead_cursor->current_frame (); - if (pos > 2) { - pos -= 2; - snap_to_internal (pos, RoundDownAlways, false); - _session->request_locate (pos); + MusicFrame pos (playhead_cursor->current_frame (), 0); + + if (pos.frame > 2) { + pos.frame -= 2; + snap_to_internal (pos, RoundDownAlways, false, true); + _session->request_locate (pos.frame); } } @@ -7355,10 +7494,10 @@ edit your ardour.rc file to set the\n\ } } - Mixer_UI::instance()->selection().block_routes_changed (true); - selection->block_tracks_changed (true); { + PresentationInfo::ChangeSuspender cs; DisplaySuspender ds; + boost::shared_ptr rl (new RouteList); for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { rl->push_back (*x); @@ -7369,9 +7508,6 @@ edit your ardour.rc file to set the\n\ * destructors are called, * diskstream drops references, save_state is called (again for every track) */ - selection->block_tracks_changed (false); - Mixer_UI::instance()->selection().block_routes_changed (false); - selection->TracksChanged (); /* EMIT SIGNAL */ } void @@ -7449,17 +7585,18 @@ Editor::insert_time ( (*i)->clear_changes (); (*i)->clear_owned_changes (); + if (!in_command) { + begin_reversible_command (_("insert time")); + in_command = true; + } + if (opt == SplitIntersected) { /* non musical split */ - (*i)->split (pos, 0); + (*i)->split (MusicFrame (pos, 0)); } (*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); @@ -7481,6 +7618,7 @@ Editor::insert_time ( /* markers */ if (markers_too) { bool moved = false; + const int32_t divisions = get_grid_music_divisions (0); XMLNode& before (_session->locations()->get_state()); Locations::LocationList copy (_session->locations()->list()); @@ -7497,9 +7635,9 @@ Editor::insert_time ( if ((*i)->start() >= pos) { // 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_end ((*i)->end() + frames, false, true, divisions); } - (*i)->set_start ((*i)->start() + frames); + (*i)->set_start ((*i)->start() + frames, false, true, divisions); moved = true; } @@ -7570,7 +7708,7 @@ Editor::do_remove_time () 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) + 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; @@ -7586,16 +7724,17 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, XMLNode &before = pl->get_state(); + if (!in_command) { + begin_reversible_command (_("remove time")); + in_command = true; + } + 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)); @@ -7612,6 +7751,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, } } + const int32_t divisions = get_grid_music_divisions (0); std::list loc_kill_list; /* markers */ @@ -7640,20 +7780,20 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, // 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 + (*i)->set_start (pos, false, true,divisions); // 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 + (*i)->set_start ((*i)->start() - frames, false, true, divisions); // 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 + (*i)->set_end (pos, false, true, divisions); // 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 + (*i)->set_end ((*i)->end() - frames, false, true, divisions); // slip the end marker back moved = true; } @@ -7662,7 +7802,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, loc_kill_list.push_back(*i); moved = true; } else if ((*i)->start() >= pos) { - (*i)->set_start ((*i)->start() -frames); + (*i)->set_start ((*i)->start() -frames, false, true, divisions); moved = true; } @@ -7707,32 +7847,31 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, void Editor::fit_selection () { - if (!selection->tracks.empty()) { - fit_tracks (selection->tracks); - } else { - TrackViewList tvl; - - /* no selected tracks - use tracks with selected regions */ + if (!selection->tracks.empty()) { + fit_tracks (selection->tracks); + } else { + TrackViewList tvl; - if (!selection->regions.empty()) { - for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) { - tvl.push_back (&(*r)->get_time_axis_view ()); - } + /* no selected tracks - use tracks with selected regions */ - if (!tvl.empty()) { - fit_tracks (tvl); - } - } else if (internal_editing()) { - /* no selected tracks, or regions, but in internal edit mode, so follow the mouse and use - the entered track - */ - if (entered_track) { - tvl.push_back (entered_track); - fit_tracks (tvl); - } - } - } + if (!selection->regions.empty()) { + for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) { + tvl.push_back (&(*r)->get_time_axis_view ()); + } + if (!tvl.empty()) { + fit_tracks (tvl); + } + } else if (internal_editing()) { + /* no selected tracks, or regions, but in internal edit mode, so follow the mouse and use + * the entered track + */ + if (entered_track) { + tvl.push_back (entered_track); + fit_tracks (tvl); + } + } + } } void @@ -7756,11 +7895,11 @@ Editor::fit_tracks (TrackViewList & tracks) } /* compute the per-track height from: - - total canvas visible height - - height that will be taken by visible children of selected - tracks - height of the ruler/hscroll area - */ + * + * total canvas visible height + * - height that will be taken by visible children of selected 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; @@ -7873,7 +8012,7 @@ Editor::start_visual_state_op (uint32_t n) void Editor::cancel_visual_state_op (uint32_t n) { - goto_visual_state (n); + goto_visual_state (n); } void