X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftape_region_view.cc;h=33731798d7bb3fd03a163a811f3799a0e6c42ef0;hb=44680aa1bb6c42d261e4b6424d5d76fd42f26624;hp=08d845003673d3a0b0e04c058479ab2da8457ad8;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git

diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index 08d8450036..33731798d7 100644
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 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
@@ -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 "ardour/audioregion.h"
+#include "ardour/audiosource.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;
@@ -44,32 +41,37 @@ using namespace ArdourCanvas;
 const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
 	= TimeAxisViewItem::Visibility (
 		TimeAxisViewItem::ShowNameHighlight |
+		TimeAxisViewItem::ShowNameText |
 		TimeAxisViewItem::ShowFrame |
 		TimeAxisViewItem::HideFrameRight |
 		TimeAxisViewItem::FullWidthNameHighlight);
 
-TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, 
-					  boost::shared_ptr<AudioRegion> r, 
-					  double spu, 
-					  Gdk::Color& basic_color)
+TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
+					  boost::shared_ptr<AudioRegion> r,
+					  double spu,
+					  Gdk::Color const & basic_color)
 
-	: AudioRegionView (parent, tv, r, spu, basic_color, 
-			   TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility : 
+	: AudioRegionView (parent, tv, r, spu, basic_color, false,
+			   TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility :
 							 TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
 {
 }
 
 void
-TapeAudioRegionView::init (Gdk::Color& basic_color, bool wfw)
+TapeAudioRegionView::init (Gdk::Color const & basic_color, bool /*wfw*/)
 {
-	AudioRegionView::init(basic_color, wfw);
+	/* never wait for data: always just create the waves, connect once and then
+	   we'll update whenever we need to.
+	*/
+
+	AudioRegionView::init(basic_color, false);
 
 	/* every time the wave data changes and peaks are ready, redraw */
-	
+
 	for (uint32_t n = 0; n < audio_region()->n_channels(); ++n) {
-		audio_region()->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());
 	}
-	
+
 }
 
 TapeAudioRegionView::~TapeAudioRegionView()
@@ -85,7 +87,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 */
 
@@ -96,5 +98,5 @@ void
 TapeAudioRegionView::set_frame_color ()
 {
 	fill_opacity = 255;
-	TimeAxisViewItem::set_frame_color ();
+	AudioRegionView::set_frame_color ();
 }