projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #1637 (needs merging to 2.0.1 branch); remove debug printf
[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 4110ad7d98efe7de9d4b3d6303d6ec35140dd2b2..f46d1c05dc9e8e6ac9c09c4d9692519a2eba5fd9 100644
(file)
--- 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.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cmath>
*/
#include <cmath>
@@
-50,12
+49,12
@@
const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
TimeAxisViewItem::FullWidthNameHighlight);
TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
TimeAxisViewItem::FullWidthNameHighlight);
TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv,
-
AudioRegion&
r,
+
boost::shared_ptr<AudioRegion>
r,
double spu,
Gdk::Color& basic_color)
: AudioRegionView (parent, tv, r, spu, basic_color,
double spu,
Gdk::Color& basic_color)
: AudioRegionView (parent, tv, r, spu, basic_color,
- TimeAxisViewItem::Visibility ((r
.
position() != 0) ? default_tape_visibility :
+ TimeAxisViewItem::Visibility ((r
->
position() != 0) ? default_tape_visibility :
TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
{
}
TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
{
}
@@
-67,8
+66,8
@@
TapeAudioRegionView::init (Gdk::Color& basic_color, bool wfw)
/* every time the wave data changes and peaks are ready, redraw */
/* 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));
+ 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,7
+89,7
@@
TapeAudioRegionView::update (uint32_t n)
/* this triggers a cache invalidation and redraw in the waveview */
/* this triggers a cache invalidation and redraw in the waveview */
- waves[n]->property_data_src() =
&_region
;
+ waves[n]->property_data_src() =
_region.get()
;
}
void
}
void