Remove dead code.

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 9658af06fcf78a4c033a595ce432f3ddee9fd8a9..ab61338d2d40633b8d4932b2732db4b20db8fefc 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -48,17 +48,17 @@ using namespace Editing;
 StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        : _trackview (tv)
        , owns_canvas_group(group == 0)
-       , _background_group(new ArdourCanvas::Group(*_trackview.canvas_background))
-       , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display))
-       , _samples_per_unit(_trackview.editor.get_current_zoom())
+       , _background_group (new ArdourCanvas::Group (*_trackview.canvas_background()))
+       , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display()))
+       , _samples_per_unit (_trackview.editor().get_current_zoom ())
        , rec_updating(false)
        , rec_active(false)
-       , use_rec_regions(tv.editor.show_waveforms_recording())
+       , use_rec_regions (tv.editor().show_waveforms_recording ())
        , region_color(_trackview.color())
        , stream_base_color(0xFFFFFFFF)
-       , layers(1)
+       , _layers (1)
        , height(tv.height)
-       , layer_display(Overlaid)
+       , _layer_display (Overlaid)
        , last_rec_data_frame(0)
 {
        /* set_position() will position the group */
@@ -66,7 +66,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        canvas_rect = new ArdourCanvas::SimpleRect (*_background_group);
        canvas_rect->property_x1() = 0.0;
        canvas_rect->property_y1() = 0.0;
-       canvas_rect->property_x2() = _trackview.editor.get_physical_screen_width();
+       canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width ();
        canvas_rect->property_y2() = (double) tv.current_height();
        canvas_rect->raise(1); // raise above tempo lines
 
@@ -76,7 +76,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        //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));
+       canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
 
        if (_trackview.is_track()) {
                _trackview.track()->DiskstreamChanged.connect (mem_fun (*this, &StreamView::diskstream_changed));
@@ -151,13 +151,15 @@ StreamView::set_samples_per_unit (gdouble spp)
        for (vector<RecBoxInfo>::iterator xi = rec_rects.begin(); xi != rec_rects.end(); ++xi) {
                RecBoxInfo &recbox = (*xi);
                
-               gdouble xstart = _trackview.editor.frame_to_pixel ( recbox.start );
-               gdouble xend = _trackview.editor.frame_to_pixel ( recbox.start + recbox.length );
+               gdouble xstart = _trackview.editor().frame_to_pixel (recbox.start);
+               gdouble xend = _trackview.editor().frame_to_pixel (recbox.start + recbox.length);
 
                recbox.rectangle->property_x1() = xstart;
                recbox.rectangle->property_x2() = xend;
        }
 
+       update_coverage_frames ();
+
        return 0;
 }
 
@@ -167,6 +169,7 @@ 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_height ();
 }
 
 void
@@ -230,8 +233,9 @@ 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;
+               _layers = ds->playlist()->top_layer() + 1;
                update_contents_height ();
+               update_coverage_frames ();
                redisplay_diskstream ();
        }
 }
@@ -252,8 +256,10 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
        undisplay_diskstream ();
 
        /* update layers count and the y positions and heights of our regions */
-       layers = ds->playlist()->top_layer() + 1;
+       _layers = ds->playlist()->top_layer() + 1;
        update_contents_height ();
+
+       update_coverage_frames ();
        
        /* draw it */
        redisplay_diskstream ();
@@ -345,14 +351,14 @@ StreamView::update_rec_box ()
                switch (_trackview.track()->mode()) {
                case Normal:
                        rect.length = at - rect.start;
-                       xstart = _trackview.editor.frame_to_pixel (rect.start);
-                       xend = _trackview.editor.frame_to_pixel (at);
+                       xstart = _trackview.editor().frame_to_pixel (rect.start);
+                       xend = _trackview.editor().frame_to_pixel (at);
                        break;
                        
                case Destructive:
                        rect.length = 2;
-                       xstart = _trackview.editor.frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
-                       xend = _trackview.editor.frame_to_pixel (at);
+                       xstart = _trackview.editor().frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
+                       xend = _trackview.editor().frame_to_pixel (at);
                        break;
                }
                
@@ -393,6 +399,7 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
                for (RegionSelection::iterator ii = regions.begin(); ii != regions.end(); ++ii) {
                        if (*i == *ii) {
                                selected = true;
+                               break;
                        }
                }
 
@@ -420,24 +427,35 @@ StreamView::get_inverted_selectables (Selection& sel, list<Selectable*>& results
        }
 }
 
+/** @return height of a child region view, depending on stacked / overlaid mode */
+double
+StreamView::child_height () const
+{
+       if (_layer_display == Stacked) {
+               return height / _layers;
+       }
+       
+       return height;
+}
+
 void
 StreamView::update_contents_height ()
 {
        canvas_rect->property_y2() = height;
 
-       const double lh = height / layers;
+       const double h = child_height ();
 
        for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               switch (layer_display) {
+               switch (_layer_display) {
                case Overlaid:
-                       (*i)->set_height (height);
+                       (*i)->set_y (0);
                        break;
                case Stacked:
-                       cout << "FIXME: Stacked regions: set y position" << endl;
-                       //double const y = (*i)->region()->layer() * lh;
-                       (*i)->set_height (lh);
+                       (*i)->set_y (height - ((*i)->region()->layer() + 1) * h);
                        break;
                }
+
+               (*i)->set_height (h);
        }
 
        for (vector<RecBoxInfo>::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) {
@@ -448,6 +466,15 @@ StreamView::update_contents_height ()
 void
 StreamView::set_layer_display (LayerDisplay d)
 {
-       layer_display = d;
+       _layer_display = d;
        update_contents_height ();
+       update_coverage_frames ();
+}
+
+void
+StreamView::update_coverage_frames ()
+{
+       for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) {
+               (*i)->update_coverage_frames (_layer_display);
+       }
 }