X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=e2a378759def1b41be29b18f5e1aa0b98fe362c7;hb=0e9dab6aabc2efddc957c7c71bc55354c16626ed;hp=f5bf0ffcb7b399f7e4c3fc5c21e4d977bc9dfbd1;hpb=b066ad3164e4ae1a79ec4562556c4b3aa30f6339;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index f5bf0ffcb7..e2a378759d 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" @@ -59,6 +63,7 @@ #include "ardour/strip_silence.h" #include "ardour/transient_detector.h" #include "ardour/transpose.h" +#include "ardour/vca_manager.h" #include "canvas/canvas.h" @@ -102,6 +107,7 @@ #include "transpose_dialog.h" #include "transform_dialog.h" #include "ui_config.h" +#include "vca_time_axis.h" #include "pbd/i18n.h" @@ -110,6 +116,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; +using namespace ArdourWidgets; using namespace Editing; using Gtkmm2ext::Keyboard; @@ -625,9 +632,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 @@ -716,9 +723,12 @@ Editor::build_region_boundary_cache () return; } + bool maybe_first_frame = false; + switch (_snap_type) { case SnapToRegionStart: interesting_points.push_back (Start); + maybe_first_frame = true; break; case SnapToRegionEnd: interesting_points.push_back (End); @@ -729,6 +739,7 @@ Editor::build_region_boundary_cache () case SnapToRegionBoundary: interesting_points.push_back (Start); interesting_points.push_back (End); + maybe_first_frame = true; break; default: fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), _snap_type) << endmsg; @@ -745,6 +756,17 @@ Editor::build_region_boundary_cache () tlist = track_views.filter_to_unique_playlists (); } + if (maybe_first_frame) { + TrackViewList::const_iterator i; + for (i = tlist.begin(); i != tlist.end(); ++i) { + boost::shared_ptr pl = (*i)->playlist(); + if (pl && pl->count_regions_at (0)) { + region_boundary_cache.push_back (0); + break; + } + } + } + while (pos < _session->current_end_frame() && !at_end) { framepos_t rpos; @@ -1451,6 +1473,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) { @@ -1751,6 +1789,50 @@ Editor::temporal_zoom_step_scale (bool zoom_out, double scale) } } + // 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); } @@ -2101,7 +2183,7 @@ Editor::choose_new_marker_name(string &name) { return true; } - ArdourPrompter dialog (true); + Prompter dialog (true); dialog.set_prompt (_("New Name:")); @@ -3011,7 +3093,7 @@ Editor::split_multichannel_region () vector< boost::shared_ptr > v; for (list::iterator x = rs.begin(); x != rs.end(); ++x) { - (*x)->region()->separate_by_channel (*_session, v); + (*x)->region()->separate_by_channel (v); } } @@ -3123,8 +3205,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")); @@ -3154,8 +3236,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 @@ -3258,10 +3340,10 @@ Editor::separate_under_selected_regions () boost::shared_ptr playlist = (*rl)->playlist(); - if (!playlist) { + if (!playlist) { // is this check necessary? continue; - } + } vector::iterator i; @@ -3277,7 +3359,7 @@ Editor::separate_under_selected_regions () PlaylistState before; before.playlist = playlist; before.before = &playlist->get_state(); - + playlist->clear_changes (); playlist->freeze (); playlists.push_back(before); } @@ -3304,15 +3386,22 @@ Editor::crop_region_to_selection () { if (!selection->time.empty()) { - crop_region_to (selection->time.start(), selection->time.end_frame()); - + begin_reversible_command (_("Crop Regions to Time Selection")); + for (std::list::iterator i = selection->time.begin(); i != selection->time.end(); ++i) { + crop_region_to ((*i).start, (*i).end); + } + commit_reversible_command(); } else { framepos_t start; framepos_t end; if (get_edit_op_range (start, end)) { + begin_reversible_command (_("Crop Regions to Edit Range")); + crop_region_to (start, end); + + commit_reversible_command(); } } @@ -3359,7 +3448,6 @@ Editor::crop_region_to (framepos_t start, framepos_t end) 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) { @@ -3389,19 +3477,11 @@ Editor::crop_region_to (framepos_t start, framepos_t end) 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; - } (*i)->clear_changes (); (*i)->trim_to (new_start, new_length); _session->add_command (new StatefulDiffCommand (*i)); } } - - if (in_command) { - commit_reversible_command (); - } } void @@ -3553,9 +3633,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 @@ -3837,26 +3917,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) { @@ -3929,8 +4009,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); @@ -4127,8 +4207,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) { @@ -4200,7 +4281,7 @@ Editor::cut_copy (CutCopyOp op) if (did_edit) { /* reset repeated paste state */ paste_count = 0; - last_paste_pos = 0; + last_paste_pos = -1; commit_reversible_command (); } @@ -4218,11 +4299,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) */ @@ -4372,16 +4455,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' */ @@ -4445,10 +4528,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 @@ -4694,7 +4777,7 @@ Editor::cut_copy_ranges (CutCopyOp op) void Editor::paste (float times, bool from_context) { - DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); + 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); } @@ -4715,7 +4798,7 @@ Editor::mouse_paste () 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; @@ -4723,7 +4806,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) { @@ -4740,8 +4823,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 { @@ -4805,8 +4888,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 { @@ -4931,7 +5014,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; } } @@ -5023,12 +5106,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 (); @@ -5217,6 +5300,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 () @@ -5246,7 +5361,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); } } @@ -5313,6 +5428,7 @@ Editor::apply_midi_note_edit_op (MidiOperator& op, const RegionSelection& rs) if (in_command) { commit_reversible_command (); + _session->set_dirty (); } } @@ -5491,7 +5607,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; @@ -5819,18 +5935,18 @@ Editor::toggle_solo () boost::shared_ptr cl (new ControlList); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - RouteTimeAxisView *rtav = dynamic_cast(*i); + StripableTimeAxisView *stav = dynamic_cast(*i); - if (!rtav) { + if (!stav || !stav->stripable()->solo_control()) { continue; } if (first) { - new_state = !rtav->route()->soloed (); + new_state = !stav->stripable()->solo_control()->soloed (); first = false; } - cl->push_back (rtav->route()->solo_control()); + cl->push_back (stav->stripable()->solo_control()); } _session->set_controls (cl, new_state ? 1.0 : 0.0, Controllable::UseGroup); @@ -5841,24 +5957,24 @@ Editor::toggle_mute () { 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); + StripableTimeAxisView *stav = dynamic_cast(*i); - if (!rtav) { + if (!stav || !stav->stripable()->mute_control()) { continue; } if (first) { - new_state = !rtav->route()->muted(); + new_state = !stav->stripable()->mute_control()->muted(); first = false; } - rl->push_back (rtav->route()); + cl->push_back (stav->stripable()->mute_control()); } - _session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), new_state, Controllable::UseGroup); + _session->set_controls (cl, new_state, Controllable::UseGroup); } void @@ -6262,7 +6378,7 @@ Editor::split_region () } void -Editor::select_next_route() +Editor::select_next_stripable (bool routes_only) { if (selection->tracks.empty()) { selection->set (track_views.front()); @@ -6271,7 +6387,7 @@ Editor::select_next_route() TimeAxisView* current = selection->tracks.front(); - RouteUI *rui; + bool valid; do { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { @@ -6287,9 +6403,14 @@ Editor::select_next_route() } } - rui = dynamic_cast(current); + if (routes_only) { + RouteUI* rui = dynamic_cast(current); + valid = rui && rui->route()->active(); + } else { + valid = 0 != current->stripable ().get(); + } - } while (current->hidden() || (rui == NULL) || !rui->route()->active()); + } while (current->hidden() || !valid); selection->set (current); @@ -6297,7 +6418,7 @@ Editor::select_next_route() } void -Editor::select_prev_route() +Editor::select_prev_stripable (bool routes_only) { if (selection->tracks.empty()) { selection->set (track_views.front()); @@ -6306,7 +6427,7 @@ Editor::select_prev_route() TimeAxisView* current = selection->tracks.front(); - RouteUI *rui; + bool valid; do { for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) { @@ -6320,9 +6441,14 @@ Editor::select_prev_route() break; } } - rui = dynamic_cast(current); + if (routes_only) { + RouteUI* rui = dynamic_cast(current); + valid = rui && rui->route()->active(); + } else { + valid = 0 != current->stripable ().get(); + } - } while (current->hidden() || (rui == NULL) || !rui->route()->active()); + } while (current->hidden() || !valid); selection->set (current); @@ -6710,12 +6836,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()); @@ -7203,7 +7330,7 @@ Editor::playhead_forward_to_grid () if (pos.frame < max_framepos - 1) { pos.frame += 2; - snap_to_internal (pos, RoundUpAlways, false); + snap_to_internal (pos, RoundUpAlways, false, true); _session->request_locate (pos.frame); } } @@ -7220,7 +7347,7 @@ Editor::playhead_backward_to_grid () if (pos.frame > 2) { pos.frame -= 2; - snap_to_internal (pos, RoundDownAlways, false); + snap_to_internal (pos, RoundDownAlways, false, true); _session->request_locate (pos.frame); } } @@ -7290,20 +7417,29 @@ Editor::_remove_tracks () string prompt; int ntracks = 0; int nbusses = 0; + int nvcas = 0; const char* trackstr; const char* busstr; + const char* vcastr; vector > routes; + vector > vcas; bool special_bus = false; for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { + VCATimeAxisView* vtv = dynamic_cast (*x); + if (vtv) { + vcas.push_back (vtv->vca()); + ++nvcas; + continue; + } RouteTimeAxisView* rtv = dynamic_cast (*x); if (!rtv) { continue; } if (rtv->is_track()) { - ntracks++; + ++ntracks; } else { - nbusses++; + ++nbusses; } routes.push_back (rtv->_route); @@ -7330,45 +7466,68 @@ edit your ardour.rc file to set the\n\ return; } - if (ntracks + nbusses == 0) { + if (ntracks + nbusses + nvcas == 0) { return; } + string title; + trackstr = P_("track", "tracks", ntracks); busstr = P_("bus", "busses", nbusses); + vcastr = P_("VCA", "VCAs", nvcas); - if (ntracks) { - if (nbusses) { - prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?\n" - "(You may also lose the playlists associated with the %2)\n\n" - "This action cannot be undone, and the session file will be overwritten!"), - ntracks, trackstr, nbusses, busstr); - } else { - prompt = string_compose (_("Do you really want to remove %1 %2?\n" - "(You may also lose the playlists associated with the %2)\n\n" - "This action cannot be undone, and the session file will be overwritten!"), - ntracks, trackstr); - } - } else if (nbusses) { - prompt = string_compose (_("Do you really want to remove %1 %2?\n\n" - "This action cannot be undone, and the session file will be overwritten"), - nbusses, busstr); + if (ntracks > 0 && nbusses > 0 && nvcas > 0) { + title = _("Remove various strips"); + prompt = string_compose (_("Do you really want to remove %1 %2, %3 %4 and %5 %6?"), + ntracks, trackstr, nbusses, busstr, nvcas, vcastr); + } + else if (ntracks > 0 && nbusses > 0) { + title = string_compose (_("Remove %1 and %2"), trackstr, busstr); + prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?"), + ntracks, trackstr, nbusses, busstr); + } + else if (ntracks > 0 && nvcas > 0) { + title = string_compose (_("Remove %1 and %2"), trackstr, vcastr); + prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?"), + ntracks, trackstr, nvcas, vcastr); + } + else if (nbusses > 0 && nvcas > 0) { + title = string_compose (_("Remove %1 and %2"), busstr, vcastr); + prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?"), + nbusses, busstr, nvcas, vcastr); + } + else if (ntracks > 0) { + title = string_compose (_("Remove %1"), trackstr); + prompt = string_compose (_("Do you really want to remove %1 %2?"), + ntracks, trackstr); + } + else if (nbusses > 0) { + title = string_compose (_("Remove %1"), busstr); + prompt = string_compose (_("Do you really want to remove %1 %2?"), + nbusses, busstr); + } + else if (nvcas > 0) { + title = string_compose (_("Remove %1"), vcastr); + prompt = string_compose (_("Do you really want to remove %1 %2?"), + nvcas, vcastr); + } + else { + assert (0); + } + + if (ntracks > 0) { + prompt += "\n" + string_compose ("(You may also lose the playlists associated with the %1)", trackstr) + "\n"; } + prompt += "\n" + string(_("This action cannot be undone, and the session file will be overwritten!")); + choices.push_back (_("No, do nothing.")); - if (ntracks + nbusses > 1) { + if (ntracks + nbusses + nvcas > 1) { choices.push_back (_("Yes, remove them.")); } else { choices.push_back (_("Yes, remove it.")); } - string title; - if (ntracks) { - title = string_compose (_("Remove %1"), trackstr); - } else { - title = string_compose (_("Remove %1"), busstr); - } - Choice prompter (title, prompt, choices); if (prompter.run () != 1) { @@ -7402,6 +7561,11 @@ edit your ardour.rc file to set the\n\ rl->push_back (*x); } _session->remove_routes (rl); + + for (vector >::iterator x = vcas.begin(); x != vcas.end(); ++x) { + _session->vca_manager().remove_vca (*x); + } + } /* TrackSelection and RouteList leave scope, * destructors are called, @@ -7484,6 +7648,11 @@ 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 (MusicFrame (pos, 0)); @@ -7491,10 +7660,6 @@ Editor::insert_time ( (*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); - if (!in_command) { - begin_reversible_command (_("insert time")); - in_command = true; - } vector cmds; (*i)->rdiff (cmds); _session->add_commands (cmds); @@ -7606,7 +7771,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; @@ -7622,16 +7787,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)); @@ -7744,32 +7910,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 @@ -7793,11 +7958,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; @@ -7910,7 +8075,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