remove use of a boost::fast_pool_allocator without a mutex for Evoral::ControlList...

[ardour.git] / gtk2_ardour / streamview.cc

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index b9d577819f2dfa71f01ffa8c91f50a351fc21fd2..19f6ee65bbd4c266b7bc4ee1fbf0f4ee5f2647fc 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -25,7 +25,6 @@
 
 #include "ardour/playlist.h"
 #include "ardour/region.h"
-#include "ardour/source.h"
 #include "ardour/track.h"
 #include "ardour/session.h"
 
@@ -336,10 +335,12 @@ StreamView::playlist_switched (boost::weak_ptr<Track> wtr)
        /* catch changes */
 
        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());
+       tr->playlist()->RegionAdded.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::add_region_view, this, _1), gui_context());
+       tr->playlist()->RegionRemoved.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::remove_region_view, this, _1), gui_context());
+       tr->playlist()->ContentsChanged.connect (playlist_connections, invalidator (*this), boost::bind (&StreamView::update_coverage_frames, this), gui_context());
 }
 
+
 void
 StreamView::diskstream_changed ()
 {
@@ -545,7 +546,7 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
                        layer_ok = (min_layer <= l && l <= max_layer);
                }
 
-               if ((*i)->region()->coverage (start, end) != OverlapNone && layer_ok) {
+               if ((*i)->region()->coverage (start, end) != Evoral::OverlapNone && layer_ok) {
                        results.push_back (*i);
                }
        }
@@ -612,6 +613,8 @@ StreamView::update_contents_height ()
                        break;
                }
        }
+
+       ContentsHeightChanged (); /* EMIT SIGNAL */
 }
 
 void