X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=2d26a90a86ce5362886b06cff6c1a450dc38860a;hb=c912bd61ae49cc79158f3322439c29b27ef51de8;hp=a99da327db93b90b050bff2a9649283e437d1d5c;hpb=a79589249259c8cbef7f1b30fe167d80c9a67412;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a99da327db..2d26a90a86 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -76,7 +76,7 @@ #include "editor_regions.h" #include "editor_routes.h" #include "gui_thread.h" -#include "insert_time_dialog.h" +#include "insert_remove_time_dialog.h" #include "interthread_progress_window.h" #include "item_counts.h" #include "keyboard.h" @@ -122,6 +122,9 @@ Editor::undo (uint32_t n) if (_session) { _session->undo (n); + if (_session->undo_depth() == 0) { + undo_action->set_sensitive(false); + } redo_action->set_sensitive(true); begin_selection_op_history (); } @@ -136,10 +139,10 @@ Editor::redo (uint32_t n) if (_session) { _session->redo (n); - cerr << "redo depth is : " << _session->redo_depth() << endl; if (_session->redo_depth() == 0) { redo_action->set_sensitive(false); } + undo_action->set_sensitive(true); begin_selection_op_history (); } } @@ -1408,10 +1411,9 @@ Editor::scroll_tracks_up_line () } bool -Editor::scroll_down_one_track () +Editor::scroll_down_one_track (bool skip_child_views) { TrackViewList::reverse_iterator next = track_views.rend(); - std::pair res; const double top_of_trackviews = vertical_adjustment.get_value(); for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) { @@ -1419,14 +1421,51 @@ Editor::scroll_down_one_track () continue; } - /* If this is the upper-most visible trackview, we want to display - the one above it (next) - */ - - res = (*t)->covers_y_position (top_of_trackviews); + * the one above it (next) + * + * Note that covers_y_position() is recursive and includes child views + */ + std::pair res = (*t)->covers_y_position (top_of_trackviews); if (res.first) { + if (skip_child_views) { + break; + } + /* automation lane (one level, non-recursive) + * + * - if no automation lane exists -> move to next tack + * - if the first (here: bottom-most) matches -> move to next tack + * - if no y-axis match is found -> the current track is at the top + * -> move to last (here: top-most) automation lane + */ + TimeAxisView::Children kids = (*t)->get_child_list(); + TimeAxisView::Children::reverse_iterator nkid = kids.rend(); + + for (TimeAxisView::Children::reverse_iterator ci = kids.rbegin(); ci != kids.rend(); ++ci) { + if ((*ci)->hidden()) { + continue; + } + + std::pair dev; + dev = (*ci)->covers_y_position (top_of_trackviews); + if (dev.first) { + /* some automation lane is currently at the top */ + if (ci == kids.rbegin()) { + /* first (bottom-most) autmation lane is at the top. + * -> move to next track + */ + nkid = kids.rend(); + } + break; + } + nkid = ci; + } + + if (nkid != kids.rend()) { + ensure_time_axis_view_is_visible (**nkid, true); + return true; + } break; } next = t; @@ -1443,10 +1482,9 @@ Editor::scroll_down_one_track () } bool -Editor::scroll_up_one_track () +Editor::scroll_up_one_track (bool skip_child_views) { TrackViewList::iterator prev = track_views.end(); - std::pair res; double top_of_trackviews = vertical_adjustment.get_value (); for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { @@ -1455,10 +1493,55 @@ Editor::scroll_up_one_track () continue; } - /* find the trackview at the top of the trackview group */ - res = (*t)->covers_y_position (top_of_trackviews); + /* find the trackview at the top of the trackview group + * + * Note that covers_y_position() is recursive and includes child views + */ + std::pair res = (*t)->covers_y_position (top_of_trackviews); if (res.first) { + if (skip_child_views) { + break; + } + /* automation lane (one level, non-recursive) + * + * - if no automation lane exists -> move to prev tack + * - if no y-axis match is found -> the current track is at the top -> move to prev track + * (actually last automation lane of previous track, see below) + * - if first (top-most) lane is at the top -> move to this track + * - else move up one lane + */ + TimeAxisView::Children kids = (*t)->get_child_list(); + TimeAxisView::Children::iterator pkid = kids.end(); + + for (TimeAxisView::Children::iterator ci = kids.begin(); ci != kids.end(); ++ci) { + if ((*ci)->hidden()) { + continue; + } + + std::pair dev; + dev = (*ci)->covers_y_position (top_of_trackviews); + if (dev.first) { + /* some automation lane is currently at the top */ + if (ci == kids.begin()) { + /* first (top-most) autmation lane is at the top. + * jump directly to this track's top + */ + ensure_time_axis_view_is_visible (**t, true); + return true; + } + else if (pkid != kids.end()) { + /* some other automation lane is at the top. + * move up to prev automation lane. + */ + ensure_time_axis_view_is_visible (**pkid, true); + return true; + } + assert(0); // not reached + break; + } + pkid = ci; + } break; } @@ -1466,7 +1549,23 @@ Editor::scroll_up_one_track () } if (prev != track_views.end()) { - ensure_time_axis_view_is_visible (**prev, true); + // move to bottom-most automation-lane of the previous track + TimeAxisView::Children kids = (*prev)->get_child_list(); + TimeAxisView::Children::reverse_iterator pkid = kids.rend(); + if (!skip_child_views) { + // find the last visible lane + for (TimeAxisView::Children::reverse_iterator ci = kids.rbegin(); ci != kids.rend(); ++ci) { + if (!(*ci)->hidden()) { + pkid = ci; + break; + } + } + } + if (pkid != kids.rend()) { + ensure_time_axis_view_is_visible (**pkid, true); + } else { + ensure_time_axis_view_is_visible (**prev, true); + } return true; } @@ -1709,29 +1808,9 @@ Editor::temporal_zoom_region (bool both_axes) framepos_t end = 0; set tracks; - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + if ( !get_selection_extents(start, end) ) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - - tracks.insert (&((*i)->get_time_axis_view())); - } - - if ((start == 0 && end == 0) || end < start) { - return; - } - + calc_extra_zoom_edges (start, end); /* if we're zooming on both axes we need to save track heights etc. @@ -1769,6 +1848,46 @@ Editor::temporal_zoom_region (bool both_axes) } +bool +Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) +{ + start = max_framepos; + end = 0; + bool ret = true; + + //ToDo: if notes are selected, set extents to that selection + + //ToDo: if control points are selected, set extents to that selection + + if ( !selection->regions.empty() ) { + RegionSelection rs = get_regions_from_selection_and_entered (); + + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + + if ((*i)->region()->position() < start) { + start = (*i)->region()->position(); + } + + if ((*i)->region()->last_frame() + 1 > end) { + end = (*i)->region()->last_frame() + 1; + } + } + + } else if (!selection->time.empty()) { + start = selection->time.start(); + end = selection->time.end_frame(); + } else + ret = false; //no selection found + + //range check + if ((start == 0 && end == 0) || end < start) { + ret = false; + } + + return ret; +} + + void Editor::temporal_zoom_selection (bool both_axes) { @@ -1785,16 +1904,14 @@ Editor::temporal_zoom_selection (bool both_axes) //if a range is selected, zoom to that if (!selection->time.empty()) { - framepos_t start = selection->time.start(); - framepos_t end = selection->time.end_frame(); - - calc_extra_zoom_edges(start, end); - - temporal_zoom_by_frame (start, end); - + framepos_t start, end; + if (get_selection_extents (start, end)) { + calc_extra_zoom_edges(start, end); + temporal_zoom_by_frame (start, end); + } + if (both_axes) - fit_selected_tracks(); - + fit_selection(); } } @@ -1997,6 +2114,54 @@ Editor::add_location_mark (framepos_t where) commit_reversible_command (); } +void +Editor::set_session_start_from_playhead () +{ + if (!_session) + return; + + Location* loc; + if ((loc = _session->locations()->session_range_location()) == 0) { //should never happen + _session->set_session_extents ( _session->audible_frame(), _session->audible_frame() ); + } else { + XMLNode &before = loc->get_state(); + + _session->set_session_extents ( _session->audible_frame(), loc->end() ); + + XMLNode &after = loc->get_state(); + + begin_reversible_command (_("Set session start")); + + _session->add_command (new MementoCommand(*loc, &before, &after)); + + commit_reversible_command (); + } +} + +void +Editor::set_session_end_from_playhead () +{ + if (!_session) + return; + + Location* loc; + if ((loc = _session->locations()->session_range_location()) == 0) { //should never happen + _session->set_session_extents ( _session->audible_frame(), _session->audible_frame() ); + } else { + XMLNode &before = loc->get_state(); + + _session->set_session_extents ( loc->start(), _session->audible_frame() ); + + XMLNode &after = loc->get_state(); + + begin_reversible_command (_("Set session start")); + + _session->add_command (new MementoCommand(*loc, &before, &after)); + + commit_reversible_command (); + } +} + void Editor::add_location_from_playhead_cursor () { @@ -2318,7 +2483,7 @@ Editor::play_from_edit_point_and_return () framepos_t start_frame; framepos_t return_frame; - start_frame = get_preferred_edit_position (true); + start_frame = get_preferred_edit_position ( EDIT_IGNORE_PHEAD ); if (_session->transport_rolling()) { _session->request_locate (start_frame, false); @@ -2339,11 +2504,15 @@ Editor::play_from_edit_point_and_return () void Editor::play_selection () { - if (selection->time.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - _session->request_play_range (&selection->time, true); + AudioRange ar (start, end, 0); + list lar; + lar.push_back (ar); + + _session->request_play_range (&lar, true); } framepos_t @@ -2376,16 +2545,17 @@ Editor::maybe_locate_with_edit_preroll ( framepos_t location ) void Editor::play_with_preroll () { - if (selection->time.empty()) { - return; - } else { + { framepos_t preroll = get_preroll(); - framepos_t start = 0; - if (selection->time[clicked_selection].start > preroll) - start = selection->time[clicked_selection].start - preroll; + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; + + if (start > preroll) + start = start - preroll; - framepos_t end = selection->time[clicked_selection].end + preroll; + end = end + preroll; //"post-roll" AudioRange ar (start, end, 0); list lar; @@ -3965,7 +4135,7 @@ struct AutomationRecord { * @param op Operation (Cut, Copy or Clear) */ void -Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::MusicalTime earliest, bool midi) +Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool midi) { if (selection->points.empty ()) { return; @@ -4007,7 +4177,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::MusicalTime earliest, bo lists[al].copy->fast_simple_add ((*j)->when, (*j)->value); if (midi) { /* Update earliest MIDI start time in beats */ - earliest = std::min(earliest, Evoral::MusicalTime((*j)->when)); + earliest = std::min(earliest, Evoral::Beats((*j)->when)); } else { /* Update earliest session start time in frames */ start = std::min(start, (*i)->line().session_position(j)); @@ -4016,8 +4186,8 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::MusicalTime earliest, bo /* Snap start time backwards, so copy/paste is snap aligned. */ if (midi) { - if (earliest == Evoral::MusicalTime::max()) { - earliest = Evoral::MusicalTime(); // Weird... don't offset + if (earliest == Evoral::Beats::max()) { + earliest = Evoral::Beats(); // Weird... don't offset } earliest.round_down_to_beat(); } else { @@ -4070,7 +4240,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::MusicalTime earliest, bo void Editor::cut_copy_midi (CutCopyOp op) { - Evoral::MusicalTime earliest = Evoral::MusicalTime::max(); + Evoral::Beats earliest = Evoral::Beats::max(); for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) { MidiRegionView* mrv = dynamic_cast(*i); if (mrv) { @@ -4411,7 +4581,7 @@ Editor::paste (float times, bool from_context) { DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); - paste_internal (get_preferred_edit_position (false, from_context), times); + paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times); } void @@ -4916,14 +5086,14 @@ Editor::strip_region_silence () Command* Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv) { - Evoral::Sequence::Notes selected; + Evoral::Sequence::Notes selected; mrv.selection_as_notelist (selected, true); - vector::Notes> v; + vector::Notes> v; v.push_back (selected); - framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start(); - Evoral::MusicalTime pos_beats = _session->tempo_map().framewalk_to_beats(0, pos_frames); + framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start(); + Evoral::Beats pos_beats = _session->tempo_map().framewalk_to_beats(0, pos_frames); return op (mrv.midi_region()->model(), pos_beats, v); } @@ -5012,16 +5182,22 @@ Editor::quantize_regions (const RegionSelection& rs) return; } - QuantizeDialog* qd = new QuantizeDialog (*this); + if (!quantize_dialog) { + quantize_dialog = new QuantizeDialog (*this); + } - qd->present (); - const int r = qd->run (); - qd->hide (); + quantize_dialog->present (); + const int r = quantize_dialog->run (); + quantize_dialog->hide (); if (r == Gtk::RESPONSE_OK) { - Quantize quant (qd->snap_start(), qd->snap_end(), - qd->start_grid_size(), qd->end_grid_size(), - qd->strength(), qd->swing(), qd->threshold()); + Quantize quant (quantize_dialog->snap_start(), + quantize_dialog->snap_end(), + quantize_dialog->start_grid_size(), + quantize_dialog->end_grid_size(), + quantize_dialog->strength(), + quantize_dialog->swing(), + quantize_dialog->threshold()); apply_midi_note_edit_op (quant, rs); } @@ -5082,7 +5258,7 @@ Editor::insert_patch_change (bool from_context) return; } - const framepos_t p = get_preferred_edit_position (false, from_context); + const framepos_t p = get_preferred_edit_position (EDIT_IGNORE_NONE, from_context); /* XXX: bit of a hack; use the MIDNAM from the first selected region; there may be more than one, but the PatchChangeDialog can only offer @@ -5090,7 +5266,7 @@ Editor::insert_patch_change (bool from_context) */ MidiRegionView* first = dynamic_cast (rs.front ()); - Evoral::PatchChange empty (Evoral::MusicalTime(), 0, 0, 0); + Evoral::PatchChange empty (Evoral::Beats(), 0, 0, 0); PatchChangeDialog d (0, _session, empty, first->instrument_info(), Gtk::Stock::ADD); if (d.run() == RESPONSE_CANCEL) { @@ -5768,20 +5944,25 @@ Editor::set_playhead_cursor () void Editor::split_region () { + //if a range is selected, separate it if ( !selection->time.empty()) { separate_regions_between (selection->time); return; } - RegionSelection rs = get_regions_from_selection_and_edit_point (); + //if no range was selected, try to find some regions to split + if (current_mouse_mode() == MouseObject) { //don't try this for Internal Edit, Stretch, Draw, etc. + + RegionSelection rs = get_regions_from_selection_and_edit_point (); - framepos_t where = get_preferred_edit_position (); + framepos_t where = get_preferred_edit_position (); - if (rs.empty()) { - return; - } + if (rs.empty()) { + return; + } - split_regions_at (where, rs); + split_regions_at (where, rs); + } } struct EditorOrderRouteSorter { @@ -5855,64 +6036,28 @@ Editor::select_prev_route() void Editor::set_loop_from_selection (bool play) -{ - if (_session == 0 || selection->time.empty()) { - return; - } - - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; - - set_loop_range (start, end, _("set loop range from selection")); - - if (play) { - _session->request_locate (start, true); - _session->request_play_loop (true); - } -} - -void -Editor::set_loop_from_edit_range (bool play) { if (_session == 0) { return; } - framepos_t start; - framepos_t end; - - if (!get_edit_op_range (start, end)) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - set_loop_range (start, end, _("set loop range from edit range")); + set_loop_range (start, end, _("set loop range from selection")); if (play) { - _session->request_locate (start, true); - _session->request_play_loop (true); + _session->request_play_loop (true, true); } } void Editor::set_loop_from_region (bool play) { - framepos_t start = max_framepos; - framepos_t end = 0; - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - } set_loop_range (start, end, _("set loop range from region")); @@ -5925,12 +6070,13 @@ Editor::set_loop_from_region (bool play) void Editor::set_punch_from_selection () { - if (_session == 0 || selection->time.empty()) { + if (_session == 0) { return; } - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; set_punch_range (start, end, _("set punch range from selection")); } @@ -5938,14 +6084,13 @@ Editor::set_punch_from_selection () void Editor::set_session_extents_from_selection () { - if (_session == 0 || selection->time.empty()) { + if (_session == 0) { return; } - - begin_reversible_command (_("set session start/stop from selection")); - - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; + + framepos_t start, end; + if (!get_selection_extents ( start, end)) + return; Location* loc; if ((loc = _session->locations()->session_range_location()) == 0) { @@ -5957,49 +6102,20 @@ Editor::set_session_extents_from_selection () XMLNode &after = loc->get_state(); + begin_reversible_command (_("set session start/end from selection")); + _session->add_command (new MementoCommand(*loc, &before, &after)); commit_reversible_command (); } } -void -Editor::set_punch_from_edit_range () -{ - if (_session == 0) { - return; - } - - framepos_t start; - framepos_t end; - - if (!get_edit_op_range (start, end)) { - return; - } - - set_punch_range (start, end, _("set punch range from edit range")); -} - void Editor::set_punch_from_region () { - framepos_t start = max_framepos; - framepos_t end = 0; - - RegionSelection rs = get_regions_from_selection_and_entered (); - - if (rs.empty()) { + framepos_t start, end; + if (!get_selection_extents ( start, end)) return; - } - - for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - if ((*i)->region()->position() < start) { - start = (*i)->region()->position(); - } - if ((*i)->region()->last_frame() + 1 > end) { - end = (*i)->region()->last_frame() + 1; - } - } set_punch_range (start, end, _("set punch range from region")); } @@ -6687,6 +6803,23 @@ Editor::toggle_tracks_active () void Editor::remove_tracks () +{ + /* this will delete GUI objects that may be the subject of an event + handler in which this method is called. Defer actual deletion to the + next idle callback, when all event handling is finished. + */ + Glib::signal_idle().connect (sigc::mem_fun (*this, &Editor::idle_remove_tracks)); +} + +bool +Editor::idle_remove_tracks () +{ + _remove_tracks (); + return false; /* do not call again */ +} + +void +Editor::_remove_tracks () { TrackSelection& ts (selection->tracks); @@ -6742,19 +6875,9 @@ edit your ardour.rc file to set the\n\ return; } - // XXX should be using gettext plural forms, maybe? - if (ntracks > 1) { - trackstr = _("tracks"); - } else { - trackstr = _("track"); - } - - if (nbusses > 1) { - busstr = _("busses"); - } else { - busstr = _("bus"); - } - + trackstr = P_("track", "tracks", ntracks); + busstr = P_("bus", "busses", nbusses); + if (ntracks) { if (nbusses) { prompt = string_compose (_("Do you really want to remove %1 %2 and %3 %4?\n" @@ -6809,7 +6932,7 @@ Editor::do_insert_time () return; } - InsertTimeDialog d (*this); + InsertRemoveTimeDialog d (*this); int response = d.run (); if (response != RESPONSE_OK) { @@ -6913,25 +7036,24 @@ Editor::insert_time ( Locations::LocationList::const_iterator tmp; - bool const was_locked = (*i)->locked (); - if (locked_markers_too) { - (*i)->unlock (); - } - if ((*i)->position_lock_style() == AudioTime || glued_markers_too) { + bool const was_locked = (*i)->locked (); + if (locked_markers_too) { + (*i)->unlock (); + } if ((*i)->start() >= pos) { - (*i)->set_start ((*i)->start() + frames); + // move end first, in case we're moving by more than the length of the range if (!(*i)->is_mark()) { (*i)->set_end ((*i)->end() + frames); } + (*i)->set_start ((*i)->start() + frames); moved = true; } - } - - if (was_locked) { - (*i)->lock (); + if (was_locked) { + (*i)->lock (); + } } } @@ -6951,7 +7073,168 @@ Editor::insert_time ( } void -Editor::fit_selected_tracks () +Editor::do_remove_time () +{ + if (selection->tracks.empty()) { + return; + } + + framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE); + InsertRemoveTimeDialog d (*this, true); + + int response = d.run (); + + if (response != RESPONSE_OK) { + return; + } + + framecnt_t distance = d.distance(); + + if (distance == 0) { + return; + } + + remove_time ( + pos, + distance, + SplitIntersected, + d.move_glued(), + d.move_markers(), + d.move_glued_markers(), + d.move_locked_markers(), + d.move_tempos() + ); +} + +void +Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, + bool ignore_music_glue, bool markers_too, bool glued_markers_too, bool locked_markers_too, bool tempo_too) +{ + bool commit = false; + + if (Config->get_edit_mode() == Lock) { + error << (_("Cannot insert or delete time when in Lock edit.")) << endmsg; + return; + } + + begin_reversible_command (_("cut time")); + + for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { + /* regions */ + boost::shared_ptr pl = (*x)->playlist(); + + if (pl) { + + XMLNode &before = pl->get_state(); + + std::list rl; + AudioRange ar(pos, pos+frames, 0); + rl.push_back(ar); + pl->cut (rl); + pl->shift (pos, -frames, true, ignore_music_glue); + + XMLNode &after = pl->get_state(); + + _session->add_command (new MementoCommand (*pl, &before, &after)); + commit = true; + } + + /* automation */ + RouteTimeAxisView* rtav = dynamic_cast (*x); + if (rtav) { + rtav->route ()->shift (pos, -frames); + commit = true; + } + } + + std::list loc_kill_list; + + /* markers */ + if (markers_too) { + bool moved = false; + XMLNode& before (_session->locations()->get_state()); + Locations::LocationList copy (_session->locations()->list()); + + for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) { + if ((*i)->position_lock_style() == AudioTime || glued_markers_too) { + + bool const was_locked = (*i)->locked (); + if (locked_markers_too) { + (*i)->unlock (); + } + + if (!(*i)->is_mark()) { // it's a range; have to handle both start and end + if ((*i)->end() >= pos + && (*i)->end() < pos+frames + && (*i)->start() >= pos + && (*i)->end() < pos+frames) { // range is completely enclosed; kill it + moved = true; + loc_kill_list.push_back(*i); + } else { // only start or end is included, try to do the right thing + // move start before moving end, to avoid trying to move the end to before the start + // if we're removing more time than the length of the range + if ((*i)->start() >= pos && (*i)->start() < pos+frames) { + // start is within cut + (*i)->set_start (pos); // bring the start marker to the beginning of the cut + moved = true; + } else if ((*i)->start() >= pos+frames) { + // start (and thus entire range) lies beyond end of cut + (*i)->set_start ((*i)->start() - frames); // slip the start marker back + moved = true; + } + if ((*i)->end() >= pos && (*i)->end() < pos+frames) { + // end is inside cut + (*i)->set_end (pos); // bring the end to the cut + moved = true; + } else if ((*i)->end() >= pos+frames) { + // end is beyond end of cut + (*i)->set_end ((*i)->end() - frames); // slip the end marker back + moved = true; + } + + } + } else if ((*i)->start() >= pos && (*i)->start() < pos+frames ) { + loc_kill_list.push_back(*i); + moved = true; + } else if ((*i)->start() >= pos) { + (*i)->set_start ((*i)->start() -frames); + moved = true; + } + + if (was_locked) { + (*i)->lock (); + } + } + } + + for (list::iterator i = loc_kill_list.begin(); i != loc_kill_list.end(); ++i) { + _session->locations()->remove( *i ); + } + + if (moved) { + XMLNode& after (_session->locations()->get_state()); + _session->add_command (new MementoCommand(*_session->locations(), &before, &after)); + commit = true; + } + } + + if (tempo_too) { + XMLNode& before (_session->tempo_map().get_state()); + + if (_session->tempo_map().remove_time (pos, frames) ) { + XMLNode& after (_session->tempo_map().get_state()); + _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); + commit = true; + } + } + + if (commit) { + commit_reversible_command (); + } +} + +void +Editor::fit_selection () { if (!selection->tracks.empty()) { fit_tracks (selection->tracks); @@ -7017,7 +7300,7 @@ Editor::fit_tracks (TrackViewList & tracks) } undo_visual_stack.push_back (current_visual_state (true)); - no_save_visual = true; + PBD::Unwinder nsv (no_save_visual, true); /* build a list of all tracks, including children */ @@ -7030,36 +7313,36 @@ Editor::fit_tracks (TrackViewList & tracks) } } - bool prev_was_selected = false; - bool is_selected = tracks.contains (all.front()); - bool next_is_selected; - - for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t) { - TrackViewList::iterator next; - - next = t; - ++next; - - if (next != all.end()) { - next_is_selected = tracks.contains (*next); - } else { - next_is_selected = false; + // find selection range. + // if someone knows how to user TrackViewList::iterator for this + // I'm all ears. + int selected_top = -1; + int selected_bottom = -1; + int i = 0; + for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) { + if ((*t)->marked_for_display ()) { + if (tracks.contains(*t)) { + if (selected_top == -1) { + selected_top = i; + } + selected_bottom = i; + } } + } + i = 0; + for (TrackViewList::iterator t = all.begin(); t != all.end(); ++t, ++i) { if ((*t)->marked_for_display ()) { - if (is_selected) { + if (tracks.contains(*t)) { (*t)->set_height (h); first_y_pos = std::min ((*t)->y_position (), first_y_pos); } else { - if (prev_was_selected && next_is_selected) { + if (i > selected_top && i < selected_bottom) { hide_track_in_display (*t); } } } - - prev_was_selected = is_selected; - is_selected = next_is_selected; } /* @@ -7264,15 +7547,10 @@ Editor::lock () lock_dialog->get_vbox()->show_all (); lock_dialog->set_size_request (200, 200); } + + delete _main_menu_disabler; + _main_menu_disabler = new MainMenuDisabler; -#ifdef __APPLE__ - /* The global menu bar continues to be accessible to applications - with modal dialogs, which means that we need to desensitize - all items in the menu bar. Since those items are really just - proxies for actions, that means disabling all actions. - */ - ActionManager::disable_all_actions (); -#endif lock_dialog->present (); } @@ -7281,9 +7559,7 @@ Editor::unlock () { lock_dialog->hide (); -#ifdef __APPLE__ - ActionManager::pop_action_state (); -#endif + delete _main_menu_disabler; if (ARDOUR_UI::config()->get_lock_gui_after_seconds()) { start_lock_event_timing ();