projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure that all waveviews have ALL their colors set accurately before first render
[ardour.git]
/
gtk2_ardour
/
audio_region_view.cc
diff --git
a/gtk2_ardour/audio_region_view.cc
b/gtk2_ardour/audio_region_view.cc
index 38dcc5c3869a91d3f805c21002e4c015aebbe009..928902bf42ca06b3f5f3e6ec43667c20063204b3 100644
(file)
--- a/
gtk2_ardour/audio_region_view.cc
+++ b/
gtk2_ardour/audio_region_view.cc
@@
-1157,6
+1157,10
@@
AudioRegionView::create_one_wave (uint32_t which, bool /*direct*/)
wave->set_logscaled (Config->get_waveform_scale() == Logarithmic);
wave->set_logscaled (Config->get_waveform_scale() == Logarithmic);
+ vector<ArdourCanvas::WaveView*> v;
+ v.push_back (wave);
+ set_some_waveform_colors (v);
+
if (!Config->get_show_waveforms ()) {
wave->hide();
}
if (!Config->get_show_waveforms ()) {
wave->hide();
}
@@
-1390,6
+1394,12
@@
AudioRegionView::color_handler ()
void
AudioRegionView::set_waveform_colors ()
void
AudioRegionView::set_waveform_colors ()
+{
+ set_some_waveform_colors (waves);
+}
+
+void
+AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& waves_to_color)
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
@@
-1435,7
+1445,7
@@
AudioRegionView::set_waveform_colors ()
}
}
}
}
- for (vector<ArdourCanvas::WaveView*>::iterator w = waves
.begin(); w != waves
.end(); ++w) {
+ for (vector<ArdourCanvas::WaveView*>::iterator w = waves
_to_color.begin(); w != waves_to_color
.end(); ++w) {
(*w)->set_fill_color (fill);
(*w)->set_outline_color (outline);
(*w)->set_clip_color (clip);
(*w)->set_fill_color (fill);
(*w)->set_outline_color (outline);
(*w)->set_clip_color (clip);