X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_ops.cc;h=08d6297faae3162c388f7a76b9cf411307d224b1;hb=152935e736eaf06f85bc7f5cb27337a62d95edd4;hp=2c2141881779c3efb577a9721a7e324de7c5da7a;hpb=2ba2a50decb4b2f8b6b688dea495a2898124cc4f;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 2c21418817..08d6297faa 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -55,38 +55,41 @@ #include "ardour/strip_silence.h" #include "ardour/transient_detector.h" +#include "canvas/canvas.h" + #include "ardour_ui.h" -#include "debug.h" -#include "editor.h" -#include "time_axis_view.h" -#include "route_time_axis.h" +#include "audio_region_view.h" +#include "audio_streamview.h" #include "audio_time_axis.h" #include "automation_time_axis.h" #include "control_point.h" -#include "streamview.h" -#include "audio_streamview.h" -#include "audio_region_view.h" -#include "midi_region_view.h" -#include "rgb_macros.h" -#include "selection_templates.h" -#include "selection.h" +#include "debug.h" #include "editing.h" -#include "gtk-custom-hruler.h" -#include "gui_thread.h" -#include "keyboard.h" -#include "utils.h" +#include "editor.h" +#include "editor_cursors.h" #include "editor_drag.h" -#include "strip_silence_dialog.h" -#include "editor_routes.h" #include "editor_regions.h" -#include "quantize_dialog.h" -#include "interthread_progress_window.h" +#include "editor_routes.h" +#include "gtk-custom-hruler.h" +#include "gui_thread.h" #include "insert_time_dialog.h" -#include "normalize_dialog.h" -#include "editor_cursors.h" +#include "interthread_progress_window.h" +#include "keyboard.h" +#include "midi_region_view.h" #include "mouse_cursors.h" +#include "normalize_dialog.h" #include "patch_change_dialog.h" +#include "quantize_dialog.h" +#include "region_gain_line.h" +#include "rgb_macros.h" +#include "route_time_axis.h" +#include "selection.h" +#include "selection_templates.h" +#include "streamview.h" +#include "strip_silence_dialog.h" +#include "time_axis_view.h" #include "transpose_dialog.h" +#include "utils.h" #include "i18n.h" @@ -357,8 +360,8 @@ Editor::nudge_forward (bool next, bool force_playhead) commit_reversible_command (); } else { - distance = get_nudge_distance (playhead_cursor->current_frame, next_distance); - _session->request_locate (playhead_cursor->current_frame + distance); + distance = get_nudge_distance (playhead_cursor->current_frame (), next_distance); + _session->request_locate (playhead_cursor->current_frame () + distance); } } @@ -446,10 +449,10 @@ Editor::nudge_backward (bool next, bool force_playhead) } else { - distance = get_nudge_distance (playhead_cursor->current_frame, next_distance); + distance = get_nudge_distance (playhead_cursor->current_frame (), next_distance); - if (playhead_cursor->current_frame > distance) { - _session->request_locate (playhead_cursor->current_frame - distance); + if (playhead_cursor->current_frame () > distance) { + _session->request_locate (playhead_cursor->current_frame () - distance); } else { _session->goto_start(); } @@ -509,6 +512,60 @@ Editor::nudge_backward_capture_offset () commit_reversible_command (); } +struct RegionSelectionPositionSorter { + bool operator() (RegionView* a, RegionView* b) { + return a->region()->position() < b->region()->position(); + } +}; + +void +Editor::sequence_regions () +{ + framepos_t r_end; + framepos_t r_end_prev; + + int iCount=0; + + if (!_session) { + return; + } + + RegionSelection rs = get_regions_from_selection_and_entered (); + rs.sort(RegionSelectionPositionSorter()); + + if (!rs.empty()) { + + begin_reversible_command (_("sequence regions")); + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + boost::shared_ptr r ((*i)->region()); + + r->clear_changes(); + + if(r->locked()) + { + continue; + } + if(r->position_locked()) + { + continue; + } + if(iCount>0) + { + r_end_prev=r_end; + r->set_position(r_end_prev); + } + + _session->add_command (new StatefulDiffCommand (r)); + + r_end=r->position() + r->length(); + + iCount++; + } + commit_reversible_command (); + } +} + + /* DISPLAY MOTION */ void @@ -772,7 +829,7 @@ Editor::get_region_boundary (framepos_t pos, int32_t dir, bool with_selection, b void Editor::cursor_to_region_boundary (bool with_selection, int32_t dir) { - framepos_t pos = playhead_cursor->current_frame; + framepos_t pos = playhead_cursor->current_frame (); framepos_t target; if (!_session) { @@ -807,7 +864,7 @@ void Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t dir) { boost::shared_ptr r; - framepos_t pos = cursor->current_frame; + framepos_t pos = cursor->current_frame (); if (!_session) { return; @@ -1143,8 +1200,8 @@ Editor::selected_marker_to_selection_end () void Editor::scroll_playhead (bool forward) { - framepos_t pos = playhead_cursor->current_frame; - framecnt_t delta = (framecnt_t) floor (current_page_frames() / 0.8); + framepos_t pos = playhead_cursor->current_frame (); + framecnt_t delta = (framecnt_t) floor (current_page_samples() / 0.8); if (forward) { if (pos == max_framepos) { @@ -1197,10 +1254,10 @@ Editor::cursor_align (bool playhead_to_edit) Location* loc = find_location_from_marker (*i, ignored); if (loc->is_mark()) { - loc->set_start (playhead_cursor->current_frame); + loc->set_start (playhead_cursor->current_frame ()); } else { - loc->set (playhead_cursor->current_frame, - playhead_cursor->current_frame + loc->length()); + loc->set (playhead_cursor->current_frame (), + playhead_cursor->current_frame () + loc->length()); } } } @@ -1209,7 +1266,7 @@ Editor::cursor_align (bool playhead_to_edit) void Editor::scroll_backward (float pages) { - framepos_t const one_page = (framepos_t) rint (_canvas_width * frames_per_unit); + framepos_t const one_page = (framepos_t) rint (_visible_canvas_width * samples_per_pixel); framepos_t const cnt = (framepos_t) floor (pages * one_page); framepos_t frame; @@ -1225,7 +1282,7 @@ Editor::scroll_backward (float pages) void Editor::scroll_forward (float pages) { - framepos_t const one_page = (framepos_t) rint (_canvas_width * frames_per_unit); + framepos_t const one_page = (framepos_t) rint (_visible_canvas_width * samples_per_pixel); framepos_t const cnt = (framepos_t) floor (pages * one_page); framepos_t frame; @@ -1242,8 +1299,8 @@ void Editor::scroll_tracks_down () { 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; + if (vert_value > vertical_adjustment.get_upper() - _visible_canvas_height) { + vert_value = vertical_adjustment.get_upper() - _visible_canvas_height; } vertical_adjustment.set_value (vert_value); @@ -1260,8 +1317,8 @@ Editor::scroll_tracks_down_line () { double vert_value = vertical_adjustment.get_value() + 60; - if (vert_value > vertical_adjustment.get_upper() - _canvas_height) { - vert_value = vertical_adjustment.get_upper() - _canvas_height; + if (vert_value > vertical_adjustment.get_upper() - _visible_canvas_height) { + vert_value = vertical_adjustment.get_upper() - _visible_canvas_height; } vertical_adjustment.set_value (vert_value); @@ -1273,6 +1330,69 @@ Editor::scroll_tracks_up_line () reset_y_origin (vertical_adjustment.get_value() - 60); } +bool +Editor::scroll_down_one_track () +{ + double vertical_pos = vertical_adjustment.get_value () + vertical_adjustment.get_page_size() - 1.0; + + TrackViewList::reverse_iterator next = track_views.rend(); + std::pair res; + + for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) { + if ((*t)->hidden()) { + continue; + } + + res = (*t)->covers_y_position (vertical_pos); + + if (res.first) { + break; + } + + next = t; + } + + /* move to the track below the first one that covers the */ + + if (next != track_views.rend()) { + ensure_track_visible (*next); + return true; + } + + return false; +} + +bool +Editor::scroll_up_one_track () +{ + double vertical_pos = vertical_adjustment.get_value (); + + TrackViewList::iterator prev = track_views.end(); + std::pair res; + + for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { + + if ((*t)->hidden()) { + continue; + } + + res = (*t)->covers_y_position(vertical_pos); + + if (res.first) { + break; + } + + prev = t; + } + + if (prev != track_views.end()) { + ensure_track_visible (*prev); + return true; + } + + return false; +} + /* ZOOM */ void @@ -1329,17 +1449,17 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all) } bool -Editor::clamp_frames_per_unit (double& fpu) const +Editor::clamp_samples_per_pixel (framecnt_t& fpp) const { bool clamped = false; - if (fpu < 2.0) { - fpu = 2.0; + if (fpp < 1) { + fpp = 1; clamped = true; } - if (max_framepos / fpu < 800) { - fpu = max_framepos / 800.0; + if (max_framepos / fpp < 800) { + fpp = max_framepos / 800; clamped = true; } @@ -1351,25 +1471,25 @@ Editor::temporal_zoom_step (bool coarser) { ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser) - double nfpu = frames_per_unit; + framecnt_t nspp = samples_per_pixel; if (coarser) { - nfpu = min (9e6, nfpu * 1.61803399); + nspp *= 2; } else { - nfpu = max (1.0, nfpu / 1.61803399); + nspp /= 2; } - temporal_zoom (nfpu); + temporal_zoom (nspp); } void -Editor::temporal_zoom (double fpu) +Editor::temporal_zoom (framecnt_t fpp) { if (!_session) { return; } - framepos_t current_page = current_page_frames(); + framepos_t current_page = current_page_samples(); framepos_t current_leftmost = leftmost_frame; framepos_t current_rightmost; framepos_t current_center; @@ -1378,24 +1498,26 @@ Editor::temporal_zoom (double fpu) framepos_t leftmost_after_zoom = 0; framepos_t where; bool in_track_canvas; - double nfpu; + framecnt_t nfpp; double l; - clamp_frames_per_unit (fpu); - if (fpu == frames_per_unit) { + clamp_samples_per_pixel (fpp); + if (fpp == samples_per_pixel) { return; } - nfpu = fpu; - // Imposing an arbitrary limit to zoom out as too much zoom out produces // segfaults for lack of memory. If somebody decides this is not high enough I // believe it can be raisen to higher values but some limit must be in place. - if (nfpu > 8e+08) { - nfpu = 8e+08; - } + // + // This constant represents 1 day @ 48kHz on a 1600 pixel wide display + // all of which is used for the editor track displays. The whole day + // would be 4147200000 samples, so 2592000 samples per pixel. + + nfpp = min (fpp, (framecnt_t) 2592000); + nfpp = max ((framecnt_t) 1, fpp); - new_page_size = (framepos_t) floor (_canvas_width * nfpu); + new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp); half_page_size = new_page_size / 2; switch (zoom_focus) { @@ -1423,7 +1545,7 @@ Editor::temporal_zoom (double fpu) case ZoomFocusPlayhead: /* centre playhead */ - l = playhead_cursor->current_frame - (new_page_size * 0.5); + l = playhead_cursor->current_frame () - (new_page_size * 0.5); if (l < 0) { leftmost_after_zoom = 0; @@ -1439,7 +1561,7 @@ Editor::temporal_zoom (double fpu) if (!mouse_frame (where, in_track_canvas)) { /* use playhead instead */ - where = playhead_cursor->current_frame; + where = playhead_cursor->current_frame (); if (where < half_page_size) { leftmost_after_zoom = 0; @@ -1488,7 +1610,7 @@ Editor::temporal_zoom (double fpu) // leftmost_after_zoom = min (leftmost_after_zoom, _session->current_end_frame()); - reposition_and_zoom (leftmost_after_zoom, nfpu); + reposition_and_zoom (leftmost_after_zoom, nfpp); } void @@ -1533,8 +1655,8 @@ Editor::temporal_zoom_region (bool both_axes) } framepos_t range = end - start; - double new_fpu = (double)range / (double)_canvas_width; - framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpu); + double new_fpp = (double) range / (double) _visible_canvas_width; + framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp); if (start > extra_samples) { start -= extra_samples; @@ -1558,7 +1680,7 @@ Editor::temporal_zoom_region (bool both_axes) temporal_zoom_by_frame (start, end); if (both_axes) { - uint32_t per_track_height = (uint32_t) floor ((_canvas_height - canvas_timebars_vsize - 10.0) / tracks.size()); + uint32_t per_track_height = (uint32_t) floor ((_visible_canvas_height - 10.0) / tracks.size()); /* set visible track heights appropriately */ @@ -1632,11 +1754,11 @@ Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end) framepos_t range = end - start; - double new_fpu = (double)range / (double)_canvas_width; + double const new_fpp = (double) range / (double) _visible_canvas_width; - framepos_t new_page = (framepos_t) floor (_canvas_width * new_fpu); - framepos_t middle = (framepos_t) floor( (double)start + ((double)range / 2.0f )); - framepos_t new_leftmost = (framepos_t) floor( (double)middle - ((double)new_page/2.0f)); + framepos_t new_page = (framepos_t) floor (_visible_canvas_width * new_fpp); + framepos_t middle = (framepos_t) floor ((double) start + ((double) range / 2.0f)); + framepos_t new_leftmost = (framepos_t) floor ((double) middle - ((double) new_page / 2.0f)); if (new_leftmost > middle) { new_leftmost = 0; @@ -1646,7 +1768,7 @@ Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end) new_leftmost = 0; } - reposition_and_zoom (new_leftmost, new_fpu); + reposition_and_zoom (new_leftmost, new_fpp); } void @@ -1656,19 +1778,19 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame) return; } double range_before = frame - leftmost_frame; - double new_fpu; + double new_fpp; - new_fpu = frames_per_unit; + new_fpp = samples_per_pixel; if (coarser) { - new_fpu *= 1.61803399; + new_fpp *= 1.61803399; range_before *= 1.61803399; } else { - new_fpu = max(1.0,(new_fpu/1.61803399)); + new_fpp = max(1.0,(new_fpp/1.61803399)); range_before /= 1.61803399; } - if (new_fpu == frames_per_unit) { + if (new_fpp == samples_per_pixel) { return; } @@ -1682,7 +1804,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame) new_leftmost = 0; } - reposition_and_zoom (new_leftmost, new_fpu); + reposition_and_zoom (new_leftmost, new_fpp); } @@ -1847,7 +1969,7 @@ Editor::jump_forward_to_mark () return; } - framepos_t pos = _session->locations()->first_mark_after (playhead_cursor->current_frame); + framepos_t pos = _session->locations()->first_mark_after (playhead_cursor->current_frame()); if (pos < 0) { return; @@ -1863,7 +1985,7 @@ Editor::jump_backward_to_mark () return; } - framepos_t pos = _session->locations()->first_mark_before (playhead_cursor->current_frame); + framepos_t pos = _session->locations()->first_mark_before (playhead_cursor->current_frame()); if (pos < 0) { return; @@ -1962,22 +2084,19 @@ Editor::unhide_ranges () void Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) { - double wx, wy; double cx, cy; framepos_t where; RouteTimeAxisView *rtv = 0; boost::shared_ptr playlist; - track_canvas->window_to_world (x, y, wx, wy); - GdkEvent event; event.type = GDK_BUTTON_RELEASE; - event.button.x = wx; - event.button.y = wy; + event.button.x = x; + event.button.y = y; - where = event_frame (&event, &cx, &cy); + where = window_event_sample (&event, &cx, &cy); - if (where < leftmost_frame || where > leftmost_frame + current_page_frames()) { + if (where < leftmost_frame || where > leftmost_frame + current_page_samples()) { /* clearly outside canvas area */ return; } @@ -2007,21 +2126,16 @@ Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) void Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) { - double wx, wy; double cx, cy; RouteTimeAxisView *dest_rtv = 0; RouteTimeAxisView *source_rtv = 0; - track_canvas->window_to_world (x, y, wx, wy); - wx += horizontal_position (); - wy += vertical_adjustment.get_value(); - GdkEvent event; event.type = GDK_BUTTON_RELEASE; - event.button.x = wx; - event.button.y = wy; + event.button.x = x; + event.button.y = y; - event_frame (&event, &cx, &cy); + window_event_sample (&event, &cx, &cy); std::pair const tv = trackview_by_y_position (cy); if (tv.first == 0) { @@ -3723,110 +3837,96 @@ Editor::cut_copy (CutCopyOp op) switch (effective_mouse_mode()) { case MouseObject: case MouseRange: + begin_reversible_command (opname + ' ' + X_("MIDI")); cut_copy_midi (op); + commit_reversible_command (); break; default: break; } - } else { + return; + } - RegionSelection rs; + bool did_edit = false; - /* we only want to cut regions if some are selected */ + switch (effective_mouse_mode()) { + case MouseGain: + if (!selection->points.empty()) { + begin_reversible_command (opname + _(" points")); + did_edit = true; + cut_copy_points (op); + if (op == Cut || op == Delete) { + selection->clear_points (); + } + } + break; + + case MouseObject: - if (!selection->regions.empty()) { - rs = selection->regions; - } + if (!selection->regions.empty() || !selection->points.empty()) { - switch (effective_mouse_mode()) { -/* - * case MouseGain: { - //find regions's gain line - AudioRegionView *rview = dynamic_cast(clicked_regionview); - AutomationTimeAxisView *tview = dynamic_cast(clicked_trackview); - if (rview) { - AudioRegionGainLine *line = rview->get_gain_line(); - if (!line) break; - - //cut region gain points in the selection - AutomationList& alist (line->the_list()); - XMLNode &before = alist.get_state(); - AutomationList* what_we_got = 0; - if ((what_we_got = alist.cut (selection->time.front().start - rview->audio_region()->position(), selection->time.front().end - rview->audio_region()->position())) != 0) { - session->add_command(new MementoCommand(alist, &before, &alist.get_state())); - delete what_we_got; - what_we_got = 0; - } - - rview->set_envelope_visible(true); - rview->audio_region()->set_envelope_active(true); - - } else if (tview) { - AutomationLine *line = *(tview->lines.begin()); - if (!line) break; - - //cut auto points in the selection - AutomationList& alist (line->the_list()); - XMLNode &before = alist.get_state(); - AutomationList* what_we_got = 0; - if ((what_we_got = alist.cut (selection->time.front().start, selection->time.front().end)) != 0) { - session->add_command(new MementoCommand(alist, &before, &alist.get_state())); - delete what_we_got; - what_we_got = 0; - } - } else - break; - } break; -*/ - case MouseObject: - case MouseRange: - if (!rs.empty() || !selection->points.empty()) { - begin_reversible_command (opname + _(" objects")); - - if (!rs.empty()) { - cut_copy_regions (op, rs); - - if (op == Cut || op == Delete) { - selection->clear_regions (); - } - } + string thing_name; - if (!selection->points.empty()) { - cut_copy_points (op); + if (selection->regions.empty()) { + thing_name = _("points"); + } else if (selection->points.empty()) { + thing_name = _("regions"); + } else { + thing_name = _("objects"); + } + + begin_reversible_command (opname + ' ' + thing_name); + did_edit = true; - if (op == Cut || op == Delete) { - selection->clear_points (); - } + if (!selection->regions.empty()) { + cut_copy_regions (op, selection->regions); + + if (op == Cut || op == Delete) { + selection->clear_regions (); } - - commit_reversible_command (); - break; - } + } - if (selection->time.empty()) { - framepos_t start, end; - if (!get_edit_op_range (start, end)) { - return; + if (!selection->points.empty()) { + cut_copy_points (op); + + if (op == Cut || op == Delete) { + selection->clear_points (); } + } + } + break; + + case MouseRange: + if (selection->time.empty()) { + framepos_t start, end; + /* no time selection, see if we can get an edit range + and use that. + */ + if (get_edit_op_range (start, end)) { selection->set (start, end); } - + } + if (!selection->time.empty()) { begin_reversible_command (opname + _(" range")); + + did_edit = true; cut_copy_ranges (op); - commit_reversible_command (); if (op == Cut || op == Delete) { selection->clear_time (); } - - break; - - default: - break; } + break; + + default: + break; } - + + if (did_edit) { + commit_reversible_command (); + } + if (op == Delete || op == Cut || op == Clear) { _drags->abort (); } @@ -4424,14 +4524,14 @@ Editor::reset_point_selection () void Editor::center_playhead () { - float page = _canvas_width * frames_per_unit; - center_screen_internal (playhead_cursor->current_frame, page); + float const page = _visible_canvas_width * samples_per_pixel; + center_screen_internal (playhead_cursor->current_frame (), page); } void Editor::center_edit_point () { - float page = _canvas_width * frames_per_unit; + float const page = _visible_canvas_width * samples_per_pixel; center_screen_internal (get_preferred_edit_position(), page); } @@ -4772,12 +4872,17 @@ Editor::fork_region () MidiRegionView* const mrv = dynamic_cast(*r); 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)); + try { + boost::shared_ptr playlist = mrv->region()->playlist(); + boost::shared_ptr new_source = _session->create_midi_source_by_stealing_name (mrv->midi_view()->track()); + boost::shared_ptr newregion = mrv->midi_region()->clone (new_source); + + playlist->clear_changes (); + playlist->replace_region (mrv->region(), newregion, mrv->region()->position()); + _session->add_command(new StatefulDiffCommand (playlist)); + } catch (...) { + error << string_compose (_("Could not unlink %1"), mrv->region()->name()) << endmsg; + } } r = tmp; @@ -5602,7 +5707,7 @@ Editor::ensure_track_visible(TimeAxisView *track) return; double const current_view_min_y = vertical_adjustment.get_value(); - double const current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - canvas_timebars_vsize; + double const current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size(); double const track_min_y = track->y_position (); double const track_max_y = track->y_position () + track->effective_height (); @@ -5619,7 +5724,7 @@ Editor::ensure_track_visible(TimeAxisView *track) new_value = track_min_y; } else { // Track is below the current view - new_value = track->y_position () + track->effective_height() + canvas_timebars_vsize - vertical_adjustment.get_page_size(); + new_value = track->y_position () + track->effective_height() - vertical_adjustment.get_page_size(); } vertical_adjustment.set_value(new_value); @@ -6367,8 +6472,11 @@ Editor::tab_to_transient (bool forward) void Editor::playhead_forward_to_grid () { - if (!_session) return; - framepos_t pos = playhead_cursor->current_frame; + if (!_session) { + return; + } + + framepos_t pos = playhead_cursor->current_frame (); if (pos < max_framepos - 1) { pos += 2; snap_to_internal (pos, 1, false); @@ -6380,8 +6488,11 @@ Editor::playhead_forward_to_grid () void Editor::playhead_backward_to_grid () { - if (!_session) return; - framepos_t pos = playhead_cursor->current_frame; + if (!_session) { + return; + } + + framepos_t pos = playhead_cursor->current_frame (); if (pos > 2) { pos -= 2; snap_to_internal (pos, -1, false); @@ -6443,12 +6554,13 @@ Editor::remove_tracks () for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { RouteTimeAxisView* rtv = dynamic_cast (*x); - if (rtv) { - if (rtv->is_track()) { - ntracks++; - } else { - nbusses++; - } + if (!rtv) { + continue; + } + if (rtv->is_track()) { + ntracks++; + } else { + nbusses++; } routes.push_back (rtv->_route); @@ -6732,7 +6844,7 @@ Editor::fit_tracks (TrackViewList & tracks) ++visible_tracks; } - uint32_t h = (uint32_t) floor ((_canvas_height - child_heights - canvas_timebars_vsize) / visible_tracks); + uint32_t h = (uint32_t) floor ((_visible_canvas_height - child_heights) / visible_tracks); double first_y_pos = DBL_MAX; if (h < TimeAxisView::preset_height (HeightSmall)) { @@ -6794,7 +6906,7 @@ Editor::fit_tracks (TrackViewList & tracks) request signal handler will cause the vertical adjustment setting to fail */ - controls_layout.property_height () = full_canvas_height - canvas_timebars_vsize; + controls_layout.property_height () = _full_canvas_height; vertical_adjustment.set_value (first_y_pos); redo_visual_stack.push_back (current_visual_state (true));