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_InactiveFadeHandle());
+ fade_in_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
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_InactiveFadeHandle());
+ fade_out_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
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_InactiveFadeHandle());
+ fade_in_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
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_InactiveFadeHandle());
+ fade_out_trim_handle->set_fill_color (ARDOUR_UI::config()->color ("inactive fade handle"));
fade_out_trim_handle->set_data ("regionview", this);
fade_out_trim_handle->hide ();
}
if (audio_region()->fade_in_active()) {
start_xfade_rect->set_fill (false);
} else {
- start_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
+ start_xfade_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade"));
start_xfade_rect->set_fill (true);
}
}
if (audio_region()->fade_out_active()) {
end_xfade_rect->set_fill (false);
} else {
- end_xfade_rect->set_fill_color (ARDOUR_UI::config()->get_InactiveCrossfade());
+ end_xfade_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("inactive crossfade", "inactive crossfade"));
end_xfade_rect->set_fill (true);
}
}
if (fade_in_handle->visible()) {
//see comment for drag_start
- entered(false);
+ entered();
}
if (pwidth < 5) {
if (fade_out_handle->visible()) {
//see comment for drag_start
- entered(false);
+ entered();
}
/* don't show shape if its too small */
effective_height = _height - 1.0;
- if (Config->get_show_name_highlight() && effective_height >= NAME_HIGHLIGHT_THRESH) {
+ if (ARDOUR_UI::config()->get_show_name_highlight() && effective_height >= NAME_HIGHLIGHT_THRESH) {
effective_height -= NAME_HIGHLIGHT_SIZE;
}
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_ActiveCrossfade());
- start_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
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_CrossfadeLine());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
start_xfade_rect->set_fill (false);
start_xfade_rect->set_outline (false);
start_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_start_xfade_event), start_xfade_rect, this));
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_ActiveCrossfade());
- end_xfade_curve->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
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_CrossfadeLine());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
end_xfade_rect->set_fill (false);
end_xfade_rect->set_outline (false);
end_xfade_rect->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_end_xfade_event), end_xfade_rect, this));
{
RegionView::set_samples_per_pixel (fpp);
- if (Config->get_show_waveforms ()) {
+ if (ARDOUR_UI::config()->get_show_waveforms ()) {
for (uint32_t n = 0; n < waves.size(); ++n) {
waves[n]->set_samples_per_pixel (fpp);
}
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_GainLine() :
- ARDOUR_UI::config()->get_GainLineInactive());
+ ARDOUR_UI::config()->color ("gain line") :
+ ARDOUR_UI::config()->color_mod ("gain line inactive", "gain line inactive"));
}
set_waveform_colors ();
if (start_xfade_curve) {
- 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_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+ start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (end_xfade_curve) {
- 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_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
+ end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (start_xfade_rect) {
- start_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ start_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
if (end_xfade_rect) {
- end_xfade_rect->set_outline_color (ARDOUR_UI::config()->get_CrossfadeLine());
+ end_xfade_rect->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
}
}
void
AudioRegionView::setup_waveform_visibility ()
{
- if (Config->get_show_waveforms ()) {
+ if (ARDOUR_UI::config()->get_show_waveforms ()) {
for (uint32_t n = 0; n < waves.size(); ++n) {
/* make sure the zoom level is correct, since we don't update
this when waveforms are hidden.
return;
}
- if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) {
- gain_line->add_visibility (AutomationLine::Line);
+ if (ARDOUR_UI::config()->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) {
+ gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::ControlPoints|AutomationLine::Line));
+ gain_line->canvas_group().raise_to_top ();
+
} else {
- gain_line->hide ();
+ gain_line->set_visibility (AutomationLine::VisibleAspects(0));
}
}
wave->set_height (ht);
wave->set_samples_per_pixel (samples_per_pixel);
wave->set_show_zero_line (true);
- wave->set_clip_level (Config->get_waveform_clip_level ());
-
+ wave->set_clip_level (ARDOUR_UI::config()->get_waveform_clip_level ());
+ wave->set_start_shift (1.0);
+
wave->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_wave_view_event), wave, this));
- switch (Config->get_waveform_shape()) {
+ switch (ARDOUR_UI::config()->get_waveform_shape()) {
case Rectified:
wave->set_shape (WaveView::Rectified);
break;
wave->set_shape (WaveView::Normal);
}
- wave->set_logscaled (Config->get_waveform_scale() == Logarithmic);
+ wave->set_logscaled (ARDOUR_UI::config()->get_waveform_scale() == Logarithmic);
vector<ArdourCanvas::WaveView*> v;
v.push_back (wave);
set_some_waveform_colors (v);
- if (!Config->get_show_waveforms ()) {
+ if (!ARDOUR_UI::config()->get_show_waveforms ()) {
wave->hide();
}
can represent automation data with it.
*/
- trackview.session()->begin_reversible_command (_("add gain control point"));
+ trackview.editor().begin_reversible_command (_("add gain control point"));
XMLNode &before = audio_region()->envelope()->get_state();
if (!audio_region()->envelope_active()) {
XMLNode &after = audio_region()->envelope()->get_state();
trackview.session()->add_command (new MementoCommand<AutomationList>(*audio_region()->envelope().get(), &before, &after));
- trackview.session()->commit_reversible_command ();
+ trackview.editor().commit_reversible_command ();
}
void
}
void
-AudioRegionView::entered (bool internal_editing)
+AudioRegionView::entered ()
{
trackview.editor().set_current_trimmable (_region);
trackview.editor().set_current_movable (_region);
-
- if (gain_line) {
- /* these may or may not be visible depending on mouse mode */
- gain_line->add_visibility (AutomationLine::ControlPoints);
- }
- if (!internal_editing && ( trackview.editor().current_mouse_mode() == Editing::MouseObject ) ) {
+ update_envelope_visibility();
+
+ if ((trackview.editor().current_mouse_mode() == Editing::MouseObject)) {
if (start_xfade_rect) {
start_xfade_rect->set_outline (true);
}
{
if (gain_line) {
gain_line->set_line_color (audio_region()->envelope_active() ?
- ARDOUR_UI::config()->get_GainLine() :
- ARDOUR_UI::config()->get_GainLineInactive());
+ ARDOUR_UI::config()->color ("gain line") :
+ ARDOUR_UI::config()->color_mod ("gain line inactive", "gain line inactive"));
update_envelope_visibility ();
}
}
{
ArdourCanvas::Color fill;
ArdourCanvas::Color outline;
- ArdourCanvas::Color clip = ARDOUR_UI::config()->get_WaveFormClip();
- ArdourCanvas::Color zero = ARDOUR_UI::config()->get_ZeroLine();
+ ArdourCanvas::Color clip = ARDOUR_UI::config()->color ("clipped waveform");
+ ArdourCanvas::Color zero = ARDOUR_UI::config()->color ("zero line");
if (_selected) {
if (_region->muted()) {
/* hide outline with zero alpha */
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveForm(), 0);
- fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_SelectedWaveFormFill(), MUTED_ALPHA);
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform outline"), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("selected waveform fill"), MUTED_ALPHA);
} else {
- outline = ARDOUR_UI::config()->get_SelectedWaveForm();
- fill = ARDOUR_UI::config()->get_SelectedWaveFormFill();
+ outline = ARDOUR_UI::config()->color ("selected waveform outline");
+ fill = ARDOUR_UI::config()->color ("selected waveform fill");
}
} else {
if (_recregion) {
- outline = ARDOUR_UI::config()->get_RecWaveForm();
- fill = ARDOUR_UI::config()->get_RecWaveFormFill();
+ outline = ARDOUR_UI::config()->color ("recording waveform outline");
+ fill = ARDOUR_UI::config()->color ("recording waveform fill");
} else {
if (_region->muted()) {
/* hide outline with zero alpha */
- outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveForm(), 0);
- fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->get_WaveFormFill(), MUTED_ALPHA);
+ outline = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform outline"), 0);
+ fill = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->color ("waveform fill"), MUTED_ALPHA);
} else {
- outline = ARDOUR_UI::config()->get_WaveForm();
- fill = ARDOUR_UI::config()->get_WaveFormFill();
+ outline = ARDOUR_UI::config()->color ("waveform outline");
+ fill = ARDOUR_UI::config()->color ("waveform fill");
}
}
}
// if fade_in_trim_handle or fade_out_trim_handle should
// be visible. -- If the fade_in_handle is visible
// we have focus and are not in internal edit mode.
- entered(false);
+ entered();
}
}