Add custom color for region effect automation
This commit is contained in:
parent
b2d4280e0f
commit
38adfdf79e
@ -1673,11 +1673,11 @@ AudioRegionView::set_fx_line_colors ()
|
|||||||
assert (_fx_line);
|
assert (_fx_line);
|
||||||
|
|
||||||
if (_rdx_param != UINT32_MAX && _rfx_id != 0) {
|
if (_rdx_param != UINT32_MAX && _rfx_id != 0) {
|
||||||
_fx_line->set_line_color (UIConfiguration::instance().color ("processor automation line"));
|
_fx_line->set_line_color ("region automation line");
|
||||||
|
} else if (audio_region()->envelope_active()) {
|
||||||
|
_fx_line->set_line_color ("gain line");
|
||||||
} else {
|
} else {
|
||||||
_fx_line->set_line_color (audio_region()->envelope_active()
|
_fx_line->set_line_color ("gain line inactive", "gain line inactive");
|
||||||
? UIConfiguration::instance().color ("gain line")
|
|
||||||
: UIConfiguration::instance().color_mod ("gain line inactive", "gain line inactive"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,6 +92,7 @@ AutomationLine::AutomationLine (const string& name,
|
|||||||
: trackview (tv)
|
: trackview (tv)
|
||||||
, _name (name)
|
, _name (name)
|
||||||
, _height (0)
|
, _height (0)
|
||||||
|
, _line_color ("automation line")
|
||||||
, _view_index_offset (0)
|
, _view_index_offset (0)
|
||||||
, alist (al)
|
, alist (al)
|
||||||
, _visible (Line)
|
, _visible (Line)
|
||||||
@ -264,14 +265,23 @@ AutomationLine::set_height (guint32 h)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
AutomationLine::set_line_color (uint32_t color)
|
AutomationLine::set_line_color (string color_name, std::string color_mod)
|
||||||
{
|
{
|
||||||
_line_color = color;
|
_line_color = color_name;
|
||||||
|
_line_color_mod = color_mod;
|
||||||
|
|
||||||
|
uint32_t color = UIConfiguration::instance().color (color_name);
|
||||||
line->set_outline_color (color);
|
line->set_outline_color (color);
|
||||||
|
|
||||||
Gtkmm2ext::SVAModifier mod = UIConfiguration::instance().modifier ("automation line fill");
|
Gtkmm2ext::SVAModifier mod = UIConfiguration::instance().modifier (color_mod.empty () ? "automation line fill" : color_mod);
|
||||||
|
|
||||||
line->set_fill_color ((color & 0xffffff00) + mod.a()*255);
|
line->set_fill_color ((color & 0xffffff00) + mod.a() * 255);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t
|
||||||
|
AutomationLine::get_line_color() const
|
||||||
|
{
|
||||||
|
return UIConfiguration::instance().color (_line_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
ControlPoint*
|
ControlPoint*
|
||||||
@ -996,7 +1006,7 @@ AutomationLine::set_selected_points (PointSelection const & points)
|
|||||||
void
|
void
|
||||||
AutomationLine::set_colors ()
|
AutomationLine::set_colors ()
|
||||||
{
|
{
|
||||||
set_line_color (UIConfiguration::instance().color ("automation line"));
|
set_line_color (_line_color, _line_color_mod);
|
||||||
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
|
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
|
||||||
(*i)->set_color ();
|
(*i)->set_color ();
|
||||||
}
|
}
|
||||||
|
@ -104,8 +104,8 @@ public:
|
|||||||
bool visible() const { return _visible != VisibleAspects(0); }
|
bool visible() const { return _visible != VisibleAspects(0); }
|
||||||
guint32 height() const { return _height; }
|
guint32 height() const { return _height; }
|
||||||
|
|
||||||
void set_line_color (uint32_t);
|
void set_line_color (std::string color, std::string mod = "");
|
||||||
uint32_t get_line_color() const { return _line_color; }
|
uint32_t get_line_color() const;
|
||||||
|
|
||||||
void set_visibility (VisibleAspects);
|
void set_visibility (VisibleAspects);
|
||||||
void add_visibility (VisibleAspects);
|
void add_visibility (VisibleAspects);
|
||||||
@ -174,7 +174,8 @@ protected:
|
|||||||
|
|
||||||
std::string _name;
|
std::string _name;
|
||||||
guint32 _height;
|
guint32 _height;
|
||||||
uint32_t _line_color;
|
std::string _line_color;
|
||||||
|
std::string _line_color_mod;
|
||||||
uint32_t _view_index_offset;
|
uint32_t _view_index_offset;
|
||||||
std::shared_ptr<ARDOUR::AutomationList> alist;
|
std::shared_ptr<ARDOUR::AutomationList> alist;
|
||||||
|
|
||||||
|
@ -350,7 +350,7 @@ AutomationTimeAxisView::add_contents (bool show_regions)
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
line->set_line_color (UIConfiguration::instance().color ("processor automation line"));
|
line->set_line_color ("processor automation line");
|
||||||
line->set_fill (true);
|
line->set_fill (true);
|
||||||
line->queue_reset ();
|
line->queue_reset ();
|
||||||
add_line (line);
|
add_line (line);
|
||||||
|
@ -7267,7 +7267,7 @@ FreehandLineDrag<OrderedPointList,OrderedPoint>::motion (GdkEvent* ev, bool firs
|
|||||||
dragging_line = new ArdourCanvas::PolyLine (parent ? parent : item());
|
dragging_line = new ArdourCanvas::PolyLine (parent ? parent : item());
|
||||||
dragging_line->set_ignore_events (true);
|
dragging_line->set_ignore_events (true);
|
||||||
dragging_line->set_outline_width (2.0);
|
dragging_line->set_outline_width (2.0);
|
||||||
dragging_line->set_outline_color (UIConfiguration::instance().color ("automation line"));
|
dragging_line->set_outline_color (UIConfiguration::instance().color ("automation line")); // XXX -> get color from AutomationLine
|
||||||
dragging_line->raise_to_top ();
|
dragging_line->raise_to_top ();
|
||||||
|
|
||||||
/* for freehand drawing, we only support left->right direction, for now. */
|
/* for freehand drawing, we only support left->right direction, for now. */
|
||||||
|
@ -365,6 +365,7 @@
|
|||||||
<ColorAlias name="recording rect" alias="alert:ruddy"/>
|
<ColorAlias name="recording rect" alias="alert:ruddy"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:foregroundest"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -356,6 +356,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -357,6 +357,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -357,6 +357,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -357,6 +357,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -320,7 +320,7 @@
|
|||||||
<ColorAlias name="pluginui toggle: fill" alias="widget:bg"/>
|
<ColorAlias name="pluginui toggle: fill" alias="widget:bg"/>
|
||||||
<ColorAlias name="pluginui toggle: fill active" alias="widget:blue"/>
|
<ColorAlias name="pluginui toggle: fill active" alias="widget:blue"/>
|
||||||
<ColorAlias name="preference highlight" alias="alert:yellow"/>
|
<ColorAlias name="preference highlight" alias="alert:yellow"/>
|
||||||
<ColorAlias name="processor automation line" alias="theme:bg1"/>
|
<ColorAlias name="processor automation line" alias="alert:green"/>
|
||||||
<ColorAlias name="processor auxfeedback: fill" alias="theme:contrasting alt"/>
|
<ColorAlias name="processor auxfeedback: fill" alias="theme:contrasting alt"/>
|
||||||
<ColorAlias name="processor auxfeedback: led active" alias="alert:green"/>
|
<ColorAlias name="processor auxfeedback: led active" alias="alert:green"/>
|
||||||
<ColorAlias name="processor control button: fill" alias="neutral:background"/>
|
<ColorAlias name="processor control button: fill" alias="neutral:background"/>
|
||||||
@ -359,6 +359,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -358,6 +358,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -358,6 +358,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -356,6 +356,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:background2"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
@ -357,6 +357,7 @@
|
|||||||
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording note" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform fill" alias="neutral:foregroundest"/>
|
||||||
<ColorAlias name="recording waveform outline" alias="neutral:foregroundest"/>
|
<ColorAlias name="recording waveform outline" alias="neutral:foregroundest"/>
|
||||||
|
<ColorAlias name="region automation line" alias="alert:blue"/>
|
||||||
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
<ColorAlias name="region list automatic" alias="theme:contrasting less"/>
|
||||||
<ColorAlias name="region list missing source" alias="alert:red"/>
|
<ColorAlias name="region list missing source" alias="alert:red"/>
|
||||||
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
<ColorAlias name="region list whole file" alias="neutral:foreground"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user