stupid hack to fix issues with OS X Carbon headers

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 17c261200f4a11850f6cb3af2edb82774faf821f..06a9d7795775b592561a7e673715be4533078bd5 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -57,7 +57,6 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g
        , _samples_per_unit (_trackview.editor().get_current_zoom ())
        , rec_updating(false)
        , rec_active(false)
-       , region_color(_trackview.color())
        , stream_base_color(0xFFFFFFFF)
        , _layers (1)
        , _layer_display (Overlaid)
@@ -101,7 +100,7 @@ StreamView::~StreamView ()
        if (owns_background_group) {
                delete _background_group;
        }
-       
+
        if (owns_canvas_group) {
                delete _canvas_group;
        }
@@ -302,13 +301,13 @@ StreamView::playlist_layered (boost::weak_ptr<Track> wtr)
                _layers = tr->playlist()->top_layer() + 1;
        }
 
-       if (_layer_display == Stacked) {
+       if (_layer_display == Stacked || _layer_display == Expanded) {
                update_contents_height ();
                update_coverage_frames ();
        } else {
                /* layering has probably been modified. reflect this in the canvas. */
                layer_regions();
-       } 
+       }
 }
 
 void
@@ -330,8 +329,6 @@ StreamView::playlist_switched (boost::weak_ptr<Track> wtr)
        update_contents_height ();
        update_coverage_frames ();
 
-       tr->playlist()->set_explicit_relayering (_layer_display == Stacked);
-
        /* draw it */
 
        redisplay_track ();
@@ -348,7 +345,7 @@ void
 StreamView::diskstream_changed ()
 {
        boost::shared_ptr<Track> t;
-        
+
        if ((t = _trackview.track()) != 0) {
                Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t));
        } else {
@@ -357,7 +354,7 @@ StreamView::diskstream_changed ()
 }
 
 void
-StreamView::apply_color (Gdk::Color& color, ColorTarget target)
+StreamView::apply_color (Gdk::Color color, ColorTarget target)
 {
        list<RegionView *>::iterator i;
 
@@ -523,8 +520,21 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
 
        if (_layer_display == Stacked) {
                double const c = child_height ();
-               min_layer = _layers - ((bottom - _trackview.y_position()) / c);
-               max_layer = _layers - ((top - _trackview.y_position()) / c);
+
+               int const mi = _layers - ((bottom - _trackview.y_position()) / c);
+               if (mi < 0) {
+                       min_layer = 0;
+               } else {
+                       min_layer = mi;
+               }
+
+               int const ma = _layers - ((top - _trackview.y_position()) / c);
+               if (ma > (int) _layers) {
+                       max_layer = _layers - 1;
+               } else {
+                       max_layer = ma;
+               }
+
        }
 
        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
@@ -556,10 +566,16 @@ StreamView::get_inverted_selectables (Selection& sel, list<Selectable*>& results
 double
 StreamView::child_height () const
 {
-       if (_layer_display == Stacked) {
+       switch (_layer_display) {
+       case Overlaid:
+               return height;
+       case Stacked:
                return height / _layers;
+       case Expanded:
+               return height / (_layers * 2 + 1);
        }
 
+       /* NOTREACHED */
        return height;
 }
 
@@ -576,6 +592,9 @@ StreamView::update_contents_height ()
                case Stacked:
                        (*i)->set_y (height - ((*i)->region()->layer() + 1) * h);
                        break;
+               case Expanded:
+                       (*i)->set_y (height - ((*i)->region()->layer() + 1) * 2 * h);
+                       break;
                }
 
                (*i)->set_height (h);
@@ -587,6 +606,7 @@ StreamView::update_contents_height ()
                        i->rectangle->property_y2() = height;
                        break;
                case Stacked:
+               case Expanded:
                        /* In stacked displays, the recregion is always at the top */
                        i->rectangle->property_y1() = 0;
                        i->rectangle->property_y2() = h;
@@ -599,9 +619,13 @@ void
 StreamView::set_layer_display (LayerDisplay d)
 {
        _layer_display = d;
+
+       if (_layer_display == Overlaid) {
+               layer_regions ();
+       }
+       
        update_contents_height ();
        update_coverage_frames ();
-       _trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked);
 }
 
 void
@@ -624,13 +648,13 @@ StreamView::check_record_layers (boost::shared_ptr<Region> region, framepos_t to
 
                /* Stop this happening again */
                _new_rec_layer_time = max_framepos;
-               
+
                /* Make space in the view for the new layer */
                ++_layers;
-               
+
                /* Set the temporary region to the correct layer so that it gets drawn correctly */
                region->set_layer (_layers - 1);
-               
+
                /* and reset the view */
                update_contents_height ();
        }