X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=b3b6b0bb452305f22c06fa68d47e7e452659ab07;hb=3ddd797e46b232235deb8d79c34b40f35bb2153b;hp=a2f8048fec8931a09b8efd994326aa1d3c27981d;hpb=c1166c9f6333a6ee1eff7b04718eaddd61613847;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a2f8048fec..b3b6b0bb45 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -47,6 +47,7 @@ #include "ardour/midi_track.h" #include "ardour/operations.h" #include "ardour/playlist_factory.h" +#include "ardour/profile.h" #include "ardour/quantize.h" #include "ardour/region_factory.h" #include "ardour/reverse.h" @@ -76,6 +77,7 @@ #include "interthread_progress_window.h" #include "keyboard.h" #include "midi_region_view.h" +#include "mixer_strip.h" #include "mouse_cursors.h" #include "normalize_dialog.h" #include "patch_change_dialog.h" @@ -135,7 +137,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) RegionSelection pre_selected_regions = selection->regions; bool working_on_selection = !pre_selected_regions.empty(); - + list > used_playlists; list used_trackviews; @@ -235,14 +237,15 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) EditorThaw(); /* Emit Signal */ } - //IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw. - _ignore_follow_edits = true; //a split will change the region selection in mysterious ways; its not practical or wanted to follow this edit - if( working_on_selection ) { - selection->add ( pre_selected_regions ); - selection->add (latest_regionviews); //these are the new regions created after the split + if (ARDOUR::Profile->get_mixbus()) { + //IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw. + _ignore_follow_edits = true; //a split will change the region selection in mysterious ways; its not practical or wanted to follow this edit + if( working_on_selection ) { + selection->add ( pre_selected_regions ); + selection->add (latest_regionviews); //these are the new regions created after the split + } + _ignore_follow_edits = false; } - _ignore_follow_edits = false; - } /** Move one extreme of the current range selection. If more than one range is selected, @@ -1364,32 +1367,35 @@ Editor::scroll_tracks_up_line () bool Editor::scroll_down_one_track () { - TrackViewList::reverse_iterator next = track_views.rend(); + TrackViewList::reverse_iterator next = track_views.rbegin(); std::pair res; - const double bottom_of_trackviews = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - 1; + const double top_of_trackviews = vertical_adjustment.get_value(); for (TrackViewList::reverse_iterator t = track_views.rbegin(); t != track_views.rend(); ++t) { if ((*t)->hidden()) { continue; } - - /* If this is the bottom visible trackview, we want to display - the next one. + + next = t; + if (next != track_views.rbegin()) { + --next; // moves "next" towards the lower/later tracks since it is a reverse iterator + } + + /* If this is the upper-most visible trackview, we want to display + the one above it (next) */ - res = (*t)->covers_y_position (bottom_of_trackviews); + res = (*t)->covers_y_position (top_of_trackviews); if (res.first) { break; } - - ++next; // moves "next" towards the "front" since it is a reverse iterator } /* move to the track below the first one that covers the */ - if (next != track_views.rend()) { - ensure_time_axis_view_is_visible (**next); + if (next != track_views.rbegin()) { + ensure_time_axis_view_is_visible (**next, true); return true; } @@ -1399,11 +1405,10 @@ Editor::scroll_down_one_track () bool Editor::scroll_up_one_track () { - double vertical_pos = vertical_adjustment.get_value (); - 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) { if ((*t)->hidden()) { @@ -1411,10 +1416,9 @@ Editor::scroll_up_one_track () } /* find the trackview at the top of the trackview group */ - res = (*t)->covers_y_position (vertical_pos); + res = (*t)->covers_y_position (top_of_trackviews); if (res.first) { - cerr << res.first->name() << " covers the top\n"; break; } @@ -1422,7 +1426,7 @@ Editor::scroll_up_one_track () } if (prev != track_views.end()) { - ensure_time_axis_view_is_visible (**prev); + ensure_time_axis_view_is_visible (**prev, true); return true; } @@ -1627,6 +1631,37 @@ Editor::temporal_zoom (framecnt_t fpp) reposition_and_zoom (leftmost_after_zoom, nfpp); } +void +Editor::calc_extra_zoom_edges(framepos_t &start, framepos_t &end) +{ + /* this func helps make sure we leave a little space + at each end of the editor so that the zoom doesn't fit the region + precisely to the screen. + */ + + GdkScreen* screen = gdk_screen_get_default (); + const gint pixwidth = gdk_screen_get_width (screen); + const gint mmwidth = gdk_screen_get_width_mm (screen); + const double pix_per_mm = (double) pixwidth/ (double) mmwidth; + const double one_centimeter_in_pixels = pix_per_mm * 10.0; + + const framepos_t range = end - start; + const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width); + const framepos_t extra_samples = (framepos_t) floor (one_centimeter_in_pixels * new_fpp); + + if (start > extra_samples) { + start -= extra_samples; + } else { + start = 0; + } + + if (max_framepos - extra_samples > end) { + end += extra_samples; + } else { + end = max_framepos; + } +} + void Editor::temporal_zoom_region (bool both_axes) { @@ -1653,36 +1688,11 @@ Editor::temporal_zoom_region (bool both_axes) tracks.insert (&((*i)->get_time_axis_view())); } - /* now comes an "interesting" hack ... make sure we leave a little space - at each end of the editor so that the zoom doesn't fit the region - precisely to the screen. - */ - - GdkScreen* screen = gdk_screen_get_default (); - gint pixwidth = gdk_screen_get_width (screen); - gint mmwidth = gdk_screen_get_width_mm (screen); - double pix_per_mm = (double) pixwidth/ (double) mmwidth; - double one_centimeter_in_pixels = pix_per_mm * 10.0; - if ((start == 0 && end == 0) || end < start) { return; } - framepos_t range = end - start; - 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; - } else { - start = 0; - } - - if (max_framepos - extra_samples > end) { - end += extra_samples; - } else { - end = max_framepos; - } + calc_extra_zoom_edges (start, end); /* if we're zooming on both axes we need to save track heights etc. */ @@ -1725,18 +1735,28 @@ Editor::zoom_to_region (bool both_axes) } void -Editor::temporal_zoom_selection () +Editor::temporal_zoom_selection (bool both_axes) { if (!selection) return; - if (selection->time.empty()) { - return; + //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); + + if (both_axes) + fit_selected_tracks(); + + } else { + temporal_zoom_region (both_axes); } - framepos_t start = selection->time[clicked_selection].start; - framepos_t end = selection->time[clicked_selection].end; - temporal_zoom_by_frame (start, end); } void @@ -1745,13 +1765,28 @@ Editor::temporal_zoom_session () ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_session) if (_session) { - framecnt_t const l = _session->current_end_frame() - _session->current_start_frame(); - double s = _session->current_start_frame() - l * 0.01; - if (s < 0) { - s = 0; + framecnt_t start = _session->current_start_frame(); + framecnt_t end = _session->current_end_frame(); + + if (_session->actively_recording () ) { + framepos_t cur = playhead_cursor->current_frame (); + if (cur > end) { + /* recording beyond the end marker; zoom out + * by 5 seconds more so that if 'follow + * playhead' is active we don't immediately + * scroll. + */ + end = cur + _session->frame_rate() * 5; + } } - framecnt_t const e = _session->current_end_frame() + l * 0.01; - temporal_zoom_by_frame (framecnt_t (s), e); + + if ((start == 0 && end == 0) || end < start) { + return; + } + + calc_extra_zoom_edges(start, end); + + temporal_zoom_by_frame (start, end); } } @@ -1766,9 +1801,9 @@ Editor::temporal_zoom_by_frame (framepos_t start, framepos_t end) framepos_t range = end - start; - double const new_fpp = (double) range / (double) _visible_canvas_width; - - framepos_t new_page = (framepos_t) floor (_visible_canvas_width * new_fpp); + const framecnt_t new_fpp = (framecnt_t) ceil ((double) range / (double) _visible_canvas_width); + + framepos_t new_page = range; 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)); @@ -2085,15 +2120,7 @@ Editor::clear_ranges () _session->begin_reversible_command (_("clear ranges")); XMLNode &before = _session->locations()->get_state(); - 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)); @@ -2336,8 +2363,8 @@ Editor::loop_location (Location& location) tll->set (location.start(), location.end()); // enable looping, reposition and start rolling - _session->request_play_loop (true); _session->request_locate (tll->start(), true); + _session->request_play_loop (true); } } @@ -3710,7 +3737,14 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) void Editor::delete_ () { - cut_copy (Delete); + //special case: if the user is pointing in the editor/mixer strip, they may be trying to delete a plugin. + //we need this because the editor-mixer strip is in the editor window, so it doesn't get the bindings from the mix window + bool deleted = false; + if ( current_mixer_strip && current_mixer_strip == MixerStrip::entered_mixer_strip() ) + deleted = current_mixer_strip->delete_processors (); + + if (!deleted) + cut_copy (Delete); } /** Cut selected regions, automation points or a time range */ @@ -5260,6 +5294,22 @@ Editor::toggle_solo_isolate () { } + +void +Editor::fade_range () +{ + TrackViewList ts = selection->tracks.filter_to_unique_playlists (); + + begin_reversible_command (_("fade range")); + + for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { + (*i)->fade_range (selection->time); + } + + commit_reversible_command (); +} + + void Editor::set_fade_length (bool in) { @@ -5621,7 +5671,7 @@ Editor::select_next_route() selection->set(current); - ensure_time_axis_view_is_visible (*current); + ensure_time_axis_view_is_visible (*current, false); } void @@ -5652,7 +5702,7 @@ Editor::select_prev_route() selection->set (current); - ensure_time_axis_view_is_visible (*current); + ensure_time_axis_view_is_visible (*current, false); } void @@ -5668,8 +5718,8 @@ Editor::set_loop_from_selection (bool play) set_loop_range (start, end, _("set loop range from selection")); if (play) { - _session->request_play_loop (true); _session->request_locate (start, true); + _session->request_play_loop (true); } } @@ -5690,8 +5740,8 @@ Editor::set_loop_from_edit_range (bool play) set_loop_range (start, end, _("set loop range from edit range")); if (play) { - _session->request_play_loop (true); _session->request_locate (start, true); + _session->request_play_loop (true); } } @@ -5719,8 +5769,8 @@ Editor::set_loop_from_region (bool play) set_loop_range (start, end, _("set loop range from region")); if (play) { - _session->request_play_loop (true); _session->request_locate (start, true); + _session->request_play_loop (true); } } @@ -6516,6 +6566,7 @@ edit your ardour.rc file to set the\n\ return; } + // XXX should be using gettext plural forms, maybe? if (ntracks > 1) { trackstr = _("tracks"); } else { @@ -6542,7 +6593,7 @@ edit your ardour.rc file to set the\n\ } } else if (nbusses) { prompt = string_compose (_("Do you really want to remove %1 %2?\n\n" - "This action cannot be undon, and the session file will be overwritten"), + "This action cannot be undone, and the session file will be overwritten"), nbusses, busstr); } @@ -6568,6 +6619,7 @@ edit your ardour.rc file to set the\n\ { Session::StateProtector sp (_session); + DisplaySuspender ds; for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { _session->remove_route (*x); } @@ -6750,6 +6802,7 @@ Editor::fit_selected_tracks () } } } + } void @@ -6778,7 +6831,7 @@ Editor::fit_tracks (TrackViewList & tracks) height that will be taken by visible children of selected tracks - height of the ruler/hscroll area */ - uint32_t h = (uint32_t) floor ((_visible_canvas_height - (child_heights + _trackview_group->canvas_origin().y)) / visible_tracks); + uint32_t h = (uint32_t) floor ((trackviews_height() - child_heights) / visible_tracks); double first_y_pos = DBL_MAX; if (h < TimeAxisView::preset_height (HeightSmall)) { @@ -6801,9 +6854,9 @@ Editor::fit_tracks (TrackViewList & tracks) } } - /* operate on all tracks, hide unselected ones that are in the middle of selected ones */ - - bool within_selected = false; + 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) { @@ -6811,16 +6864,26 @@ Editor::fit_tracks (TrackViewList & tracks) next = t; ++next; - + + if (next != all.end()) { + next_is_selected = tracks.contains (*next); + } else { + next_is_selected = false; + } + if ((*t)->marked_for_display ()) { - if (tracks.contains (*t)) { + if (is_selected) { (*t)->set_height (h); first_y_pos = std::min ((*t)->y_position (), first_y_pos); - within_selected = true; - } else if (within_selected) { - hide_track_in_display (*t); + } else { + if (prev_was_selected && next_is_selected) { + hide_track_in_display (*t); + } } } + + prev_was_selected = is_selected; + is_selected = next_is_selected; } /* @@ -6832,6 +6895,8 @@ Editor::fit_tracks (TrackViewList & tracks) vertical_adjustment.set_value (first_y_pos); redo_visual_stack.push_back (current_visual_state (true)); + + visible_tracks_selector.set_text (_("Sel")); } void @@ -7016,7 +7081,7 @@ Editor::lock () ArdourButton* b = manage (new ArdourButton); b->set_name ("lock button"); - b->set_markup (string_compose ("%1", _("Click to unlock"))); + b->set_text (_("Click to unlock")); b->signal_clicked.connect (sigc::mem_fun (*this, &Editor::unlock)); lock_dialog->get_vbox()->pack_start (*b);