projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix horiz alignment (corner-radius is added to layout)
[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..33731798d7bb3fd03a163a811f3799a0e6c42ef0 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
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 <gtkmm2ext/gtk_ui.h>
-#include "ardour/playlist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
-#include "ardour/audio_diskstream.h"
#include "tape_region_view.h"
#include "audio_time_axis.h"
#include "tape_region_view.h"
#include "audio_time_axis.h"
@@
-35,7
+33,6
@@
#include "i18n.h"
#include "i18n.h"
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
@@
-49,13
+46,13
@@
const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
TimeAxisViewItem::HideFrameRight |
TimeAxisViewItem::FullWidthNameHighlight);
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,
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)))
{
}
TimeAxisViewItem::Visibility (default_tape_visibility|TimeAxisViewItem::HideFrameLeft)))
{
}
@@
-70,11
+67,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 */
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) {
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()
}
TapeAudioRegionView::~TapeAudioRegionView()
@@
-90,7
+87,7
@@
TapeAudioRegionView::update (uint32_t n)
return;
}
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 */
/* this triggers a cache invalidation and redraw in the waveview */