Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstre...
[ardour.git] / gtk2_ardour / streamview.cc
index fbd48ddbf269d5bbb5b5cf6a08709b0b59f6210a..8fa9ed8d288298dbd7e6365967c80bd7a8aadec5 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001, 2006 Paul Davis 
+    Copyright (C) 2001, 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@
 #include "ardour/playlist.h"
 #include "ardour/region.h"
 #include "ardour/source.h"
-#include "ardour/diskstream.h"
 #include "ardour/track.h"
+#include "ardour/session.h"
 
 #include "streamview.h"
 #include "region_view.h"
@@ -54,7 +54,6 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        , _samples_per_unit (_trackview.editor().get_current_zoom ())
        , rec_updating(false)
        , rec_active(false)
-       , use_rec_regions (tv.editor().show_waveforms_recording ())
        , region_color(_trackview.color())
        , stream_base_color(0xFFFFFFFF)
        , _layers (1)
@@ -71,34 +70,30 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
        canvas_rect->property_y2() = (double) tv.current_height();
        canvas_rect->raise(1); // raise above tempo lines
 
-       canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom 
+       canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom
 
-       canvas_rect->signal_event().connect (bind (
-                       mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event),
+       canvas_rect->signal_event().connect (sigc::bind (
+                       sigc::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));
-               _trackview.session().TransportStateChange.connect (
-                               mem_fun (*this, &StreamView::transport_changed));
-               _trackview.session().TransportLooped.connect (
-                               mem_fun (*this, &StreamView::transport_looped));
-               _trackview.get_diskstream()->RecordEnableChanged.connect (
-                               mem_fun (*this, &StreamView::rec_enable_changed));
-               _trackview.session().RecordStateChanged.connect (
-                               mem_fun (*this, &StreamView::sess_rec_enable_changed));
-       } 
+               _trackview.track()->DiskstreamChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::diskstream_changed, this), gui_context());
+               _trackview.track()->RecordEnableChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::rec_enable_changed, this), gui_context());
+
+               _trackview.session()->TransportStateChange.connect (*this, invalidator (*this), boost::bind (&StreamView::transport_changed, this), gui_context());
+               _trackview.session()->TransportLooped.connect (*this, invalidator (*this), boost::bind (&StreamView::transport_looped, this), gui_context());
+               _trackview.session()->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::sess_rec_enable_changed, this), gui_context());
+       }
 
-       ColorsChanged.connect (mem_fun (*this, &StreamView::color_handler));
+       ColorsChanged.connect (sigc::mem_fun (*this, &StreamView::color_handler));
 }
 
 StreamView::~StreamView ()
 {
-       undisplay_diskstream ();
-       
+       undisplay_track ();
+
        delete canvas_rect;
-       
+
        if (owns_canvas_group) {
                delete canvas_group;
        }
@@ -108,7 +103,7 @@ void
 StreamView::attach ()
 {
        if (_trackview.is_track()) {
-               display_diskstream (_trackview.get_diskstream());
+               display_track (_trackview.track ());
        }
 }
 
@@ -137,11 +132,11 @@ StreamView::set_height (double h)
        update_contents_height ();
 
        HeightChanged ();
-       
+
        return 0;
 }
 
-int 
+int
 StreamView::set_samples_per_unit (gdouble spp)
 {
        RegionViewList::iterator i;
@@ -158,7 +153,7 @@ 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);
 
@@ -172,23 +167,15 @@ StreamView::set_samples_per_unit (gdouble spp)
 }
 
 void
-StreamView::add_region_view_weak (boost::weak_ptr<Region> r)
+StreamView::add_region_view (boost::weak_ptr<Region> wr)
 {
-       boost::shared_ptr<Region> sp (r.lock());
-       
-       if (sp) {
-               add_region_view (sp);
+       boost::shared_ptr<Region> r (wr.lock());
+       if (!r) {
+               return;
        }
-}
 
-
-void
-StreamView::add_region_view (boost::shared_ptr<Region> r)
-{
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::add_region_view), r));
-       
        add_region_view_internal (r, true);
-       
+
        if (_layer_display == Stacked) {
                update_contents_height ();
        }
@@ -197,7 +184,7 @@ StreamView::add_region_view (boost::shared_ptr<Region> r)
 void
 StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
 {
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::remove_region_view), weak_r));
+       ENSURE_GUI_THREAD (*this, &StreamView::remove_region_view, weak_r)
 
        boost::shared_ptr<Region> r (weak_r.lock());
 
@@ -216,7 +203,7 @@ StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
 }
 
 void
-StreamView::undisplay_diskstream ()
+StreamView::undisplay_track ()
 {
        for (RegionViewList::iterator i = region_views.begin(); i != region_views.end() ; ) {
                RegionViewList::iterator next = i;
@@ -229,13 +216,11 @@ StreamView::undisplay_diskstream ()
 }
 
 void
-StreamView::display_diskstream (boost::shared_ptr<Diskstream> ds)
+StreamView::display_track (boost::shared_ptr<Track> tr)
 {
-       playlist_change_connection.disconnect();
-       playlist_changed (ds);
-       playlist_change_connection = ds->PlaylistChanged.connect (bind (
-                       mem_fun (*this, &StreamView::playlist_changed_weak),
-                       boost::weak_ptr<Diskstream> (ds)));
+       playlist_switched_connection.disconnect();
+       playlist_switched (tr);
+       tr->PlaylistChanged.connect (playlist_switched_connection, invalidator (*this), boost::bind (&StreamView::playlist_switched, this, boost::weak_ptr<Track> (tr)), gui_context());
 }
 
 void
@@ -289,105 +274,82 @@ StreamView::layer_regions()
                i = tmp;
        }
 
-       // Fix canvas layering by raising each in the sorted list order
+       // Fix canvas layering by raising each to the top in the sorted order.
        for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) {
-               region_layered (*i);
+               (*i)->get_canvas_group()->raise_to_top ();
        }
 }
 
 void
-StreamView::playlist_modified_weak (boost::weak_ptr<Diskstream> ds)
+StreamView::playlist_layered (boost::weak_ptr<Track> wtr)
 {
-       boost::shared_ptr<Diskstream> sp (ds.lock());
-       
-       if (sp) {
-               playlist_modified (sp);
-       }
-}
+       boost::shared_ptr<Track> tr (wtr.lock());
 
-void
-StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
-{
-       /* we do not allow shared_ptr<T> to be bound to slots */
-       ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_modified_weak), ds));
+       if (!tr) {
+               return;
+       }
 
        /* update layers count and the y positions and heights of our regions */
-       if (ds->playlist()) {
-               _layers = ds->playlist()->top_layer() + 1;
+       if (tr->playlist()) {
+               _layers = tr->playlist()->top_layer() + 1;
        }
 
        if (_layer_display == Stacked) {
                update_contents_height ();
                update_coverage_frames ();
-       }
+       } else {
+               /* layering has probably been modified. reflect this in the canvas. */
+               layer_regions();
+       } 
 }
 
 void
-StreamView::playlist_changed_weak (boost::weak_ptr<Diskstream> ds)
+StreamView::playlist_switched (boost::weak_ptr<Track> wtr)
 {
-       boost::shared_ptr<Diskstream> sp (ds.lock());
-       if (sp) {
-               playlist_changed (sp);
-       }
-}
+       boost::shared_ptr<Track> tr (wtr.lock());
 
-void
-StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
-{
-       ENSURE_GUI_THREAD (bind (
-                       mem_fun (*this, &StreamView::playlist_changed_weak),
-                       boost::weak_ptr<Diskstream> (ds)));
+       if (!tr) {
+               return;
+       }
 
        /* disconnect from old playlist */
 
-       for (vector<sigc::connection>::iterator i = playlist_connections.begin();
-                       i != playlist_connections.end(); ++i) {
-               (*i).disconnect();
-       }
-       
-       playlist_connections.clear();
-       undisplay_diskstream ();
+       playlist_connections.drop_connections ();
+       undisplay_track ();
 
        /* update layers count and the y positions and heights of our regions */
-       _layers = ds->playlist()->top_layer() + 1;
+       _layers = tr->playlist()->top_layer() + 1;
        update_contents_height ();
        update_coverage_frames ();
 
-       ds->playlist()->set_explicit_relayering (_layer_display == Stacked);
-       
-       /* draw it */
-       
-       redisplay_diskstream ();
+       tr->playlist()->set_explicit_relayering (_layer_display == Stacked);
 
-       /* catch changes */
+       /* draw it */
 
-       playlist_connections.push_back (ds->playlist()->Modified.connect (bind (
-                       mem_fun (*this, &StreamView::playlist_modified_weak), ds)));
+       redisplay_track ();
 
-       playlist_connections.push_back (ds->playlist()->RegionAdded.connect (
-                       mem_fun (*this, &StreamView::add_region_view_weak)));
+       /* catch changes */
 
-       playlist_connections.push_back (ds->playlist()->RegionRemoved.connect (
-                       mem_fun (*this, &StreamView::remove_region_view)));
+       tr->playlist()->LayeringChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::playlist_layered, this, boost::weak_ptr<Track> (tr)), gui_context());
+       tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::add_region_view, this, _1), gui_context());
+       tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), ui_bind (&StreamView::remove_region_view, this, _1), gui_context());
+       // ds->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::redisplay_diskstream, this), gui_context());
 }
 
 void
 StreamView::diskstream_changed ()
 {
        boost::shared_ptr<Track> t;
-
+        
        if ((t = _trackview.track()) != 0) {
-               Gtkmm2ext::UI::instance()->call_slot (bind (
-                               mem_fun (*this, &StreamView::display_diskstream),
-                               t->diskstream()));
+               Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t));
        } else {
-               Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::undisplay_diskstream));
+               Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::undisplay_track, this));
        }
 }
 
 void
 StreamView::apply_color (Gdk::Color& color, ColorTarget target)
-
 {
        list<RegionView *>::iterator i;
 
@@ -398,7 +360,7 @@ StreamView::apply_color (Gdk::Color& color, ColorTarget target)
                        (*i)->set_color (region_color);
                }
                break;
-               
+
        case StreamBaseColor:
                stream_base_color = RGBA_TO_UINT (
                        color.get_red_p(), color.get_green_p(), color.get_blue_p(), 255);
@@ -419,19 +381,19 @@ StreamView::region_layered (RegionView* rv)
 void
 StreamView::rec_enable_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+       setup_rec_box ();
 }
 
 void
 StreamView::sess_rec_enable_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+       setup_rec_box ();
 }
 
 void
 StreamView::transport_changed()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+       setup_rec_box ();
 }
 
 void
@@ -439,7 +401,7 @@ StreamView::transport_looped()
 {
        // to force a new rec region
        rec_active = false;
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
+       Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::setup_rec_box, this));
 }
 
 void
@@ -448,31 +410,31 @@ StreamView::update_rec_box ()
        if (rec_active && rec_rects.size() > 0) {
                /* only update the last box */
                RecBoxInfo & rect = rec_rects.back();
-               nframes_t at = _trackview.get_diskstream()->current_capture_end();
+               nframes_t at = _trackview.track()->current_capture_end();
                double xstart;
                double xend;
-               
+
                switch (_trackview.track()->mode()) {
-               
+
                case NonLayered:
                case Normal:
                        rect.length = at - rect.start;
                        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());
+                       xstart = _trackview.editor().frame_to_pixel (_trackview.track()->current_capture_start());
                        xend = _trackview.editor().frame_to_pixel (at);
                        break;
                }
-               
+
                rect.rectangle->property_x1() = xstart;
                rect.rectangle->property_x2() = xend;
        }
 }
-       
+
 RegionView*
 StreamView::find_view (boost::shared_ptr<const Region> region)
 {
@@ -484,7 +446,20 @@ StreamView::find_view (boost::shared_ptr<const Region> region)
        }
        return 0;
 }
-       
+
+uint32_t
+StreamView::num_selected_regionviews () const
+{
+       uint32_t cnt = 0;
+
+       for (list<RegionView*>::const_iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               if ((*i)->get_selected()) {
+                       ++cnt;
+               }
+       }
+       return cnt;
+}
+
 void
 StreamView::foreach_regionview (sigc::slot<void,RegionView*> slot)
 {
@@ -493,15 +468,25 @@ StreamView::foreach_regionview (sigc::slot<void,RegionView*> slot)
        }
 }
 
+void
+StreamView::foreach_selected_regionview (sigc::slot<void,RegionView*> slot)
+{
+       for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               if ((*i)->get_selected()) {
+                       slot (*i);
+               }
+       }
+}
+
 void
 StreamView::set_selected_regionviews (RegionSelection& regions)
 {
        bool selected;
 
        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               
+
                selected = false;
-               
+
                for (RegionSelection::iterator ii = regions.begin(); ii != regions.end(); ++ii) {
                        if (*i == *ii) {
                                selected = true;
@@ -514,10 +499,27 @@ StreamView::set_selected_regionviews (RegionSelection& regions)
 }
 
 void
-StreamView::get_selectables (nframes_t start, nframes_t end, list<Selectable*>& results)
+StreamView::get_selectables (nframes_t start, nframes_t end, double top, double bottom, list<Selectable*>& results)
 {
+       layer_t min_layer = 0;
+       layer_t max_layer = 0;
+
+       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);
+       }
+
        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               if ((*i)->region()->coverage(start, end) != OverlapNone) {
+
+               bool layer_ok = true;
+
+               if (_layer_display == Stacked) {
+                       layer_t const l = (*i)->region()->layer ();
+                       layer_ok = (min_layer <= l && l <= max_layer);
+               }
+
+               if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) {
                        results.push_back (*i);
                }
        }
@@ -540,7 +542,7 @@ StreamView::child_height () const
        if (_layer_display == Stacked) {
                return height / _layers;
        }
-       
+
        return height;
 }
 
@@ -573,7 +575,7 @@ StreamView::set_layer_display (LayerDisplay d)
        _layer_display = d;
        update_contents_height ();
        update_coverage_frames ();
-       _trackview.get_diskstream()->playlist()->set_explicit_relayering (_layer_display == Stacked);
+       _trackview.track()->playlist()->set_explicit_relayering (_layer_display == Stacked);
 }
 
 void