X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=d79f1df47b7410d770d2a54b0f759933b5a0e96f;hb=7b155267505af3fedffc7972b08cb784c97b7e74;hp=e29bcb130c79cce7b69878c69712187e4d4ddc86;hpb=da46b1da244c759c848102f4f7fcaa11b4235940;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index e29bcb130c..d79f1df47b 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -55,8 +55,10 @@ #include "ardour/quantize.h" #include "ardour/strip_silence.h" #include "ardour/route_group.h" +#include "ardour/operations.h" #include "ardour_ui.h" +#include "debug.h" #include "editor.h" #include "time_axis_view.h" #include "route_time_axis.h" @@ -84,6 +86,7 @@ #include "normalize_dialog.h" #include "editor_cursors.h" #include "mouse_cursors.h" +#include "patch_change_dialog.h" #include "i18n.h" @@ -118,6 +121,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()) { @@ -140,6 +145,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(); ) { @@ -189,6 +197,10 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) } commit_reversible_command (); + + if (frozen){ + EditorThaw(); /* Emit Signal */ + } } boost::shared_ptr @@ -861,7 +873,7 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t return; } - switch (point){ + switch (point) { case Start: pos = r->first_frame (); break; @@ -1052,7 +1064,7 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) return; } - switch (point){ + switch (point) { case Start: pos = r->first_frame (); break; @@ -1195,68 +1207,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) { @@ -1290,98 +1240,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 { @@ -1394,22 +1259,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 { @@ -1422,38 +1275,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 @@ -1814,10 +1647,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); } @@ -1975,59 +1808,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 @@ -2065,25 +1845,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); - } - } - - _session->locations()->next_available_name(markername,"mark"); - if (!choose_new_marker_name(markername)) { + string markername; + _session->locations()->next_available_name (markername, "mark"); + + if (!choose_new_marker_name (markername)) { return; } + _session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark), true); } @@ -2861,7 +2631,9 @@ Editor::separate_under_selected_regions () { vector playlists; - RegionSelection rs = get_regions_from_selection_and_entered (); + RegionSelection rs; + + rs = get_regions_from_selection_and_entered(); if (!_session || rs.empty()) { return; @@ -3031,7 +2803,7 @@ Editor::region_fill_track () framepos_t const end = _session->current_end_frame (); - begin_reversible_command (_("region fill")); + begin_reversible_command (Operations::region_fill); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { @@ -3085,7 +2857,7 @@ Editor::region_fill_selection () framepos_t selection_length = end - start; float times = (float)selection_length / region->length(); - begin_reversible_command (_("fill selection")); + begin_reversible_command (Operations::fill_selection); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { @@ -3484,11 +3256,11 @@ Editor::trim_to_region(bool forward) region->clear_changes (); - if(forward){ + if (forward) { next_region = playlist->find_next_region (region->first_frame(), Start, 1); - if(!next_region){ + if (!next_region) { continue; } @@ -3547,6 +3319,19 @@ Editor::freeze_route () return; } + if (!clicked_routeview->track()->bounceable()) { + RouteTimeAxisView* rtv = dynamic_cast (clicked_routeview); + if (rtv && !rtv->track()->bounceable()) { + MessageDialog d ( + _("This route cannot be frozen because it has more outputs than inputs. " + "You can fix this by increasing the number of inputs.") + ); + d.set_title (_("Cannot freeze")); + d.run (); + return; + } + } + InterThreadInfo itt; current_interthread_info = &itt; @@ -3573,6 +3358,19 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) TrackSelection views = selection->tracks; + for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) { + RouteTimeAxisView* rtv = dynamic_cast (*i); + if (rtv && !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.") + ); + d.set_title (_("Cannot bounce")); + d.run (); + return; + } + } + framepos_t start = selection->time[clicked_selection].start; framepos_t end = selection->time[clicked_selection].end; framepos_t cnt = end - start + 1; @@ -4092,6 +3890,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); } @@ -4112,7 +3911,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()) { @@ -4126,10 +3925,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 (_("paste")); - TrackViewList ts; TrackViewList::iterator i; size_t nth; @@ -4147,18 +3945,18 @@ Editor::paste_internal (framepos_t position, float times) 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; MidiNoteSelection::iterator cb; - + get_regions_at (rs, position, ts); - + for (cb = cut_buffer->midi_notes.begin(), r = rs.begin(); cb != cut_buffer->midi_notes.end() && r != rs.end(); ++r) { MidiRegionView* mrv = dynamic_cast (*r); @@ -4167,16 +3965,18 @@ Editor::paste_internal (framepos_t position, float times) ++cb; } } + } + + } else { - } else { + /* we do redo (do you do voodoo?) */ - if ((*i)->paste (position, times, *cut_buffer, nth)) { - commit = true; - } + 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 (); } } @@ -4191,7 +3991,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) framepos_t const start_frame = regions.start (); framepos_t const end_frame = regions.end_frame (); - begin_reversible_command (_("duplicate region")); + begin_reversible_command (Operations::duplicate_region); selection->clear_regions (); @@ -4491,28 +4291,16 @@ Editor::adjust_region_gain (bool up) } arv->region()->clear_changes (); - - double fraction = gain_to_slider_position (arv->audio_region()->scale_amplitude ()); + + double dB = accurate_coefficient_to_dB (arv->audio_region()->scale_amplitude ()); if (up) { - fraction += 0.05; - fraction = min (fraction, 1.0); + dB += 1; } else { - fraction -= 0.05; - fraction = max (fraction, 0.0); - } - - if (!up && fraction <= 0) { - continue; - } - - fraction = slider_position_to_gain (fraction); - - if (up && fraction >= 2.0) { - continue; + dB -= 1; } - arv->audio_region()->set_scale_amplitude (fraction); + arv->audio_region()->set_scale_amplitude (dB_to_coefficient (dB)); _session->add_command (new StatefulDiffCommand (arv->region())); } @@ -4544,22 +4332,26 @@ Editor::strip_region_silence () return; } - std::list > ar; + std::list audio_only; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast (*i); if (arv) { - ar.push_back (arv->audio_region ()); + audio_only.push_back (arv); } } - StripSilenceDialog d (_session, ar); + StripSilenceDialog d (_session, audio_only); int const r = d.run (); - if (r == Gtk::RESPONSE_OK) { - StripSilence s (*_session, d.threshold (), d.minimum_length (), d.fade_length ()); + 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* @@ -4686,6 +4478,33 @@ Editor::quantize_region () } } +void +Editor::insert_patch_change () +{ + RegionSelection rs = get_regions_from_selection_and_entered (); + if (rs.empty ()) { + return; + } + + framepos_t const p = get_preferred_edit_position (false); + + Evoral::PatchChange empty (0, 0, 0, 0); + PatchChangeDialog d (0, _session, empty, Gtk::Stock::ADD); + + if (d.run() == RESPONSE_CANCEL) { + return; + } + + for (RegionSelection::iterator i = rs.begin (); i != rs.end(); ++i) { + MidiRegionView* const mrv = dynamic_cast (*i); + if (mrv) { + if (p >= mrv->region()->first_frame() && p <= mrv->region()->last_frame()) { + mrv->add_patch_change (p - mrv->region()->position(), d.patch ()); + } + } + } +} + void Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress) { @@ -4766,22 +4585,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 () { @@ -5692,11 +5495,13 @@ Editor::split_region_at_transients () } void -Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList& positions, bool can_ferret) +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) { return; @@ -5707,7 +5512,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList } - if (positions.size() > 20) { + if (positions.size() > 20 && can_ferret) { std::string msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1); MessageDialog msg (msgstr, false, @@ -5761,7 +5566,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList while (x != positions.end()) { /* deal with positons that are out of scope of present region bounds */ - if (*x <= 0 || *x > r->length()){ + if (*x <= 0 || *x > r->length()) { ++x; continue; } @@ -5800,8 +5605,13 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList 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); + } + pos += len; ++x; } @@ -5820,11 +5630,21 @@ 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); + } + pl->thaw (); _session->add_command (new StatefulDiffCommand (pl)); + + if (select_new) { + + for (list >::iterator i = new_regions.begin(); i != new_regions.end(); ++i){ + set_selected_regionview_from_region_list ((*i), Selection::Add); + } + } } void @@ -5859,16 +5679,18 @@ 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()) { @@ -5878,17 +5700,36 @@ Editor::snap_regions_to_grid () _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); } + 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()) { @@ -5907,7 +5748,7 @@ Editor::close_region_gaps () SpinButton spin_crossfade (1, 0); spin_crossfade.set_range (0, 15); spin_crossfade.set_increments (1, 1); - spin_crossfade.set_value (3); + spin_crossfade.set_value (5); table.attach (spin_crossfade, 1, 2, 0, 1); table.attach (*manage (new Label (_("ms"))), 2, 3, 0, 1); @@ -5917,9 +5758,9 @@ Editor::close_region_gaps () table.attach (*l, 0, 1, 1, 2); SpinButton spin_pullback (1, 0); - spin_pullback.set_range (0, 15); + spin_pullback.set_range (0, 100); spin_pullback.set_increments (1, 1); - spin_pullback.set_value (5); + spin_pullback.set_value(30); table.attach (spin_pullback, 1, 2, 1, 2); table.attach (*manage (new Label (_("ms"))), 2, 3, 1, 2); @@ -5942,13 +5783,23 @@ Editor::close_region_gaps () /* 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(); @@ -5966,6 +5817,12 @@ Editor::close_region_gaps () idx++; } + while (used_playlists.size() > 0) { + list >::iterator i = used_playlists.begin(); + (*i)->thaw(); + used_playlists.pop_front(); + } + _session->commit_reversible_command (); } @@ -6075,7 +5932,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); } } @@ -6098,7 +5955,7 @@ Editor::toggle_tracks_active () target = !rtv->_route->active(); first = false; } - rtv->_route->set_active (target); + rtv->_route->set_active (target, this); } } } @@ -6154,9 +6011,9 @@ edit your ardour.rc file to set the\n\ msg.run (); return; } - + if (ntracks + nbusses == 0) { - return; + return; } if (ntracks > 1) { @@ -6339,7 +6196,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 @@ -6350,6 +6231,7 @@ Editor::fit_tracks (TrackViewList & tracks) } uint32_t child_heights = 0; + int visible_tracks = 0; for (TrackSelection::iterator t = tracks.begin(); t != tracks.end(); ++t) { @@ -6358,9 +6240,10 @@ Editor::fit_tracks (TrackViewList & tracks) } child_heights += (*t)->effective_height() - (*t)->current_height(); + ++visible_tracks; } - uint32_t h = (uint32_t) floor ((_canvas_height - child_heights - canvas_timebars_vsize) / tracks.size()); + uint32_t h = (uint32_t) floor ((_canvas_height - child_heights - canvas_timebars_vsize) / visible_tracks); double first_y_pos = DBL_MAX; if (h < TimeAxisView::preset_height (HeightSmall)) { @@ -6401,12 +6284,14 @@ Editor::fit_tracks (TrackViewList & tracks) next_is_selected = false; } - if (is_selected) { - (*t)->set_height (h); - first_y_pos = std::min ((*t)->y_position (), first_y_pos); - } else { - if (prev_was_selected && next_is_selected) { - hide_track_in_display (*t); + if ((*t)->marked_for_display ()) { + if (is_selected) { + (*t)->set_height (h); + first_y_pos = std::min ((*t)->y_position (), first_y_pos); + } else { + if (prev_was_selected && next_is_selected) { + hide_track_in_display (*t); + } } }