NO-OP backport changes from Mixbus branch.

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index e1562dbe053ae78031185d82f478453c0604fd33..fba52014bce43fe844ea9643c278f34c8e5bd90e 100644 (file)
--- 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 5a193e9370054f76214b102bbaa9e6cd9e149145..cc9a5b61ceea54751722269e08333d82232db1a5 100644 (file)
--- 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";