smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 05:06:31 +01:00
Code Issues Projects Releases Wiki Activity

adjust color API for RouteUI to use PresentationInfo's color

Browse source
This commit is contained in:
Paul Davis 2016-06-05 15:26:12 -04:00
parent 171b70927a
commit 2aeb33989e
3 changed files with 16 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/analysis_window.cc
View file

@ -255,7 +255,7 @@ AnalysisWindow::analyze_data (Gtk::Button * /*button*/)
// std::cerr << "Analyzing ranges on track " << rui->route()->name() << std::endl; // std::cerr << "Analyzing ranges on track " << rui->route()->name() << std::endl;
FFTResult *res = fft_graph.prepareResult(rui->color(), rui->route()->name()); FFTResult *res = fft_graph.prepareResult(rui->route_color(), rui->route()->name());
for (std::list<AudioRange>::iterator j = ts.begin(); j != ts.end(); ++j) { for (std::list<AudioRange>::iterator j = ts.begin(); j != ts.end(); ++j) {
int n; int n;
@ -290,7 +290,7 @@ AnalysisWindow::analyze_data (Gtk::Button * /*button*/)
Gtk::TreeModel::Row newrow = *(tlmodel)->append(); Gtk::TreeModel::Row newrow = *(tlmodel)->append();
newrow[tlcols.trackname] = rui->route()->name(); newrow[tlcols.trackname] = rui->route()->name();
newrow[tlcols.visible] = true; newrow[tlcols.visible] = true;
newrow[tlcols.color] = rui->color(); newrow[tlcols.color] = rui->route_color ();
newrow[tlcols.graph] = res; newrow[tlcols.graph] = res;
} }
} else if (source_selection_regions_rb.get_active()) { } else if (source_selection_regions_rb.get_active()) {

47
gtk2_ardour/route_ui.cc
View file

@ -249,7 +249,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
_route = rp; _route = rp;
if (set_color_from_route()) { if (set_color_from_route()) {
set_color (unique_random_color()); set_color (gdk_color_to_rgba (AxisView::unique_random_color ()));
} }
if (self_destruct) { if (self_destruct) {
@ -1596,10 +1596,11 @@ void
RouteUI::choose_color () RouteUI::choose_color ()
{ {
bool picked; bool picked;
Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color); Gdk::Color c (gdk_color_from_rgb (_route->presentation_info().color()));
Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &c);
if (picked) { if (picked) {
set_color(color); set_color (gdk_color_to_rgba (color));
} }
} }
@ -1607,21 +1608,9 @@ RouteUI::choose_color ()
* the route is in a group which shares its color with its routes. * the route is in a group which shares its color with its routes.
*/ */
void void
RouteUI::set_color (const Gdk::Color & c) RouteUI::set_color (uint32_t c)
{ {
/* leave _color alone in the group case so that tracks can retain their _route->presentation_info().set_color (c);
* own pre-group colors.
*/
char buf[64];
_color = c;
snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
/* note: we use the route state ID here so that color is the same for both
the time axis view and the mixer strip
*/
gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
_route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */ _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
} }
@ -1635,20 +1624,6 @@ RouteUI::route_state_id () const
int int
RouteUI::set_color_from_route () RouteUI::set_color_from_route ()
{ {
const string str = gui_object_state().get_string (route_state_id(), X_("color"));
if (str.empty()) {
return 1;
}
int r, g, b;
sscanf (str.c_str(), "%d:%d:%d", &r, &g, &b);
_color.set_red (r);
_color.set_green (g);
_color.set_blue (b);
return 0; return 0;
} }
@ -2230,18 +2205,20 @@ RouteUI::track_mode_changed (void)
/** @return the color that this route should use; it maybe its own, /** @return the color that this route should use; it maybe its own,
or it maybe that of its route group. or it maybe that of its route group.
*/ */
Gdk::Color Gdk::Color
RouteUI::color () const RouteUI::route_color () const
{ {
Gdk::Color c;
RouteGroup* g = _route->route_group (); RouteGroup* g = _route->route_group ();
if (g && g->is_color()) { if (g && g->is_color()) {
Gdk::Color c;
set_color_from_rgba (c, GroupTabs::group_color (g)); set_color_from_rgba (c, GroupTabs::group_color (g));
return c; } else {
set_color_from_rgba (c, _route->presentation_info().color());
} }
return _color; return c;
} }
void void

3
gtk2_ardour/route_ui.h
View file

@ -105,7 +105,8 @@ class RouteUI : public virtual AxisView
void request_redraw (); void request_redraw ();
virtual void set_color (const Gdk::Color & c); virtual void set_color (uint32_t c);
Gdk::Color route_color () const;
void choose_color (); void choose_color ();
bool ignore_toggle; bool ignore_toggle;