update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...

[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 c5267a9f243173bcf79816847ee87ed9b4cae8b6..5fef5e46eee4a6bb5957cf9b30ca54ba4c0418fd 100644 (file)
--- 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
@@ -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;
@@ -49,13 +47,13 @@ const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
                TimeAxisViewItem::HideFrameRight |
                TimeAxisViewItem::FullWidthNameHighlight);
 
-TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, 
-                                         boost::shared_ptr<AudioRegion> r, 
-                                         double spu, 
+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, false,
-                          TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility : 
+                          TimeAxisViewItem::Visibility ((r->position() != 0) ? default_tape_visibility :
                                                         TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
 {
 }
@@ -70,11 +68,11 @@ TapeAudioRegionView::init (Gdk::Color const & basic_color, bool /*wfw*/)
        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()->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());
        }
-       
+
 }
 
 TapeAudioRegionView::~TapeAudioRegionView()
@@ -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 */