X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftape_region_view.cc;h=d626f3df496880fb12bf127e929855811841b83d;hb=983bf548cdc1fb184d122c62190fb76069328a27;hp=5daa3b4a6d71c012285d564d70034120609e9403;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index 5daa3b4a6d..d626f3df49 100644
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -24,10 +24,8 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#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 +33,6 @@
 
 #include "i18n.h"
 
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Editing;
@@ -72,7 +69,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());
 	}
 
 }
@@ -82,7 +79,7 @@ TapeAudioRegionView::~TapeAudioRegionView()
 }
 
 void
-TapeAudioRegionView::update (uint32_t n)
+TapeAudioRegionView::update (uint32_t /*n*/)
 {
 	/* check that all waves are build and ready */
 
@@ -90,11 +87,9 @@ TapeAudioRegionView::update (uint32_t n)
 		return;
 	}
 
-	ENSURE_GUI_THREAD (bind (mem_fun(*this, &TapeAudioRegionView::update), n));
-
-	/* this triggers a cache invalidation and redraw in the waveview */
-
-	waves[n]->property_data_src() = _region.get();
+	ENSURE_GUI_THREAD (*this, &TapeAudioRegionView::update, n);
+	// CAIROCANVAS
+	// waves[n]->rebuild ();
 }
 
 void