Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstre...

[ardour.git] / gtk2_ardour / tape_region_view.cc

diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index 5daa3b4a6d71c012285d564d70034120609e9403..5fef5e46eee4a6bb5957cf9b30ca54ba4c0418fd 100644 (file)
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -27,7 +27,6 @@
 #include "ardour/playlist.h"
 #include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
-#include "ardour/audio_diskstream.h"
 
 #include "tape_region_view.h"
 #include "audio_time_axis.h"
@@ -35,7 +34,6 @@
 
 #include "i18n.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
@@ -72,7 +70,7 @@ TapeAudioRegionView::init (Gdk::Color const & basic_color, bool /*wfw*/)
        /* every time the wave data changes and peaks are ready, redraw */
 
        for (uint32_t n = 0; n < audio_region()->n_channels(); ++n) {
-               audio_region()->audio_source(n)->PeaksReady.connect (bind (mem_fun(*this, &TapeAudioRegionView::update), n));
+               audio_region()->audio_source(n)->PeaksReady.connect (*this, invalidator (*this), boost::bind (&TapeAudioRegionView::update, this, n), gui_context());
        }
 
 }
@@ -90,7 +88,7 @@ TapeAudioRegionView::update (uint32_t n)
                return;
        }
 
-       ENSURE_GUI_THREAD (bind (mem_fun(*this, &TapeAudioRegionView::update), n));
+       ENSURE_GUI_THREAD (*this, &TapeAudioRegionView::update, n)
 
        /* this triggers a cache invalidation and redraw in the waveview */