fader colors: use correct UIConfig var name and exclude master bus correctly
This commit is contained in:
parent
870a51b691
commit
7aef0cd191
|
@ -1416,6 +1416,7 @@ MixerStrip::reset_strip_style ()
|
||||||
{
|
{
|
||||||
if (_current_delivery && boost::dynamic_pointer_cast<Send>(_current_delivery)) {
|
if (_current_delivery && boost::dynamic_pointer_cast<Send>(_current_delivery)) {
|
||||||
|
|
||||||
|
gpm.unset_fader_fg ();
|
||||||
gpm.set_fader_name ("SendStripBase");
|
gpm.set_fader_name ("SendStripBase");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -1439,7 +1440,7 @@ MixerStrip::reset_strip_style ()
|
||||||
} else {
|
} else {
|
||||||
set_name ("AudioTrackStripBaseInactive");
|
set_name ("AudioTrackStripBaseInactive");
|
||||||
}
|
}
|
||||||
if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) {
|
if (UIConfiguration::instance().get_use_route_color_widely()) {
|
||||||
// gpm.set_fader_bg ();
|
// gpm.set_fader_bg ();
|
||||||
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
|
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
|
||||||
} else {
|
} else {
|
||||||
|
@ -1453,7 +1454,7 @@ MixerStrip::reset_strip_style ()
|
||||||
set_name ("AudioBusStripBaseInactive");
|
set_name ("AudioBusStripBaseInactive");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UIConfiguration::instance().get_use_route_color_widely()) {
|
if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) {
|
||||||
// gpm.set_fader_bg ();
|
// gpm.set_fader_bg ();
|
||||||
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
|
gpm.set_fader_fg (gdk_color_to_rgba (route_color_tint()));
|
||||||
} else {
|
} else {
|
||||||
|
@ -1810,7 +1811,7 @@ MixerStrip::parameter_changed (string p)
|
||||||
}
|
}
|
||||||
} else if (p == "show-triggers-inline") {
|
} else if (p == "show-triggers-inline") {
|
||||||
/* XXX do something or get rid of this parameter */
|
/* XXX do something or get rid of this parameter */
|
||||||
} else if (p == "use-route-color-for-bg") {
|
} else if (p == "use-route-color-widely") {
|
||||||
reset_strip_style ();
|
reset_strip_style ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -497,7 +497,7 @@ RouteTimeAxisView::parameter_changed (string const & p)
|
||||||
} else {
|
} else {
|
||||||
gm.get_level_meter().set_max_audio_meter_count (0);
|
gm.get_level_meter().set_max_audio_meter_count (0);
|
||||||
}
|
}
|
||||||
} else if (p == "use-route-color-for-bg") {
|
} else if (p == "use-route-color-widely") {
|
||||||
route_color_changed ();
|
route_color_changed ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1037,7 +1037,7 @@ RouteTimeAxisView::route_color_changed ()
|
||||||
}
|
}
|
||||||
number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
|
number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
|
||||||
|
|
||||||
if (UIConfiguration::instance().get_use_route_color_widely()) {
|
if (!is_master() && UIConfiguration::instance().get_use_route_color_widely()) {
|
||||||
gm.set_fader_fg (gdk_color_to_rgba (route_color_tint ()));
|
gm.set_fader_fg (gdk_color_to_rgba (route_color_tint ()));
|
||||||
} else {
|
} else {
|
||||||
gm.unset_fader_fg ();
|
gm.unset_fader_fg ();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user