region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 633e60e252fc8c2a2fc98570cd6b0f9a00ab40f9..8730c55f58fd16dec9ece4063d7c760d8f2c890d 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -47,8 +47,8 @@ using namespace Editing;
 
 StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        : _trackview (tv)
+       , owns_canvas_group(group == 0)
        , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display))
-       , canvas_rect(new ArdourCanvas::SimpleRect (*canvas_group))
        , _samples_per_unit(_trackview.editor.get_current_zoom())
        , rec_updating(false)
        , rec_active(false)
@@ -65,9 +65,14 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
        canvas_rect->property_x1() = 0.0;
        canvas_rect->property_y1() = 0.0;
-       canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames);
-       canvas_rect->property_y2() = (double) tv.height;
+       canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames - 1);
+       canvas_rect->property_y2() = (double) tv.current_height();
+       canvas_rect->raise(1); // raise above tempo lines
+
+       // DR-way
        canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom 
+       // 2.0 way
+       //canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
        // (Fill/Outline colours set in derived classes)
 
        canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
@@ -86,7 +91,12 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
 StreamView::~StreamView ()
 {
        undisplay_diskstream ();
-       delete canvas_group;
+       
+       delete canvas_rect;
+       
+       if (owns_canvas_group) {
+               delete canvas_group;
+       }
 }
 
 void
@@ -118,7 +128,7 @@ StreamView::set_height (double h)
        }
 
        height = h;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
        return 0;
 }
 
@@ -171,8 +181,9 @@ StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
 
        for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
                if (((*i)->region()) == r) {
-                       delete *i;
+                       RegionView* rv = *i;
                        region_views.erase (i);
+                       delete rv;
                        break;
                }
        }
@@ -181,8 +192,11 @@ StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
 void
 StreamView::undisplay_diskstream ()
 {
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) {
+               RegionViewList::iterator next = i;
+               ++next;
                delete *i;
+               i = next;
        }
 
        region_views.clear();
@@ -216,7 +230,7 @@ StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
        /* update layers count and the y positions and heights of our regions */
        if (ds->playlist()) {
                layers = ds->playlist()->top_layer() + 1;
-               update_contents_y_position_and_height ();
+               update_contents_height ();
                redisplay_diskstream ();
        }
 }
@@ -238,7 +252,7 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
 
        /* update layers count and the y positions and heights of our regions */
        layers = ds->playlist()->top_layer() + 1;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
        
        /* draw it */
        redisplay_diskstream ();
@@ -285,18 +299,12 @@ StreamView::apply_color (Gdk::Color& color, ColorTarget target)
 void
 StreamView::region_layered (RegionView* rv)
 {
-
-        /* 
-           Currently 'layer' has nothing to do with the desired canvas layer.
-            For now, ensure that multiple regionviews passed here in groups are 
-           ordered by 'layer' (lowest to highest). 
-
-           (see AudioStreamView::redisplay_diskstream ()).
- 
-           We move them to the top layer as they arrive. 
-        */
-
-       rv->get_canvas_group()->raise_to_top();
+       /* don't ever leave it at the bottom, since then it doesn't
+          get events - the  parent group does instead ...
+          we need to raise it above the streamview's 
+          canvas_rect, hence the layer+1 here
+       */
+       rv->get_canvas_group()->raise (rv->region()->layer() + 1);
 }
 
 void
@@ -414,7 +422,7 @@ StreamView::get_inverted_selectables (Selection& sel, list<Selectable*>& results
 }
 
 void
-StreamView::update_contents_y_position_and_height ()
+StreamView::update_contents_height ()
 {
        canvas_rect->property_y2() = height;
 
@@ -423,11 +431,12 @@ StreamView::update_contents_y_position_and_height ()
        for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
                switch (layer_display) {
                case Overlaid:
-                       (*i)->set_y_position_and_height (0, height);
+                       (*i)->set_height (height);
                        break;
                case Stacked:
-                       double const y = (*i)->region()->layer() * lh;
-                       (*i)->set_y_position_and_height (y, lh);
+                       cout << "FIXME: Stacked regions: set y position" << endl;
+                       //double const y = (*i)->region()->layer() * lh;
+                       (*i)->set_height (lh);
                        break;
                }
        }
@@ -441,5 +450,5 @@ void
 StreamView::set_layer_display (LayerDisplay d)
 {
        layer_display = d;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
 }