X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftape_region_view.cc;h=a10541ffc6a1955bf8e441a28fee4f252d114b2b;hb=0874426a5b6777559a12f87070b2aadb230ec50d;hp=bd5ce8af029fa9d6be35f78f99048f838acf27ac;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc
index bd5ce8af02..a10541ffc6 100644
--- a/gtk2_ardour/tape_region_view.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cmath>
@@ -25,10 +24,10 @@
 
 #include <gtkmm2ext/gtk_ui.h>
 
-#include <ardour/playlist.h>
-#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
-#include <ardour/audio_diskstream.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"
@@ -45,30 +44,35 @@ 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, 
-					  AudioRegion& r, 
+					  boost::shared_ptr<AudioRegion> r, 
 					  double spu, 
-					  Gdk::Color& basic_color)
+					  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));
+	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));
 	}
 	
 }
@@ -90,12 +94,12 @@ TapeAudioRegionView::update (uint32_t n)
 
 	/* this triggers a cache invalidation and redraw in the waveview */
 
-	waves[n]->property_data_src() = &_region;
+	waves[n]->property_data_src() = _region.get();
 }
 
 void
 TapeAudioRegionView::set_frame_color ()
 {
 	fill_opacity = 255;
-	TimeAxisViewItem::set_frame_color ();
+	AudioRegionView::set_frame_color ();
 }