* bugfix from http://tracker.ardour.org/view.php?id=2155 thanks to kristian: fix...

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index b18e5efb42f3cc7c0fe0fe4ec3b61af3be2c9c66..46cb078c63cbb2641ff043c3a807e8551ffdea77 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -40,15 +40,15 @@
 #include "rgb_macros.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "color.h"
 
 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))
+       , 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)
@@ -63,12 +63,11 @@ StreamView::StreamView (RouteTimeAxisView& tv)
 {
        /* set_position() will position the 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_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
+       canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS 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));
@@ -87,7 +86,12 @@ StreamView::StreamView (RouteTimeAxisView& tv)
 StreamView::~StreamView ()
 {
        undisplay_diskstream ();
-       delete canvas_group;
+       
+       delete canvas_rect;
+       
+       if (owns_canvas_group) {
+               delete canvas_group;
+       }
 }
 
 void
@@ -154,8 +158,9 @@ StreamView::set_samples_per_unit (gdouble spp)
 void
 StreamView::add_region_view (boost::shared_ptr<Region> r)
 {
+       // ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r));
+
        add_region_view_internal (r, true);
-       update_contents_y_position_and_height ();
 }
 
 void
@@ -171,8 +176,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 +187,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();
@@ -214,10 +223,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_y_position_and_height ();
+               redisplay_diskstream ();
+       }
 }
 
 void
@@ -235,17 +245,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_y_position_and_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
@@ -285,16 +294,18 @@ 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 ...
-       */
-       
-       /* 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);
+        /* 
+           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();
 }
 
 void
@@ -377,7 +388,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;
@@ -387,8 +397,7 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
                                selected = true;
                        }
                }
-               
-               // cerr << "\tregion " << (*i)->region().name() << " selected = " << selected << endl;
+
                (*i)->set_selected (selected);
        }
 }