summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_region_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
-rw-r--r--gtk2_ardour/audio_region_view.cc68
1 files changed, 34 insertions, 34 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index da6aeff7bf..ced48920e0 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -153,28 +153,28 @@ AudioRegionView::init (bool wfd)
fade_in_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in handle for %1", region()->name()));
fade_in_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_in_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
fade_in_handle->set_data ("regionview", this);
fade_in_handle->hide ();
fade_out_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out handle for %1", region()->name()));
fade_out_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_out_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
fade_out_handle->set_data ("regionview", this);
fade_out_handle->hide ();
fade_in_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_in_handle, string_compose ("fade in trim handle for %1", region()->name()));
fade_in_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
fade_in_trim_handle->set_data ("regionview", this);
fade_in_trim_handle->hide ();
fade_out_trim_handle = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (fade_out_handle, string_compose ("fade out trim handle for %1", region()->name()));
fade_out_trim_handle->set_outline_color (ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
- fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveFadeHandle());
+ fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->get_InactiveFadeHandle());
fade_out_trim_handle->set_data ("regionview", this);
fade_out_trim_handle->hide ();
}
@@ -315,7 +315,7 @@ AudioRegionView::fade_in_active_changed ()
if (audio_region()->fade_in_active()) {
start_xfade_rect->set_fill (false);
} else {
- start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade());
+ start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
start_xfade_rect->set_fill (true);
}
}
@@ -328,7 +328,7 @@ AudioRegionView::fade_out_active_changed ()
if (audio_region()->fade_out_active()) {
end_xfade_rect->set_fill (false);
} else {
- end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_InactiveCrossfade());
+ end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
end_xfade_rect->set_fill (true);
}
}
@@ -736,14 +736,14 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
if (!start_xfade_curve) {
start_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::Start);
CANVAS_DEBUG_NAME (start_xfade_curve, string_compose ("xfade start out line for %1", region()->name()));
- start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
start_xfade_curve->set_ignore_events (true);
}
if (!start_xfade_rect) {
start_xfade_rect = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (start_xfade_rect, string_compose ("xfade start rect for %1", region()->name()));
- start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
start_xfade_rect->set_fill (false);
start_xfade_rect->set_outline (false);
start_xfade_rect->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT));
@@ -827,15 +827,15 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
if (!end_xfade_curve) {
end_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::End);
CANVAS_DEBUG_NAME (end_xfade_curve, string_compose ("xfade end out line for %1", region()->name()));
- end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
end_xfade_curve->set_ignore_events (true);
}
if (!end_xfade_rect) {
end_xfade_rect = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (end_xfade_rect, string_compose ("xfade end rect for %1", region()->name()));
- end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
end_xfade_rect->set_fill (false);
end_xfade_rect->set_outline (false);
end_xfade_rect->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT));
@@ -990,26 +990,26 @@ AudioRegionView::set_colors ()
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_canvasvar_GainLine() :
- ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+ ARDOUR_UI::config()->get_GainLine() :
+ ARDOUR_UI::config()->get_GainLineInactive());
}
set_waveform_colors ();
if (start_xfade_curve) {
- start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ start_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
}
if (end_xfade_curve) {
- end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_canvasvar_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ end_xfade_curve->set_fill_color (ARDOUR_UI::config()->get_ActiveCrossfade());
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
}
if (start_xfade_rect) {
- start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
}
if (end_xfade_rect) {
- end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_CrossfadeLine());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
}
}
@@ -1370,8 +1370,8 @@ AudioRegionView::envelope_active_changed ()
{
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_canvasvar_GainLine() :
- ARDOUR_UI::config()->get_canvasvar_GainLineInactive());
+ ARDOUR_UI::config()->get_GainLine() :
+ ARDOUR_UI::config()->get_GainLineInactive());
update_envelope_visibility ();
}
}
@@ -1402,30 +1402,30 @@ AudioRegionView::set_some_waveform_colors (vector<ArdourCanvas::WaveView*>& wave
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
- ArdourCanvas::Color clip = ARDOUR_UI::config()->get_canvasvar_WaveFormClip();
- ArdourCanvas::Color zero = ARDOUR_UI::config()->get_canvasvar_ZeroLine();
+ ArdourCanvas::Color clip = ARDOUR_UI::config()->get_WaveFormClip();
+ ArdourCanvas::Color zero = ARDOUR_UI::config()->get_ZeroLine();
if (_selected) {
if (_region->muted()) {
/* hide outline with zero alpha */
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm(), 0);
- fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill(), MUTED_ALPHA);
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveForm(), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveFormFill(), MUTED_ALPHA);
} else {
- outline = ARDOUR_UI::config()->get_canvasvar_SelectedWaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_SelectedWaveFormFill();
+ outline = ARDOUR_UI::config()->get_SelectedWaveForm();
+ fill = ARDOUR_UI::config()->get_SelectedWaveFormFill();
}
} else {
if (_recregion) {
- outline = ARDOUR_UI::config()->get_canvasvar_RecWaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_RecWaveFormFill();
+ outline = ARDOUR_UI::config()->get_RecWaveForm();
+ fill = ARDOUR_UI::config()->get_RecWaveFormFill();
} else {
if (_region->muted()) {
/* hide outline with zero alpha */
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveForm(), 0);
- fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_canvasvar_WaveFormFill(), MUTED_ALPHA);
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveForm(), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveFormFill(), MUTED_ALPHA);
} else {
- outline = ARDOUR_UI::config()->get_canvasvar_WaveForm();
- fill = ARDOUR_UI::config()->get_canvasvar_WaveFormFill();
+ outline = ARDOUR_UI::config()->get_WaveForm();
+ fill = ARDOUR_UI::config()->get_WaveFormFill();
}
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 15:24:55 +0000