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 34c1e4a1c959db18da484e4a312cb23411d71703..8730c55f58fd16dec9ece4063d7c760d8f2c890d 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -45,10 +45,10 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
 
-StreamView::StreamView (RouteTimeAxisView& tv)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        : _trackview (tv)
-       , canvas_group(new ArdourCanvas::Group(*_trackview.canvas_display))
-       , canvas_rect(new ArdourCanvas::SimpleRect (*canvas_group))
+       , owns_canvas_group(group == 0)
+       , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display))
        , _samples_per_unit(_trackview.editor.get_current_zoom())
        , rec_updating(false)
        , rec_active(false)
@@ -65,9 +65,14 @@ StreamView::StreamView (RouteTimeAxisView& tv)
        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_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
+       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)
 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;
 }
 
@@ -153,7 +163,9 @@ StreamView::set_samples_per_unit (gdouble spp)
 void
 StreamView::add_region_view (boost::shared_ptr<Region> r)
 {
-       add_region_view_internal (r, false);
+       // ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r));
+
+       add_region_view_internal (r, true);
 }
 
 void
@@ -169,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;
                }
        }
@@ -179,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();
@@ -212,10 +228,11 @@ StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
        ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_modified_weak), 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 ();
-
-       redisplay_diskstream ();
+       if (ds->playlist()) {
+               layers = ds->playlist()->top_layer() + 1;
+               update_contents_height ();
+               redisplay_diskstream ();
+       }
 }
 
 void
@@ -233,17 +250,16 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
        playlist_connections.clear();
        undisplay_diskstream ();
 
+       /* update layers count and the y positions and heights of our regions */
+       layers = ds->playlist()->top_layer() + 1;
+       update_contents_height ();
+       
        /* draw it */
-
        redisplay_diskstream ();
 
        /* catch changes */
 
        playlist_connections.push_back (ds->playlist()->Modified.connect (bind (mem_fun (*this, &StreamView::playlist_modified_weak), 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 ();
 }
 
 void
@@ -283,16 +299,12 @@ StreamView::apply_color (Gdk::Color& color, ColorTarget target)
 void
 StreamView::region_layered (RegionView* rv)
 {
-       rv->get_canvas_group()->lower_to_bottom();
-
        /* 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
        */
-       
-       /* this used to be + 1, but regions to the left ended up below
-         ..something.. and couldn't receive events.  why?  good question.
-       */
-       rv->get_canvas_group()->raise (rv->region()->layer() + 2);
+       rv->get_canvas_group()->raise (rv->region()->layer() + 1);
 }
 
 void
@@ -375,7 +387,6 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
 {
        bool selected;
 
-       // cerr << _trackview.name() << " (selected = " << regions.size() << ")" << endl;
        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
                
                selected = false;
@@ -385,8 +396,7 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
                                selected = true;
                        }
                }
-               
-               // cerr << "\tregion " << (*i)->region().name() << " selected = " << selected << endl;
+
                (*i)->set_selected (selected);
        }
 }
@@ -412,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;
 
@@ -421,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;
                }
        }
@@ -439,5 +450,5 @@ void
 StreamView::set_layer_display (LayerDisplay d)
 {
        layer_display = d;
-       update_contents_y_position_and_height ();
+       update_contents_height ();
 }