X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=8ba2115003d29b0bb8a621dd11651d16bed39de9;hb=291bd32c9d55b963ecc22354d68bc557527cfbcb;hp=d15180fd42fadd58932186c21a12582d8b2d55f0;hpb=5d82f64de0968a78b549e0cac4c7a812e1dee48d;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index d15180fd42..8ba2115003 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -56,8 +56,10 @@ #include "ardour/strip_silence.h" #include "ardour/route_group.h" #include "ardour/operations.h" +#include "ardour/session_playlists.h" #include "ardour_ui.h" +#include "debug.h" #include "editor.h" #include "time_axis_view.h" #include "route_time_axis.h" @@ -86,6 +88,7 @@ #include "editor_cursors.h" #include "mouse_cursors.h" #include "patch_change_dialog.h" +#include "transpose_dialog.h" #include "i18n.h" @@ -120,6 +123,8 @@ Editor::redo (uint32_t n) void Editor::split_regions_at (framepos_t where, RegionSelection& regions) { + bool frozen = false; + list > used_playlists; if (regions.empty()) { @@ -142,6 +147,9 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) } } else { snap_to (where); + + frozen = true; + EditorFreeze(); /* Emit Signal */ } for (RegionSelection::iterator a = regions.begin(); a != regions.end(); ) { @@ -191,94 +199,56 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) } commit_reversible_command (); -} - -boost::shared_ptr -Editor::select_region_for_operation (int /*dir*/, TimeAxisView **tv) -{ - RegionView* rv; - boost::shared_ptr region; - framepos_t start = 0; - - if (selection->time.start () == selection->time.end_frame ()) { - - /* no current selection-> is there a selected regionview? */ - - if (selection->regions.empty()) { - return region; - } - - } - - if (!selection->regions.empty()) { - - rv = *(selection->regions.begin()); - (*tv) = &rv->get_time_axis_view(); - region = rv->region(); - - } else if (!selection->tracks.empty()) { - (*tv) = selection->tracks.front(); - - RouteTimeAxisView* rtv; - - if ((rtv = dynamic_cast (*tv)) != 0) { - boost::shared_ptr pl; - - if ((pl = rtv->playlist()) == 0) { - return region; - } - - region = pl->top_region_at (start); - } + if (frozen){ + EditorThaw(); /* Emit Signal */ } - - return region; } +/** Move one extreme of the current range selection. If more than one range is selected, + * the start of the earliest range or the end of the latest range is moved. + * + * @param move_end true to move the end of the current range selection, false to move + * the start. + * @param next true to move the extreme to the next region boundary, false to move to + * the previous. + */ void -Editor::extend_selection_to_end_of_region (bool next) +Editor::move_range_selection_start_or_end_to_region_boundary (bool move_end, bool next) { - TimeAxisView *tv; - boost::shared_ptr region; - framepos_t start; - - if ((region = select_region_for_operation (next ? 1 : 0, &tv)) == 0) { + if (selection->time.start() == selection->time.end_frame()) { return; } - if (region && selection->time.start () == selection->time.end_frame ()) { - start = region->position(); - } else { - start = selection->time.start (); - } + framepos_t start = selection->time.start (); + framepos_t end = selection->time.end_frame (); - begin_reversible_command (_("extend selection")); - selection->set (start, region->position() + region->length()); - commit_reversible_command (); -} + /* the position of the thing we may move */ + framepos_t pos = move_end ? end : start; + int dir = next ? 1 : -1; -void -Editor::extend_selection_to_start_of_region (bool previous) -{ - TimeAxisView *tv; - boost::shared_ptr region; - framepos_t end; + /* so we don't find the current region again */ + if (dir > 0 || pos > 0) { + pos += dir; + } - if ((region = select_region_for_operation (previous ? -1 : 0, &tv)) == 0) { + framepos_t const target = get_region_boundary (pos, dir, true, false); + if (target < 0) { return; } - if (region && selection->time.start () == selection->time.end_frame ()) { - end = region->position() + region->length(); + if (move_end) { + end = target; } else { - end = selection->time.end_frame (); + start = target; } - /* Try to leave the selection with the same route if possible */ + if (end < start) { + return; + } - begin_reversible_command (_("extend selection")); - selection->set (region->position(), end); + begin_reversible_command (_("alter selection")); + selection->set_preserving_all_ranges (start, end); commit_reversible_command (); } @@ -331,7 +301,7 @@ Editor::nudge_forward (bool next, bool force_playhead) } r->clear_changes (); - r->set_position (r->position() + distance, this); + r->set_position (r->position() + distance); _session->add_command (new StatefulDiffCommand (r)); } @@ -410,13 +380,13 @@ Editor::nudge_backward (bool next, bool force_playhead) if (next) { distance = next_distance; } - + r->clear_changes (); if (r->position() > distance) { - r->set_position (r->position() - distance, this); + r->set_position (r->position() - distance); } else { - r->set_position (0, this); + r->set_position (0); } _session->add_command (new StatefulDiffCommand (r)); } @@ -484,23 +454,23 @@ void Editor::nudge_forward_capture_offset () { RegionSelection rs = get_regions_from_selection_and_entered (); - + if (!_session || rs.empty()) { return; } begin_reversible_command (_("nudge forward")); - + framepos_t const distance = _session->worst_output_latency(); - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr r ((*i)->region()); - + r->clear_changes (); - r->set_position (r->position() + distance, this); + r->set_position (r->position() + distance); _session->add_command(new StatefulDiffCommand (r)); } - + commit_reversible_command (); } @@ -514,22 +484,22 @@ Editor::nudge_backward_capture_offset () } begin_reversible_command (_("nudge forward")); - + framepos_t const distance = _session->worst_output_latency(); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr r ((*i)->region()); - + r->clear_changes (); - + if (r->position() > distance) { - r->set_position (r->position() - distance, this); + r->set_position (r->position() - distance); } else { - r->set_position (0, this); + r->set_position (0); } _session->add_command(new StatefulDiffCommand (r)); } - + commit_reversible_command (); } @@ -736,7 +706,7 @@ Editor::find_next_region_boundary (framepos_t pos, int32_t dir, const TrackViewL for (TrackViewList::const_iterator i = tracks.begin(); i != tracks.end(); ++i) { framepos_t contender; framecnt_t d; - + RouteTimeAxisView* rtv = dynamic_cast (*i); if (!rtv) { @@ -1197,68 +1167,6 @@ Editor::scroll_playhead (bool forward) _session->request_locate (pos); } -void -Editor::playhead_backward () -{ - framepos_t pos; - framepos_t cnt; - float prefix; - bool was_floating; - - if (get_prefix (prefix, was_floating)) { - cnt = 1; - } else { - if (was_floating) { - cnt = (framepos_t) floor (prefix * _session->frame_rate ()); - } else { - cnt = (framepos_t) prefix; - } - } - - pos = playhead_cursor->current_frame; - - if ((framepos_t) pos < cnt) { - pos = 0; - } else { - pos -= cnt; - } - - /* XXX this is completely insane. with the current buffering - design, we'll force a complete track buffer flush and - reload, just to move 1 sample !!! - */ - - _session->request_locate (pos); -} - -void -Editor::playhead_forward () -{ - framepos_t pos; - framepos_t cnt; - bool was_floating; - float prefix; - - if (get_prefix (prefix, was_floating)) { - cnt = 1; - } else { - if (was_floating) { - cnt = (framepos_t) floor (prefix * _session->frame_rate ()); - } else { - cnt = (framepos_t) floor (prefix); - } - } - - pos = playhead_cursor->current_frame; - - /* XXX this is completely insane. with the current buffering - design, we'll force a complete track buffer flush and - reload, just to move 1 sample !!! - */ - - _session->request_locate (pos+cnt); -} - void Editor::cursor_align (bool playhead_to_edit) { @@ -1292,98 +1200,13 @@ Editor::cursor_align (bool playhead_to_edit) } } -void -Editor::edit_cursor_backward () -{ - framepos_t pos; - framepos_t cnt; - float prefix; - bool was_floating; - - if (get_prefix (prefix, was_floating)) { - cnt = 1; - } else { - if (was_floating) { - cnt = (framepos_t) floor (prefix * _session->frame_rate ()); - } else { - cnt = (framepos_t) prefix; - } - } - - if ((pos = get_preferred_edit_position()) < 0) { - return; - } - - if (pos < cnt) { - pos = 0; - } else { - pos -= cnt; - } - - // EDIT CURSOR edit_cursor->set_position (pos); -} - -void -Editor::edit_cursor_forward () -{ - //framepos_t pos; - framepos_t cnt; - bool was_floating; - float prefix; - - if (get_prefix (prefix, was_floating)) { - cnt = 1; - } else { - if (was_floating) { - cnt = (framepos_t) floor (prefix * _session->frame_rate ()); - } else { - cnt = (framepos_t) floor (prefix); - } - } - - // pos = edit_cursor->current_frame; - // EDIT CURSOR edit_cursor->set_position (pos+cnt); -} - -void -Editor::goto_frame () -{ - float prefix; - bool was_floating; - framepos_t frame; - - if (get_prefix (prefix, was_floating)) { - return; - } - - if (was_floating) { - frame = (framepos_t) floor (prefix * _session->frame_rate()); - } else { - frame = (framepos_t) floor (prefix); - } - - _session->request_locate (frame); -} - void Editor::scroll_backward (float pages) { - framepos_t frame; - framepos_t one_page = (framepos_t) rint (_canvas_width * frames_per_unit); - bool was_floating; - float prefix; - framepos_t cnt; - - if (get_prefix (prefix, was_floating)) { - cnt = (framepos_t) floor (pages * one_page); - } else { - if (was_floating) { - cnt = (framepos_t) floor (prefix * _session->frame_rate()); - } else { - cnt = (framepos_t) floor (prefix * one_page); - } - } + framepos_t const one_page = (framepos_t) rint (_canvas_width * frames_per_unit); + framepos_t const cnt = (framepos_t) floor (pages * one_page); + framepos_t frame; if (leftmost_frame < cnt) { frame = 0; } else { @@ -1396,22 +1219,10 @@ Editor::scroll_backward (float pages) void Editor::scroll_forward (float pages) { - framepos_t frame; - framepos_t one_page = (framepos_t) rint (_canvas_width * frames_per_unit); - bool was_floating; - float prefix; - framepos_t cnt; - - if (get_prefix (prefix, was_floating)) { - cnt = (framepos_t) floor (pages * one_page); - } else { - if (was_floating) { - cnt = (framepos_t) floor (prefix * _session->frame_rate()); - } else { - cnt = (framepos_t) floor (prefix * one_page); - } - } + framepos_t const one_page = (framepos_t) rint (_canvas_width * frames_per_unit); + framepos_t const cnt = (framepos_t) floor (pages * one_page); + framepos_t frame; if (max_framepos - cnt < leftmost_frame) { frame = max_framepos - cnt; } else { @@ -1424,38 +1235,18 @@ Editor::scroll_forward (float pages) void Editor::scroll_tracks_down () { - float prefix; - bool was_floating; - int cnt; - - if (get_prefix (prefix, was_floating)) { - cnt = 1; - } else { - cnt = (int) floor (prefix); - } - - double vert_value = vertical_adjustment.get_value() + (cnt * - vertical_adjustment.get_page_size()); + double vert_value = vertical_adjustment.get_value() + vertical_adjustment.get_page_size(); if (vert_value > vertical_adjustment.get_upper() - _canvas_height) { vert_value = vertical_adjustment.get_upper() - _canvas_height; } + vertical_adjustment.set_value (vert_value); } void Editor::scroll_tracks_up () { - float prefix; - bool was_floating; - int cnt; - - if (get_prefix (prefix, was_floating)) { - cnt = 1; - } else { - cnt = (int) floor (prefix); - } - - vertical_adjustment.set_value (vertical_adjustment.get_value() - (cnt * vertical_adjustment.get_page_size())); + vertical_adjustment.set_value (vertical_adjustment.get_value() - vertical_adjustment.get_page_size()); } void @@ -1466,7 +1257,7 @@ Editor::scroll_tracks_down_line () if (vert_value > vertical_adjustment.get_upper() - _canvas_height) { vert_value = vertical_adjustment.get_upper() - _canvas_height; } - + vertical_adjustment.set_value (vert_value); } @@ -1714,7 +1505,7 @@ Editor::temporal_zoom_region (bool both_axes) for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) { - hide_track_in_display (*i, true); + hide_track_in_display (*i); } } @@ -1816,10 +1607,10 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame) if (new_leftmost > frame) { new_leftmost = 0; } -// begin_reversible_command (_("zoom to frame")); -// _session->add_undo (sigc::bind (sigc::mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit)); -// _session->add_redo (sigc::bind (sigc::mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu)); -// commit_reversible_command (); + + if (new_leftmost < 0) { + new_leftmost = 0; + } reposition_and_zoom (new_leftmost, new_fpu); } @@ -1919,7 +1710,7 @@ void Editor::add_locations_from_region () { RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } @@ -1946,7 +1737,7 @@ void Editor::add_location_from_region () { RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } @@ -1977,59 +1768,6 @@ Editor::add_location_from_region () _session->commit_reversible_command (); } -void -Editor::amplitude_zoom_step (bool in) -{ - gdouble zoom = 1.0; - - if (in) { - zoom *= 2.0; - } else { - if (zoom > 2.0) { - zoom /= 2.0; - } else { - zoom = 1.0; - } - } - -#ifdef FIX_FOR_CANVAS - /* XXX DO SOMETHING */ -#endif -} - - -/* DELETION */ - - -void -Editor::delete_sample_forward () -{ -} - -void -Editor::delete_sample_backward () -{ -} - -void -Editor::delete_screen () -{ -} - -/* SEARCH */ - -void -Editor::search_backwards () -{ - /* what ? */ -} - -void -Editor::search_forwards () -{ - /* what ? */ -} - /* MARKS */ void @@ -2067,25 +1805,15 @@ Editor::jump_backward_to_mark () void Editor::set_mark () { - framepos_t pos; - float prefix; - bool was_floating; - string markername; + framepos_t const pos = _session->audible_frame (); - if (get_prefix (prefix, was_floating)) { - pos = _session->audible_frame (); - } else { - if (was_floating) { - pos = (framepos_t) floor (prefix * _session->frame_rate ()); - } else { - pos = (framepos_t) floor (prefix); - } - } + string markername; + _session->locations()->next_available_name (markername, "mark"); - _session->locations()->next_available_name(markername,"mark"); - if (!choose_new_marker_name(markername)) { + if (!choose_new_marker_name (markername)) { return; } + _session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark), true); } @@ -2111,11 +1839,13 @@ Editor::clear_ranges () Location * looploc = _session->locations()->auto_loop_location(); Location * punchloc = _session->locations()->auto_punch_location(); + Location * sessionloc = _session->locations()->session_range_location(); _session->locations()->clear_ranges (); // re-add these if (looploc) _session->locations()->add (looploc); if (punchloc) _session->locations()->add (punchloc); + if (sessionloc) _session->locations()->add (sessionloc); XMLNode &after = _session->locations()->get_state(); _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); @@ -2209,7 +1939,6 @@ Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) { double wx, wy; double cx, cy; - framepos_t where; RouteTimeAxisView *dest_rtv = 0; RouteTimeAxisView *source_rtv = 0; @@ -2222,7 +1951,7 @@ Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) event.button.x = wx; event.button.y = wy; - where = event_frame (&event, &cx, &cy); + event_frame (&event, &cx, &cy); std::pair const tv = trackview_by_y_position (cy); if (tv.first == 0) { @@ -2441,7 +2170,7 @@ void Editor::rename_region () { RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } @@ -2464,7 +2193,7 @@ Editor::rename_region () d.set_size_request (300, -1); d.set_position (Gtk::WIN_POS_MOUSE); - entry.set_text (selection->regions.front()->region()->name()); + entry.set_text (rs.front()->region()->name()); entry.select_region (0, -1); entry.signal_activate().connect (sigc::bind (sigc::mem_fun (d, &Dialog::response), RESPONSE_OK)); @@ -2480,7 +2209,7 @@ Editor::rename_region () if (ret != RESPONSE_OK) { return; } - + std::string str = entry.get_text(); strip_whitespace_edges (str); if (!str.empty()) { @@ -2526,7 +2255,7 @@ Editor::play_selected_region () framepos_t end = 0; RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } @@ -2584,8 +2313,8 @@ Editor::region_from_selection () internal_start = start - current->position(); RegionFactory::region_name (new_name, current->name(), true); - PropertyList plist; - + PropertyList plist; + plist.add (ARDOUR::Properties::start, current->start() + internal_start); plist.add (ARDOUR::Properties::length, selection_cnt); plist.add (ARDOUR::Properties::name, new_name); @@ -2624,8 +2353,8 @@ Editor::create_region_from_selection (vector >& new_re internal_start = start - current->position(); RegionFactory::region_name (new_name, current->name(), true); - PropertyList plist; - + PropertyList plist; + plist.add (ARDOUR::Properties::start, current->start() + internal_start); plist.add (ARDOUR::Properties::length, end - start + 1); plist.add (ARDOUR::Properties::name, new_name); @@ -2638,7 +2367,7 @@ void Editor::split_multichannel_region () { RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } @@ -2756,12 +2485,12 @@ Editor::separate_regions_between (const TimeSelection& ts) 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; } - + /* pick up changes to existing regions */ vector cmds; @@ -2864,7 +2593,7 @@ Editor::separate_under_selected_regions () vector playlists; RegionSelection rs; - + rs = get_regions_from_selection_and_entered(); if (!_session || rs.empty()) { @@ -2918,7 +2647,7 @@ Editor::separate_under_selected_regions () //Partition on the region bounds playlist->partition ((*rl)->first_frame() - 1, (*rl)->last_frame() + 1, true); - + //Re-add region that was just removed due to the partition operation playlist->add_region( (*rl), (*rl)->first_frame() ); } @@ -3017,7 +2746,7 @@ Editor::crop_region_to (framepos_t start, framepos_t end) cnt = the_end - the_start + 1; region->clear_changes (); - region->trim_to (the_start, cnt, this); + region->trim_to (the_start, cnt); _session->add_command (new StatefulDiffCommand (region)); } @@ -3144,20 +2873,20 @@ void Editor::remove_region_sync () { RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } begin_reversible_command (_("remove region sync")); - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_changes (); (*i)->region()->clear_sync_position (); _session->add_command(new StatefulDiffCommand ((*i)->region())); } - + commit_reversible_command (); } @@ -3175,13 +2904,13 @@ Editor::naturalize_region () } else { begin_reversible_command (_("move region to original position")); } - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { (*i)->region()->clear_changes (); - (*i)->region()->move_to_natural_position (this); + (*i)->region()->move_to_natural_position (); _session->add_command (new StatefulDiffCommand ((*i)->region())); } - + commit_reversible_command (); } @@ -3189,7 +2918,7 @@ void Editor::align_regions (RegionPoint what) { RegionSelection const rs = get_regions_from_selection_and_edit_point (); - + if (rs.empty()) { return; } @@ -3215,7 +2944,7 @@ void Editor::align_regions_relative (RegionPoint point) { RegionSelection const rs = get_regions_from_selection_and_edit_point (); - + if (rs.empty()) { return; } @@ -3273,7 +3002,7 @@ Editor::align_regions_relative (RegionPoint point) /* move first one specially */ r->clear_changes (); - r->set_position (pos, this); + r->set_position (pos); _session->add_command(new StatefulDiffCommand (r)); /* move rest by the same amount */ @@ -3287,11 +3016,11 @@ Editor::align_regions_relative (RegionPoint point) region->clear_changes (); if (dir > 0) { - region->set_position (region->position() + distance, this); + region->set_position (region->position() + distance); } else { - region->set_position (region->position() - distance, this); + region->set_position (region->position() - distance); } - + _session->add_command(new StatefulDiffCommand (region)); } @@ -3314,17 +3043,17 @@ Editor::align_region_internal (boost::shared_ptr region, RegionPoint poi switch (point) { case SyncPoint: - region->set_position (region->adjust_to_sync (position), this); + region->set_position (region->adjust_to_sync (position)); break; case End: if (position > region->length()) { - region->set_position (position - region->length(), this); + region->set_position (position - region->length()); } break; case Start: - region->set_position (position, this); + region->set_position (position); break; } @@ -3362,15 +3091,15 @@ Editor::trim_region (bool front) for (list::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) { if (!(*i)->region()->locked()) { - + (*i)->region()->clear_changes (); - + if (front) { - (*i)->region()->trim_front (where, this); + (*i)->region()->trim_front (where); } else { - (*i)->region()->trim_end (where, this); + (*i)->region()->trim_end (where); } - + _session->add_command (new StatefulDiffCommand ((*i)->region())); } } @@ -3432,9 +3161,9 @@ Editor::trim_region_to_location (const Location& loc, const char* str) start = session_frame_to_track_frame (loc.start(), speed); end = session_frame_to_track_frame (loc.end(), speed); - + rv->region()->clear_changes (); - rv->region()->trim_to (start, (end - start), this); + rv->region()->trim_to (start, (end - start)); _session->add_command(new StatefulDiffCommand (rv->region())); } @@ -3496,7 +3225,7 @@ Editor::trim_to_region(bool forward) continue; } - region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed), this); + region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed)); arv->region_changed (PropertyChange (ARDOUR::Properties::length)); } else { @@ -3507,7 +3236,7 @@ Editor::trim_to_region(bool forward) continue; } - region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed), this); + region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed)); arv->region_changed (ARDOUR::bounds_change); } @@ -3547,6 +3276,14 @@ Editor::freeze_thread () void Editor::freeze_route () { + if (!_session) { + return; + } + + /* stop transport before we start. this is important */ + + _session->request_transport_speed (0.0); + if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { return; } @@ -3592,10 +3329,11 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) { RouteTimeAxisView* rtv = dynamic_cast (*i); - if (rtv && !rtv->track()->bounceable()) { + if (rtv && rtv->track() && replace && enable_processing && !rtv->track()->bounceable()) { MessageDialog d ( - _("One or more selected tracks cannot be bounced because it has more outputs than inputs. " - "You can fix this by increasing the number of inputs on that track.") + _("You can't perform this operation because the processing of the signal " + "will cause one or more of the tracks will end up with a region with more channels than this track has inputs.\n\n" + "You can do this without processing, which is a different operation.") ); d.set_title (_("Cannot bounce")); d.run (); @@ -3627,9 +3365,13 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) playlist->clear_changes (); playlist->clear_owned_changes (); - + boost::shared_ptr r = rtv->track()->bounce_range (start, start+cnt, itt, enable_processing); + if (!r) { + continue; + } + if (replace) { list ranges; ranges.push_back (AudioRange (start, start+cnt, 0)); @@ -3647,6 +3389,13 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) commit_reversible_command (); } +/** Delete selected regions, automation points or a time range */ +void +Editor::delete_ () +{ + cut_copy (Delete); +} + /** Cut selected regions, automation points or a time range */ void Editor::cut () @@ -3699,6 +3448,9 @@ Editor::cut_copy (CutCopyOp op) string opname; switch (op) { + case Delete: + opname = _("delete"); + break; case Cut: opname = _("cut"); break; @@ -3716,7 +3468,7 @@ Editor::cut_copy (CutCopyOp op) this function. */ - if (op == Cut || op == Clear) { + if (op == Delete || op == Cut || op == Clear) { if (_drags->active ()) { _drags->abort (); } @@ -3769,7 +3521,7 @@ Editor::cut_copy (CutCopyOp op) if (!rs.empty()) { cut_copy_regions (op, rs); - if (op == Cut) { + if (op == Cut || op == Delete) { selection->clear_regions (); } } @@ -3777,11 +3529,10 @@ Editor::cut_copy (CutCopyOp op) if (!selection->points.empty()) { cut_copy_points (op); - if (op == Cut) { + if (op == Cut || op == Delete) { selection->clear_points (); } } - commit_reversible_command (); break; // terminate case statement here } @@ -3804,7 +3555,7 @@ Editor::cut_copy (CutCopyOp op) cut_copy_ranges (op); commit_reversible_command (); - if (op == Cut) { + if (op == Cut || op == Delete) { selection->clear_time (); } @@ -3815,7 +3566,7 @@ Editor::cut_copy (CutCopyOp op) } } - if (op == Cut || op == Clear) { + if (op == Delete || op == Cut || op == Clear) { _drags->abort (); } } @@ -3829,6 +3580,7 @@ Editor::cut_copy_points (CutCopyOp op) for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { AutomationTimeAxisView* atv = dynamic_cast((*i).track); + _last_cut_copy_source_track = atv; if (atv) { atv->cut_copy_clear_objects (selection->points, op); @@ -3974,13 +3726,13 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) first_position = min ((framepos_t) (*x)->region()->position(), first_position); - if (op == Cut || op == Clear) { + if (op == Cut || op == Clear || op == Delete) { boost::shared_ptr pl = (*x)->region()->playlist(); if (pl) { FreezeList::iterator fl; - //only take state if this is a new playlist. + // only take state if this is a new playlist. for (fl = freezelist.begin(); fl != freezelist.end(); ++fl) { if ((*fl) == pl) { break; @@ -4028,22 +3780,25 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) tmp = x; ++tmp; - vector::iterator z; + if (op != Delete) { - 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(); - (*z).pl = npl; - } else { - npl = (*z).pl; + 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(); + (*z).pl = npl; + } else { + npl = (*z).pl; + } } boost::shared_ptr r = (*x)->region(); @@ -4052,6 +3807,10 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) assert (r != 0); switch (op) { + case Delete: + pl->remove_region (r); + break; + case Cut: _xx = RegionFactory::create (r); npl->add_region (_xx, r->position() - first_position); @@ -4064,34 +3823,37 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) break; case Clear: - pl->remove_region (r); + pl->remove_region (r); break; } x = tmp; } - list > foo; + if (op != Delete) { - /* the pmap is in the same order as the tracks in which selected regions occured */ - - for (vector::iterator i = pmap.begin(); i != pmap.end(); ++i) { - if ((*i).pl) { - (*i).pl->thaw(); - foo.push_back ((*i).pl); + list > foo; + + /* the pmap is in the same order as the tracks in which selected regions occured */ + + for (vector::iterator i = pmap.begin(); i != pmap.end(); ++i) { + if ((*i).pl) { + (*i).pl->thaw(); + foo.push_back ((*i).pl); + } + } + + if (!foo.empty()) { + cut_buffer->set (foo); + } + + if (pmap.empty()) { + _last_cut_copy_source_track = 0; + } else { + _last_cut_copy_source_track = pmap.front().tv; } } - if (!foo.empty()) { - cut_buffer->set (foo); - } - - if (pmap.empty()) { - _last_cut_copy_source_track = 0; - } else { - _last_cut_copy_source_track = pmap.front().tv; - } - for (FreezeList::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { (*pl)->thaw (); _session->add_command (new StatefulDiffCommand (*pl)); @@ -4104,6 +3866,13 @@ Editor::cut_copy_ranges (CutCopyOp op) TrackViewList* ts; TrackViewList entered; + /* Sort the track selection now, so that it if is used, the playlists + selected by the calls below to cut_copy_clear are in the order that + their tracks appear in the editor. This makes things like paste + of ranges work properly. + */ + sort_track_selection (&selection->tracks); + if (selection->tracks.empty()) { if (!entered_track) { return; @@ -4122,6 +3891,7 @@ Editor::cut_copy_ranges (CutCopyOp op) void Editor::paste (float times) { + DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); paste_internal (get_preferred_edit_position(), times); } @@ -4142,7 +3912,7 @@ Editor::mouse_paste () void Editor::paste_internal (framepos_t position, float times) { - bool commit = false; + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position)); if (internal_editing()) { if (cut_buffer->midi_notes.empty()) { @@ -4156,10 +3926,9 @@ Editor::paste_internal (framepos_t position, float times) if (position == max_framepos) { position = get_preferred_edit_position(); + DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("preferred edit position is %1\n", position)); } - begin_reversible_command (Operations::paste); - TrackViewList ts; TrackViewList::iterator i; size_t nth; @@ -4172,16 +3941,16 @@ Editor::paste_internal (framepos_t position, float times) ts = selection->tracks; } else if (_last_cut_copy_source_track) { /* otherwise paste to the track that the cut/copy came from; - see discussion in mants #3333. + see discussion in mantis #3333. */ ts.push_back (_last_cut_copy_source_track); } - for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) { + if (internal_editing ()) { /* undo/redo is handled by individual tracks/regions */ - if (internal_editing()) { + for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) { RegionSelection rs; RegionSelection::iterator r; @@ -4197,16 +3966,18 @@ Editor::paste_internal (framepos_t position, float times) ++cb; } } + } - } else { + } else { - if ((*i)->paste (position, times, *cut_buffer, nth)) { - commit = true; - } + /* we do redo (do you do voodoo?) */ + + begin_reversible_command (Operations::paste); + + for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) { + (*i)->paste (position, times, *cut_buffer, nth); } - } - if (commit) { commit_reversible_command (); } } @@ -4361,12 +4132,12 @@ Editor::nudge_track (bool use_edit, bool forwards) playlist->clear_owned_changes (); playlist->nudge_after (start, distance, forwards); - + vector cmds; - + playlist->rdiff (cmds); _session->add_commands (cmds); - + _session->add_command (new StatefulDiffCommand (playlist)); } @@ -4411,7 +4182,7 @@ Editor::normalize_region () } RegionSelection rs = get_regions_from_selection_and_entered (); - + if (rs.empty()) { return; } @@ -4444,7 +4215,7 @@ Editor::normalize_region () set_canvas_cursor (current_canvas_cursor); return; } - + max_amps.push_back (a); max_amp = max (max_amp, a); dialog.ascend (); @@ -4454,7 +4225,7 @@ Editor::normalize_region () begin_reversible_command (_("normalize")); list::const_iterator a = max_amps.begin (); - + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { AudioRegionView* const arv = dynamic_cast (*r); if (!arv) { @@ -4464,7 +4235,7 @@ Editor::normalize_region () arv->region()->clear_changes (); double const amp = dialog.normalize_individually() ? *a : max_amp; - + arv->audio_region()->normalize (amp, dialog.target ()); _session->add_command (new StatefulDiffCommand (arv->region())); @@ -4575,13 +4346,13 @@ Editor::strip_region_silence () int const r = d.run (); d.drop_rects (); - + if (r == Gtk::RESPONSE_OK) { ARDOUR::AudioIntervalMap silences; d.silences (silences); StripSilence s (*_session, silences, d.fade_length()); apply_filter (s, _("strip silence"), &d); - } + } } Command* @@ -4593,7 +4364,10 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv vector::Notes> v; v.push_back (selected); - return op (mrv.midi_region()->model(), v); + framepos_t pos_frames = mrv.midi_region()->position(); + double pos_beats = _session->tempo_map().framewalk_to_beats(0, pos_frames); + + return op (mrv.midi_region()->model(), pos_beats, v); } void @@ -4652,7 +4426,7 @@ Editor::fork_region () if (mrv) { boost::shared_ptr playlist = mrv->region()->playlist(); boost::shared_ptr newregion = mrv->midi_region()->clone (); - + playlist->clear_changes (); playlist->replace_region (mrv->region(), newregion, mrv->region()->position()); _session->add_command(new StatefulDiffCommand (playlist)); @@ -4720,7 +4494,7 @@ Editor::insert_patch_change () Evoral::PatchChange empty (0, 0, 0, 0); PatchChangeDialog d (0, _session, empty, Gtk::Stock::ADD); - + if (d.run() == RESPONSE_CANCEL) { return; } @@ -4751,7 +4525,7 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress int n = 0; int const N = rs.size (); - + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { RegionSelection::iterator tmp = r; ++tmp; @@ -4815,22 +4589,6 @@ Editor::external_edit_region () /* more to come */ } -void -Editor::brush (framepos_t pos) -{ - snap_to (pos); - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { - return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - mouse_brush_insert_region ((*i), pos); - } -} - void Editor::reset_region_gain_envelopes () { @@ -4862,7 +4620,7 @@ Editor::toggle_gain_envelope_visibility () if (_ignore_region_action) { return; } - + RegionSelection rs = get_regions_from_selection_and_entered (); if (!_session || rs.empty()) { @@ -4889,7 +4647,7 @@ Editor::toggle_gain_envelope_active () if (_ignore_region_action) { return; } - + RegionSelection rs = get_regions_from_selection_and_entered (); if (!_session || rs.empty()) { @@ -4940,7 +4698,7 @@ Editor::toggle_region_lock_style () if (_ignore_region_action) { return; } - + RegionSelection rs = get_regions_from_selection_and_entered (); if (!_session || rs.empty()) { @@ -4965,7 +4723,7 @@ Editor::toggle_opaque_region () if (_ignore_region_action) { return; } - + RegionSelection rs = get_regions_from_selection_and_entered (); if (!_session || rs.empty()) { @@ -5004,6 +4762,60 @@ Editor::toggle_record_enable () } } +void +Editor::toggle_solo () +{ + bool new_state = false; + bool first = true; + boost::shared_ptr rl (new RouteList); + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + RouteTimeAxisView *rtav = dynamic_cast(*i); + + if (!rtav) { + continue; + } + + if (first) { + new_state = !rtav->route()->soloed (); + first = false; + } + + rl->push_back (rtav->route()); + } + + _session->set_solo (rl, new_state, Session::rt_cleanup, true); +} + +void +Editor::toggle_mute () +{ + bool new_state = false; + bool first = true; + boost::shared_ptr rl (new RouteList); + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + RouteTimeAxisView *rtav = dynamic_cast(*i); + + if (!rtav) { + continue; + } + + if (first) { + new_state = !rtav->route()->muted(); + first = false; + } + + rl->push_back (rtav->route()); + } + + _session->set_mute (rl, new_state, Session::rt_cleanup, true); +} + +void +Editor::toggle_solo_isolate () +{ +} void Editor::set_fade_length (bool in) @@ -5157,7 +4969,7 @@ Editor::set_fade_in_active (bool yn) boost::shared_ptr ar (tmp->audio_region()); - + ar->clear_changes (); ar->set_fade_in_active (yn); _session->add_command (new StatefulDiffCommand (ar)); @@ -5198,7 +5010,7 @@ void Editor::toggle_region_fades (int dir) { boost::shared_ptr ar; - bool yn; + bool yn = false; RegionSelection rs = get_regions_from_selection_and_entered (); @@ -5206,7 +5018,7 @@ Editor::toggle_region_fades (int dir) return; } - RegionSelection::iterator i; + RegionSelection::iterator i; for (i = rs.begin(); i != rs.end(); ++i) { if ((ar = boost::dynamic_pointer_cast((*i)->region())) != 0) { if (dir == -1) { @@ -5326,12 +5138,12 @@ Editor::set_playhead_cursor () void Editor::split_region () { - if (((mouse_mode == MouseRange) || - (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) && + if (((mouse_mode == MouseRange) || + (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) && !selection->time.empty()) { separate_regions_between (selection->time); return; - } + } RegionSelection rs = get_regions_from_selection_and_edit_point (); @@ -5590,11 +5402,42 @@ Editor::pitch_shift_region () { RegionSelection rs = get_regions_from_selection_and_entered (); - if (rs.empty()) { + RegionSelection audio_rs; + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + if (dynamic_cast (*i)) { + audio_rs.push_back (*i); + } + } + + if (audio_rs.empty()) { return; } - pitch_shift (rs, 1.2); + 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 @@ -5666,7 +5509,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end) _("Do you want to set the global tempo or add a new tempo marker?"), options ); - + c.set_default_response (2); switch (c.run()) { @@ -5744,9 +5587,9 @@ void Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList& positions, bool can_ferret, bool select_new) { bool use_rhythmic_rodent = false; - + boost::shared_ptr pl = r->playlist(); - + list > new_regions; if (!pl) { @@ -5777,7 +5620,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList int response = msg.run(); msg.hide (); - + switch (response) { case RESPONSE_OK: break; @@ -5810,7 +5653,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList framepos_t pos = 0; while (x != positions.end()) { - + /* deal with positons that are out of scope of present region bounds */ if (*x <= 0 || *x > r->length()) { ++x; @@ -5826,7 +5669,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList */ framepos_t len = (*x) - pos; - + /* XXX we do we really want to allow even single-sample regions? shouldn't we have some kind of lower limit on region size? */ @@ -5843,16 +5686,17 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList /* do NOT announce new regions 1 by one, just wait till they are all done */ - PropertyList plist; - + PropertyList plist; + plist.add (ARDOUR::Properties::start, file_start); plist.add (ARDOUR::Properties::length, len); plist.add (ARDOUR::Properties::name, new_name); plist.add (ARDOUR::Properties::layer, 0); boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); + pl->add_region (nr, r->position() + pos); - + if (select_new) { new_regions.push_front(nr); } @@ -5864,10 +5708,10 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList string new_name; RegionFactory::region_name (new_name, r->name()); - + /* Add the final region */ - PropertyList plist; - + PropertyList plist; + plist.add (ARDOUR::Properties::start, r->start() + pos); plist.add (ARDOUR::Properties::length, r->last_frame() - (r->position() + pos) + 1); plist.add (ARDOUR::Properties::name, new_name); @@ -5875,7 +5719,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); pl->add_region (nr, r->position() + pos); - + if (select_new) { new_regions.push_front(nr); } @@ -5883,7 +5727,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList pl->thaw (); _session->add_command (new StatefulDiffCommand (pl)); - + if (select_new) { for (list >::iterator i = new_regions.begin(); i != new_regions.end(); ++i){ @@ -5904,16 +5748,16 @@ Editor::place_transient() if (rs.empty()) { return; } - + framepos_t where = get_preferred_edit_position(); _session->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); } - + _session->commit_reversible_command (); } @@ -5924,36 +5768,57 @@ Editor::remove_transient(ArdourCanvas::Item* item) return; } - ArdourCanvas::SimpleLine* _line = reinterpret_cast (item); + ArdourCanvas::Line* _line = reinterpret_cast (item); assert (_line); AudioRegionView* _arv = reinterpret_cast (item->get_data ("regionview")); - _arv->remove_transient(_line->property_x1()); + _arv->remove_transient (*(float*) _line->get_data ("position")); } void Editor::snap_regions_to_grid () { + list > used_playlists; + RegionSelection rs = get_regions_from_selection_and_entered (); if (!_session || rs.empty()) { return; } - + _session->begin_reversible_command (_("snap regions to grid")); - + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { + + boost::shared_ptr pl = (*r)->region()->playlist(); + + if (!pl->frozen()) { + /* we haven't seen this playlist before */ + + /* remember used playlists so we can thaw them later */ + used_playlists.push_back(pl); + pl->freeze(); + } + framepos_t start_frame = (*r)->region()->first_frame (); snap_to (start_frame); - (*r)->region()->set_position (start_frame, this); + (*r)->region()->set_position (start_frame); } - + + while (used_playlists.size() > 0) { + list >::iterator i = used_playlists.begin(); + (*i)->thaw(); + used_playlists.pop_front(); + } + _session->commit_reversible_command (); } void Editor::close_region_gaps () -{ +{ + list > used_playlists; + RegionSelection rs = get_regions_from_selection_and_entered (); if (!_session || rs.empty()) { @@ -5968,7 +5833,7 @@ Editor::close_region_gaps () Label* l = manage (new Label (_("Crossfade length"))); l->set_alignment (0, 0.5); table.attach (*l, 0, 1, 0, 1); - + SpinButton spin_crossfade (1, 0); spin_crossfade.set_range (0, 15); spin_crossfade.set_increments (1, 1); @@ -5980,7 +5845,7 @@ Editor::close_region_gaps () l = manage (new Label (_("Pull-back length"))); l->set_alignment (0, 0.5); table.attach (*l, 0, 1, 1, 2); - + SpinButton spin_pullback (1, 0); spin_pullback.set_range (0, 100); spin_pullback.set_increments (1, 1); @@ -5988,7 +5853,7 @@ Editor::close_region_gaps () table.attach (spin_pullback, 1, 2, 1, 2); table.attach (*manage (new Label (_("ms"))), 2, 3, 1, 2); - + dialog.get_vbox()->pack_start (table); dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL); dialog.add_button (_("Ok"), RESPONSE_ACCEPT); @@ -5998,39 +5863,55 @@ Editor::close_region_gaps () return; } - framepos_t crossfade_len = spin_crossfade.get_value(); + framepos_t crossfade_len = spin_crossfade.get_value(); framepos_t pull_back_frames = spin_pullback.get_value(); crossfade_len = lrintf (crossfade_len * _session->frame_rate()/1000); pull_back_frames = lrintf (pull_back_frames * _session->frame_rate()/1000); /* Iterate over the region list and make adjacent regions overlap by crossfade_len_ms */ - + _session->begin_reversible_command (_("close region gaps")); - + int idx = 0; boost::shared_ptr last_region; - + rs.sort_by_position_and_track(); - + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { + boost::shared_ptr pl = (*r)->region()->playlist(); + + if (!pl->frozen()) { + /* we haven't seen this playlist before */ + + /* remember used playlists so we can thaw them later */ + used_playlists.push_back(pl); + pl->freeze(); + } + framepos_t position = (*r)->region()->position(); - + if (idx == 0 || position < last_region->position()){ last_region = (*r)->region(); idx++; continue; } - - (*r)->region()->trim_front( (position - pull_back_frames), this ); - last_region->trim_end( (position - pull_back_frames + crossfade_len), this ); - + + (*r)->region()->trim_front( (position - pull_back_frames)); + last_region->trim_end( (position - pull_back_frames + crossfade_len)); + last_region = (*r)->region(); - + idx++; } - + + while (used_playlists.size() > 0) { + list >::iterator i = used_playlists.begin(); + (*i)->thaw(); + used_playlists.pop_front(); + } + _session->commit_reversible_command (); } @@ -6140,7 +6021,7 @@ Editor::set_track_height (Height h) TrackSelection& ts (selection->tracks); for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { - (*x)->set_height (h); + (*x)->set_height_enum (h); } } @@ -6303,6 +6184,7 @@ Editor::do_insert_time () get_preferred_edit_position(), d.distance(), opt, + d.all_playlists(), d.move_glued(), d.move_markers(), d.move_glued_markers(), @@ -6312,8 +6194,10 @@ Editor::do_insert_time () } void -Editor::insert_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) +Editor::insert_time ( + framepos_t pos, framecnt_t frames, InsertTimeOption opt, + bool all_playlists, bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too + ) { bool commit = false; @@ -6324,25 +6208,37 @@ Editor::insert_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, begin_reversible_command (_("insert time")); for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { + /* regions */ - boost::shared_ptr pl = (*x)->playlist(); - if (pl) { + vector > pl; + if (all_playlists) { + RouteTimeAxisView* rtav = dynamic_cast (*x); + if (rtav) { + pl = _session->playlists->playlists_for_track (rtav->track ()); + } + } else { + if ((*x)->playlist ()) { + pl.push_back ((*x)->playlist ()); + } + } - pl->clear_changes (); - pl->clear_owned_changes (); + for (vector >::iterator i = pl.begin(); i != pl.end(); ++i) { + + (*i)->clear_changes (); + (*i)->clear_owned_changes (); if (opt == SplitIntersected) { - pl->split (pos); + (*i)->split (pos); } - pl->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); + (*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); vector cmds; - pl->rdiff (cmds); + (*i)->rdiff (cmds); _session->add_commands (cmds); - - _session->add_command (new StatefulDiffCommand (pl)); + + _session->add_command (new StatefulDiffCommand (*i)); commit = true; } @@ -6378,7 +6274,7 @@ Editor::insert_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, } moved = true; } - + } if (was_locked) { @@ -6404,7 +6300,31 @@ Editor::insert_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, void Editor::fit_selected_tracks () { - fit_tracks (selection->tracks); + if (!selection->tracks.empty()) { + fit_tracks (selection->tracks); + } else { + TrackViewList tvl; + + /* no selected tracks - use tracks with selected regions */ + + 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 @@ -6564,7 +6484,7 @@ Editor::toggle_region_mute () if (_ignore_region_action) { return; } - + RegionSelection rs = get_regions_from_selection_and_entered (); if (rs.empty ()) { @@ -6576,15 +6496,85 @@ Editor::toggle_region_mute () } else { begin_reversible_command (_("mute region")); } - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - + (*i)->region()->playlist()->clear_changes (); (*i)->region()->set_muted (!(*i)->region()->muted ()); _session->add_command (new StatefulDiffCommand ((*i)->region()->playlist())); - + + } + + commit_reversible_command (); +} + +void +Editor::combine_regions () +{ + /* foreach track with selected regions, take all selected regions + and join them into a new region containing the subregions (as a + playlist) + */ + + typedef set RTVS; + RTVS tracks; + + if (selection->regions.empty()) { + return; + } + + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); + + if (rtv) { + tracks.insert (rtv); + } + } + + begin_reversible_command (_("combine regions")); + + vector new_selection; + + for (RTVS::iterator i = tracks.begin(); i != tracks.end(); ++i) { + RegionView* rv; + + if ((rv = (*i)->combine_regions ()) != 0) { + new_selection.push_back (rv); + } } - + + selection->clear_regions (); + for (vector::iterator i = new_selection.begin(); i != new_selection.end(); ++i) { + selection->add (*i); + } + + commit_reversible_command (); +} + +void +Editor::uncombine_regions () +{ + typedef set RTVS; + RTVS tracks; + + if (selection->regions.empty()) { + return; + } + + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + RouteTimeAxisView* rtv = dynamic_cast(&(*i)->get_time_axis_view()); + + if (rtv) { + tracks.insert (rtv); + } + } + + begin_reversible_command (_("uncombine regions")); + + for (RTVS::iterator i = tracks.begin(); i != tracks.end(); ++i) { + (*i)->uncombine_regions (); + } + commit_reversible_command (); }