diff options
| author | Robin Gareus <robin@gareus.org> | 2016-11-30 09:21:28 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-11-30 09:21:28 +0100 |
| commit | aebd22cbe60818b5413e0cadef6b9bf8dc17ecac (patch) | |
| tree | 8710558667019a75337141e64a452f030ec5e85a /gtk2_ardour | |
| parent | ae1d4a93463448e94e946ff2c934cc5d1d5daabb (diff) | |
NO-OP backport changes from Mixbus branch.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_keys.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/region_view.cc | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index e1562dbe05..fba52014bc 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -74,7 +74,7 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign) if (_session) { framepos_t start; - framepos_t end = selection->time.end_frame(); //0 if no current selection + framepos_t end = selection->time.end_frame(); if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { start = _session->audible_frame(); @@ -86,8 +86,14 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign) snap_to(start); //if there's not already a sensible selection endpoint, go "forever" - if ( start > end ) { + if (start > end) { +#ifdef MIXBUS + // 4hours at most. + // This works around a visual glitch in red-bordered selection rect. + end = start + _session->nominal_frame_rate() * 60 * 60 * 4; +#else end = max_framepos; +#endif } //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection) diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 5a193e9370..cc9a5b61ce 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -25,6 +25,7 @@ #include <gtkmm2ext/gtk_ui.h> #include "ardour/playlist.h" +#include "ardour/profile.h" #include "ardour/session.h" #include "canvas/polygon.h" @@ -524,7 +525,7 @@ RegionView::get_fill_color () const ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color(); char const *modname; - if (_region->opaque()) { + if (_region->opaque() && (!ARDOUR::Profile->get_mixbus() || (!_dragging && !_region->muted ()))) { modname = "opaque region base"; } else { modname = "transparent region base"; |