From 9ea1e5bdeec4631823d51944201f562a05d2550a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 10 Aug 2022 21:11:52 -0600 Subject: [PATCH] move color utility functions from ARDOUR_UI_UTILS to Gtkmm2ext namespace (GUI) --- gtk2_ardour/audio_time_axis.cc | 5 +-- gtk2_ardour/cuebox_ui.cc | 4 +- gtk2_ardour/editor_route_groups.cc | 11 +++--- gtk2_ardour/group_tabs.cc | 2 +- gtk2_ardour/io_plugin_window.cc | 4 +- gtk2_ardour/loudness_dialog.cc | 6 +-- gtk2_ardour/luadialog.cc | 3 +- gtk2_ardour/midi_time_axis.cc | 4 +- gtk2_ardour/port_matrix_column_labels.cc | 4 +- gtk2_ardour/port_matrix_row_labels.cc | 7 ++-- gtk2_ardour/recorder_ui.cc | 5 ++- gtk2_ardour/region_list_base.cc | 6 +-- gtk2_ardour/route_group_dialog.cc | 8 ++-- gtk2_ardour/route_ui.cc | 6 +-- gtk2_ardour/streamview.cc | 5 +-- gtk2_ardour/stripable_colorpicker.cc | 18 ++++----- gtk2_ardour/transport_masters_dialog.cc | 6 +-- gtk2_ardour/trigger_master.cc | 5 +-- gtk2_ardour/trigger_ui.cc | 6 ++- gtk2_ardour/utils.cc | 50 ------------------------ gtk2_ardour/utils.h | 7 ---- gtk2_ardour/vca_master_strip.cc | 6 +-- gtk2_ardour/vca_time_axis.cc | 2 +- 23 files changed, 62 insertions(+), 118 deletions(-) diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 4784f68ac5..f269c47e29 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -39,6 +39,7 @@ #include "pbd/stl_delete.h" #include "pbd/memento_command.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/utils.h" @@ -60,14 +61,12 @@ #include "audio_region_view.h" #include "audio_streamview.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace ArdourWidgets; -using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Editing; @@ -92,7 +91,7 @@ AudioTimeAxisView::set_route (boost::shared_ptr rt) RouteTimeAxisView::set_route (rt); - _view->apply_color (gdk_color_to_rgba (color()), StreamView::RegionColor); + _view->apply_color (Gtkmm2ext::gdk_color_to_rgba (color()), StreamView::RegionColor); // Make sure things are sane... assert(!is_track() || is_audio_track()); diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc index 4533d015d8..cdd18b6562 100644 --- a/gtk2_ardour/cuebox_ui.cc +++ b/gtk2_ardour/cuebox_ui.cc @@ -339,7 +339,7 @@ CueBoxUI::set_all_colors (uint64_t idx) _color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_ACCEPT)); _color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL)); - Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(0xBEBEBEFF); + Gdk::Color c = Gtkmm2ext::gdk_color_from_rgba(0xBEBEBEFF); _color_dialog.get_color_selection()->set_previous_color (c); _color_dialog.get_color_selection()->set_current_color (c); @@ -347,7 +347,7 @@ CueBoxUI::set_all_colors (uint64_t idx) switch (_color_dialog.run()) { case Gtk::RESPONSE_ACCEPT: { c = _color_dialog.get_color_selection()->get_current_color(); - color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c); + color_t ct = Gtkmm2ext::gdk_color_to_rgba(c); TriggerList tl; get_slots(tl, idx); for (TriggerList::iterator t = tl.begin(); t != tl.end(); ++t) { diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 4c0f5c3720..6f64bba4e7 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -30,6 +30,7 @@ #include +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/cell_renderer_color_selector.h" @@ -50,13 +51,11 @@ #include "route_group_dialog.h" #include "route_time_axis.h" #include "time_axis_view.h" -#include "utils.h" #include "pbd/i18n.h" using namespace std; using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; using namespace ArdourWidgets; using namespace PBD; using namespace Gtk; @@ -274,7 +273,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) switch (color_dialog.run()) { case RESPONSE_ACCEPT: c = color_dialog.get_color_selection()->get_current_color(); - GroupTabs::set_group_color (group, gdk_color_to_rgba (c)); + GroupTabs::set_group_color (group, Gtkmm2ext::gdk_color_to_rgba (c)); break; default: @@ -404,7 +403,7 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel group->apply_changes (plist); - GroupTabs::set_group_color ((*iter)[_columns.routegroup], gdk_color_to_rgba ((*iter)[_columns.gdkcolor])); + GroupTabs::set_group_color ((*iter)[_columns.routegroup], Gtkmm2ext::gdk_color_to_rgba ((*iter)[_columns.gdkcolor])); } void @@ -427,7 +426,7 @@ EditorRouteGroups::add (RouteGroup* group) row[_columns.is_visible] = !group->is_hidden(); Gdk::Color c; - set_color_from_rgba (c, GroupTabs::group_color (group)); + Gtkmm2ext::set_color_from_rgba (c, GroupTabs::group_color (group)); row[_columns.gdkcolor] = c; _in_row_change = true; @@ -501,7 +500,7 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&) (*iter)[_columns.is_visible] = !group->is_hidden(); Gdk::Color c; - set_color_from_rgba (c, GroupTabs::group_color (group)); + Gtkmm2ext::set_color_from_rgba (c, GroupTabs::group_color (group)); (*iter)[_columns.gdkcolor] = c; break; diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index f390c6b28c..bb142a75f0 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -840,7 +840,7 @@ GroupTabs::group_color (RouteGroup* group) if (empty) { /* no color has yet been set, so use a random one */ - uint32_t c = gdk_color_to_rgba (unique_random_color (_used_colors)); + uint32_t c = Gtkmm2ext::gdk_color_to_rgba (unique_random_color (_used_colors)); set_group_color (group, c); return c; } diff --git a/gtk2_ardour/io_plugin_window.cc b/gtk2_ardour/io_plugin_window.cc index 61f3866e32..2f3ed9d1ad 100644 --- a/gtk2_ardour/io_plugin_window.cc +++ b/gtk2_ardour/io_plugin_window.cc @@ -28,6 +28,7 @@ #include "ardour/types.h" #include "ardour/user_bundle.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/menu_elems.h" #include "gtkmm2ext/utils.h" @@ -43,7 +44,6 @@ #include "plugin_selector.h" #include "plugin_ui.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" @@ -289,7 +289,7 @@ IOPluginWindow::IOPlugUI::IOPlugUI (boost::shared_ptr iop) _box.set_border_width (1); Gdk::Color bg; - ARDOUR_UI_UTILS::set_color_from_rgba (bg, UIConfiguration::instance ().color (X_("theme:bg1"))); + Gtkmm2ext::set_color_from_rgba (bg, UIConfiguration::instance ().color (X_("theme:bg1"))); _frame.modify_bg (STATE_NORMAL, bg); _frame.add (_box); diff --git a/gtk2_ardour/loudness_dialog.cc b/gtk2_ardour/loudness_dialog.cc index 3d0d501e1f..5cd7e4c457 100644 --- a/gtk2_ardour/loudness_dialog.cc +++ b/gtk2_ardour/loudness_dialog.cc @@ -806,9 +806,9 @@ LoudnessDialog::test_conformity () uint32_t c_warn = UIConfigurationBase::instance ().color ("alert:yellow"); // Warning / yellow uint32_t c_fail = UIConfigurationBase::instance ().color ("alert:red"); // Fail / red - Gdk::Color color_good = ARDOUR_UI_UTILS::gdk_color_from_rgba (c_good); - Gdk::Color color_warn = ARDOUR_UI_UTILS::gdk_color_from_rgba (c_warn); - Gdk::Color color_fail = ARDOUR_UI_UTILS::gdk_color_from_rgba (c_fail); + Gdk::Color color_good = Gtkmm2ext::gdk_color_from_rgba (c_good); + Gdk::Color color_warn = Gtkmm2ext::gdk_color_from_rgba (c_warn); + Gdk::Color color_fail = Gtkmm2ext::gdk_color_from_rgba (c_fail); for (size_t i = 1; i < n_pset; ++i) { CLoudnessPreset const& preset = _lp[i]; diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc index 333687e1bf..5d0b32869e 100644 --- a/gtk2_ardour/luadialog.cc +++ b/gtk2_ardour/luadialog.cc @@ -24,6 +24,7 @@ #include "ardour/dB.h" #include "ardour/rc_configuration.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/utils.h" #include "widgets/ardour_dropdown.h" @@ -184,7 +185,7 @@ public: return &_cs; } void assign (luabridge::LuaRef* rv) const { - uint32_t rgba = ARDOUR_UI_UTILS::gdk_color_to_rgba(_cs.get_color()); + uint32_t rgba = Gtkmm2ext::gdk_color_to_rgba(_cs.get_color()); (*rv)[_key] = rgba; } protected: diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 319c49a562..a572631ebc 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -46,6 +46,7 @@ #include "pbd/stateful_diff_command.h" #include "pbd/unwind.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/utils.h" @@ -97,7 +98,6 @@ #include "rgb_macros.h" #include "selection.h" #include "step_editor.h" -#include "utils.h" #include "note_base.h" #include "ardour/midi_track.h" @@ -166,7 +166,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) */ RouteTimeAxisView::set_route (rt); - _view->apply_color (ARDOUR_UI_UTILS::gdk_color_to_rgba (color()), StreamView::RegionColor); + _view->apply_color (Gtkmm2ext::gdk_color_to_rgba (color()), StreamView::RegionColor); _note_range_changed_connection.disconnect(); diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index 486798b430..dcf5303b6e 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -298,7 +298,7 @@ PortMatrixColumnLabels::render_bundle_name ( cairo_stroke (cr); Gdk::Color textcolor; - ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + Gtkmm2ext::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(Gtkmm2ext::gdk_color_to_rgba(bg_colour))); set_source_rgb (cr, textcolor); double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height; @@ -365,7 +365,7 @@ PortMatrixColumnLabels::render_channel_name ( } Gdk::Color textcolor; - ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + Gtkmm2ext::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(Gtkmm2ext::gdk_color_to_rgba(bg_colour))); set_source_rgb (cr, textcolor); double const q = ((grid_spacing() * sin (angle())) - _text_height) / 2 + _descender_height; diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc index c85d349a77..01b2dad759 100644 --- a/gtk2_ardour/port_matrix_row_labels.cc +++ b/gtk2_ardour/port_matrix_row_labels.cc @@ -22,10 +22,11 @@ #include #include #include + #include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" #include "gtkmm2ext/colors.h" -#include "utils.h" + #include "port_matrix_row_labels.h" #include "port_matrix_column_labels.h" #include "port_matrix.h" @@ -250,7 +251,7 @@ PortMatrixRowLabels::render_bundle_name ( double const off = (grid_spacing() - ext.height) / 2; Gdk::Color textcolor; - ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + Gtkmm2ext::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(Gtkmm2ext::gdk_color_to_rgba(bg_colour))); set_source_rgb (cr, textcolor); cairo_move_to (cr, rint (xoff + x + name_pad()), rint (yoff + name_pad() + off)); cairo_show_text (cr, b->name().c_str()); @@ -286,7 +287,7 @@ PortMatrixRowLabels::render_channel_name ( double const off = (grid_spacing() - ext.height) / 2; Gdk::Color textcolor; - ARDOUR_UI_UTILS::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(ARDOUR_UI_UTILS::gdk_color_to_rgba(bg_colour))); + Gtkmm2ext::set_color_from_rgba(textcolor, Gtkmm2ext::contrasting_text_color(Gtkmm2ext::gdk_color_to_rgba(bg_colour))); set_source_rgb (cr, textcolor); cairo_move_to (cr, rint (port_name_x() + xoff + name_pad()), rint (yoff + name_pad() + off)); cairo_show_text (cr, bc.bundle->channel_name(bc.channel).c_str()); diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc index a0a9ffd741..89afef6f4f 100644 --- a/gtk2_ardour/recorder_ui.cc +++ b/gtk2_ardour/recorder_ui.cc @@ -40,6 +40,7 @@ #include "ardour/session.h" #include "ardour/solo_mute_release.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/utils.h" @@ -1464,9 +1465,9 @@ RecorderUI::InputPort::InputPort (string const& name, DataType dt, RecorderUI* p Gdk::Color bg; if (_ioplug) { - ARDOUR_UI_UTILS::set_color_from_rgba (bg, UIConfiguration::instance ().color ("neutral:background")); + Gtkmm2ext::set_color_from_rgba (bg, UIConfiguration::instance ().color ("neutral:background")); } else { - ARDOUR_UI_UTILS::set_color_from_rgba (bg, UIConfiguration::instance ().color ("neutral:background2")); + Gtkmm2ext::set_color_from_rgba (bg, UIConfiguration::instance ().color ("neutral:background2")); } _frame.modify_bg (Gtk::STATE_NORMAL, bg); diff --git a/gtk2_ardour/region_list_base.cc b/gtk2_ardour/region_list_base.cc index ebfb6e185a..eff00884c5 100644 --- a/gtk2_ardour/region_list_base.cc +++ b/gtk2_ardour/region_list_base.cc @@ -37,6 +37,7 @@ #include "ardour/silentfilesource.h" #include "ardour/smf_source.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/treeutils.h" #include "gtkmm2ext/utils.h" @@ -51,7 +52,6 @@ #include "public_editor.h" #include "region_list_base.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" @@ -508,9 +508,9 @@ RegionListBase::populate_row (boost::shared_ptr region, TreeModel::Row c Gdk::Color c; bool missing_source = boost::dynamic_pointer_cast (region->source ()) != NULL; if (missing_source) { - set_color_from_rgba (c, UIConfiguration::instance ().color ("region list missing source")); + Gtkmm2ext::set_color_from_rgba (c, UIConfiguration::instance ().color ("region list missing source")); } else { - set_color_from_rgba (c, UIConfiguration::instance ().color ("region list whole file")); + Gtkmm2ext::set_color_from_rgba (c, UIConfiguration::instance ().color ("region list whole file")); } row[_columns.color_] = c; } diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc index b6d3c10ec9..7eb5bada51 100644 --- a/gtk2_ardour/route_group_dialog.cc +++ b/gtk2_ardour/route_group_dialog.cc @@ -28,15 +28,15 @@ #include #include +#include "gtkmm2ext/colors.h" + #include "route_group_dialog.h" #include "group_tabs.h" -#include "utils.h" #include "pbd/i18n.h" using namespace Gtk; using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; using namespace std; using namespace PBD; @@ -92,7 +92,7 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new) _active.set_active (_group->is_active ()); Gdk::Color c; - set_color_from_rgba (c, GroupTabs::group_color (_group)); + Gtkmm2ext::set_color_from_rgba (c, GroupTabs::group_color (_group)); _color.set_color (c); VBox* options_box = manage (new VBox); @@ -220,7 +220,7 @@ RouteGroupDialog::update () _group->apply_changes (plist); - GroupTabs::set_group_color (_group, gdk_color_to_rgba (_color.get_color ())); + GroupTabs::set_group_color (_group, Gtkmm2ext::gdk_color_to_rgba (_color.get_color ())); } void diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index bed678467a..c8990c1b5d 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -59,6 +59,7 @@ #include "ardour/solo_mute_release.h" #include "ardour/template_utils.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/doi.h" #include "gtkmm2ext/gtk_ui.h" @@ -88,7 +89,6 @@ #include "save_template_dialog.h" #include "timers.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" @@ -2239,9 +2239,9 @@ RouteUI::route_color () const string p; if (g && g->is_color()) { - set_color_from_rgba (c, GroupTabs::group_color (g)); + Gtkmm2ext::set_color_from_rgba (c, GroupTabs::group_color (g)); } else { - set_color_from_rgba (c, _route->presentation_info().color()); + Gtkmm2ext::set_color_from_rgba (c, _route->presentation_info().color()); } return c; diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 757e049162..9195482795 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -28,6 +28,7 @@ #include +#include #include #include @@ -51,13 +52,11 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" using namespace std; using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; @@ -343,7 +342,7 @@ StreamView::playlist_switched (boost::weak_ptr wtr) void StreamView::apply_color (Gdk::Color const& c, ColorTarget target) { - return apply_color (gdk_color_to_rgba (c), target); + return apply_color (Gtkmm2ext::gdk_color_to_rgba (c), target); } void diff --git a/gtk2_ardour/stripable_colorpicker.cc b/gtk2_ardour/stripable_colorpicker.cc index 883fa08ece..5ac4d7ae0d 100644 --- a/gtk2_ardour/stripable_colorpicker.cc +++ b/gtk2_ardour/stripable_colorpicker.cc @@ -18,15 +18,15 @@ #include "pbd/compose.h" +#include "gtkmm2ext/colors.h" + #include "public_editor.h" #include "stripable_colorpicker.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" using namespace Gtk; -using namespace ARDOUR_UI_UTILS; bool StripableColorDialog::palette_initialized = false; Gtk::ColorSelection::SlotChangePaletteHook StripableColorDialog::gtk_palette_changed_hook; @@ -113,7 +113,7 @@ StripableColorDialog::popup (const std::string& name, uint32_t color) get_color_selection()->set_has_opacity_control (false); get_color_selection()->set_has_palette (true); - Gdk::Color c = gdk_color_from_rgba (_initial_color); + Gdk::Color c = Gtkmm2ext::gdk_color_from_rgba (_initial_color); get_color_selection()->set_previous_color (c); get_color_selection()->set_current_color (c); @@ -147,13 +147,13 @@ StripableColorDialog::finish_color_edit (int response) ARDOUR::RouteList rl = PublicEditor::instance().get_selection().tracks.routelist(); if (response == RESPONSE_OK) { - ColorChanged (gdk_color_to_rgba (get_color_selection()->get_current_color())); /* EMIT SIGNAL */ + ColorChanged (Gtkmm2ext::gdk_color_to_rgba (get_color_selection()->get_current_color())); /* EMIT SIGNAL */ } if (_stripable && response == RESPONSE_OK) { for (ARDOUR::RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { - (*i)->presentation_info().set_color (gdk_color_to_rgba (get_color_selection()->get_current_color())); + (*i)->presentation_info().set_color (Gtkmm2ext::gdk_color_to_rgba (get_color_selection()->get_current_color())); } - _stripable->presentation_info().set_color (gdk_color_to_rgba (get_color_selection()->get_current_color())); + _stripable->presentation_info().set_color (Gtkmm2ext::gdk_color_to_rgba (get_color_selection()->get_current_color())); } else if (_stripable) { _stripable->presentation_info().set_color (_initial_color); } @@ -164,7 +164,7 @@ void StripableColorDialog::color_changed () { if (_stripable) { - _stripable->presentation_info().set_color (gdk_color_to_rgba (get_color_selection()->get_current_color())); + _stripable->presentation_info().set_color (Gtkmm2ext::gdk_color_to_rgba (get_color_selection()->get_current_color())); } } @@ -177,7 +177,7 @@ ArdourColorButton::ArdourColorButton () void ArdourColorButton::on_clicked () { - _color_picker.popup ("", gdk_color_to_rgba (get_color ())); + _color_picker.popup ("", Gtkmm2ext::gdk_color_to_rgba (get_color ())); _color_picker.get_window ()->set_transient_for (get_window ()); } @@ -185,7 +185,7 @@ void ArdourColorButton::color_selected (uint32_t color) { Gdk::Color c; - set_color_from_rgba (c, color); + Gtkmm2ext::set_color_from_rgba (c, color); set_color (c); g_signal_emit_by_name (GTK_WIDGET(gobj()), "color-set", 0); } diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc index 61404fc66a..ff637e37dc 100644 --- a/gtk2_ardour/transport_masters_dialog.cc +++ b/gtk2_ardour/transport_masters_dialog.cc @@ -30,6 +30,7 @@ #include "widgets/tooltips.h" #include "widgets/ardour_icon.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/gui_thread.h" @@ -37,7 +38,6 @@ #include "floating_text_entry.h" #include "transport_masters_dialog.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" @@ -331,8 +331,8 @@ TransportMastersWidget::Row::Row (TransportMastersWidget& p) uint32_t bg = UIConfigurationBase::instance().color ("clock: background"); uint32_t fg = UIConfigurationBase::instance().color ("clock: text"); - Gdk::Color bg_color = ARDOUR_UI_UTILS::gdk_color_from_rgba (bg); - Gdk::Color fg_color = ARDOUR_UI_UTILS::gdk_color_from_rgba (fg); + Gdk::Color bg_color = Gtkmm2ext::gdk_color_from_rgba (bg); + Gdk::Color fg_color = Gtkmm2ext::gdk_color_from_rgba (fg); current_box.modify_bg (Gtk::STATE_NORMAL, bg_color); current.modify_fg (Gtk::STATE_NORMAL, fg_color); diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc index e86d54ee28..ee19c47506 100644 --- a/gtk2_ardour/trigger_master.cc +++ b/gtk2_ardour/trigger_master.cc @@ -43,7 +43,6 @@ #include "trigger_master.h" #include "trigger_ui.h" #include "ui_config.h" -#include "utils.h" #include "pbd/i18n.h" @@ -376,7 +375,7 @@ TriggerMaster::set_all_colors () _color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_ACCEPT)); _color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL)); - Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(0xBEBEBEFF); + Gdk::Color c = Gtkmm2ext::gdk_color_from_rgba(0xBEBEBEFF); _color_dialog.get_color_selection()->set_previous_color (c); _color_dialog.get_color_selection()->set_current_color (c); @@ -384,7 +383,7 @@ TriggerMaster::set_all_colors () switch (_color_dialog.run()) { case Gtk::RESPONSE_ACCEPT: { c = _color_dialog.get_color_selection()->get_current_color(); - color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c); + color_t ct = Gtkmm2ext::gdk_color_to_rgba(c); for (int n = 0; n < default_triggers_per_box; n++) { _triggerbox->trigger (n)->set_color(ct); } diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc index 2baac1caa5..3b682cd1b3 100644 --- a/gtk2_ardour/trigger_ui.cc +++ b/gtk2_ardour/trigger_ui.cc @@ -37,6 +37,8 @@ #include "ardour/region.h" #include "ardour/triggerbox.h" +#include "gtkmm2ext/colors.h" + #include "slot_properties_box.h" #include "ardour_ui.h" @@ -183,7 +185,7 @@ TriggerUI::choose_color () _color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_ACCEPT)); _color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (_color_dialog, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL)); - Gdk::Color c = ARDOUR_UI_UTILS::gdk_color_from_rgba(trigger()->color()); + Gdk::Color c = Gtkmm2ext::gdk_color_from_rgba(trigger()->color()); _color_dialog.get_color_selection()->set_previous_color (c); _color_dialog.get_color_selection()->set_current_color (c); @@ -191,7 +193,7 @@ TriggerUI::choose_color () switch (_color_dialog.run()) { case Gtk::RESPONSE_ACCEPT: { c = _color_dialog.get_color_selection()->get_current_color(); - color_t ct = ARDOUR_UI_UTILS::gdk_color_to_rgba(c); + color_t ct = Gtkmm2ext::gdk_color_to_rgba(c); trigger()->set_color(ct); } break; default: diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 0e8b054427..33434c0f70 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -70,7 +70,6 @@ #include "keyboard.h" #include "utils.h" #include "pbd/i18n.h" -#include "rgb_macros.h" #include "gui_thread.h" #include "ui_config.h" #include "ardour_dialog.h" @@ -314,55 +313,6 @@ ARDOUR_UI_UTILS::get_font_for_style (string widgetname) return Pango::FontDescription (pfd); /* make a copy */ } -Gdk::Color -ARDOUR_UI_UTILS::gdk_color_from_rgb (uint32_t rgb) -{ - Gdk::Color c; - set_color_from_rgb (c, rgb); - return c; -} - -Gdk::Color -ARDOUR_UI_UTILS::gdk_color_from_rgba (uint32_t rgba) -{ - Gdk::Color c; - set_color_from_rgb (c, rgba >> 8); - return c; -} - -void -ARDOUR_UI_UTILS::set_color_from_rgb (Gdk::Color& c, uint32_t rgb) -{ - /* Gdk::Color color ranges are 16 bit, so scale from 8 bit by - multiplying by 256. - */ - c.set_rgb ((rgb >> 16)*256, ((rgb & 0xff00) >> 8)*256, (rgb & 0xff)*256); -} - -void -ARDOUR_UI_UTILS::set_color_from_rgba (Gdk::Color& c, uint32_t rgba) -{ - /* Gdk::Color color ranges are 16 bit, so scale from 8 bit by - multiplying by 256. - */ - c.set_rgb ((rgba >> 24)*256, ((rgba & 0xff0000) >> 16)*256, ((rgba & 0xff00) >> 8)*256); -} - -uint32_t -ARDOUR_UI_UTILS::gdk_color_to_rgba (Gdk::Color const& c) -{ - /* since alpha value is not available from a Gdk::Color, it is - hardcoded as 0xff (aka 255 or 1.0) - */ - - const uint32_t r = c.get_red_p () * 255.0; - const uint32_t g = c.get_green_p () * 255.0; - const uint32_t b = c.get_blue_p () * 255.0; - const uint32_t a = 0xff; - - return RGBA_TO_UINT (r,g,b,a); -} - bool ARDOUR_UI_UTILS::relay_key_press (GdkEventKey* ev, Gtk::Window* win) { diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 587e7769fe..6026bd622a 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -79,13 +79,6 @@ Pango::FontDescription get_font_for_style (std::string widgetname); void decorate (Gtk::Window& w, Gdk::WMDecoration d); -Gdk::Color gdk_color_from_rgb (uint32_t); -Gdk::Color gdk_color_from_rgba (uint32_t); -uint32_t gdk_color_to_rgba (Gdk::Color const&); - -void set_color_from_rgb (Gdk::Color&, uint32_t); -void set_color_from_rgba (Gdk::Color&, uint32_t); - bool relay_key_press (GdkEventKey* ev, Gtk::Window* win); bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev); bool emulate_key_event (unsigned int); diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index faeba8dac8..a730090252 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -27,6 +27,7 @@ #include "ardour/vca.h" #include "ardour/vca_manager.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/doi.h" #include "gtkmm2ext/keyboard.h" #include "widgets/tooltips.h" @@ -37,7 +38,6 @@ #include "gui_thread.h" #include "mixer_ui.h" #include "ui_config.h" -#include "utils.h" #include "vca_master_strip.h" #include "pbd/i18n.h" @@ -62,7 +62,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) /* set color for the VCA, if not already done. */ if (!_vca->presentation_info().color_set()) { - _vca->presentation_info().set_color (ARDOUR_UI_UTILS::gdk_color_to_rgba (unique_random_color())); + _vca->presentation_info().set_color (Gtkmm2ext::gdk_color_to_rgba (unique_random_color())); } control_slave_ui.set_stripable (boost::dynamic_pointer_cast (v)); @@ -554,7 +554,7 @@ VCAMasterStrip::drop_all_slaves () Gdk::Color VCAMasterStrip::color () const { - return ARDOUR_UI_UTILS::gdk_color_from_rgba (_vca->presentation_info().color ()); + return Gtkmm2ext::gdk_color_from_rgba (_vca->presentation_info().color ()); } string diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc index 0eff22c3b5..a548458911 100644 --- a/gtk2_ardour/vca_time_axis.cc +++ b/gtk2_ardour/vca_time_axis.cc @@ -350,7 +350,7 @@ VCATimeAxisView::stripable () const Gdk::Color VCATimeAxisView::color () const { - return ARDOUR_UI_UTILS::gdk_color_from_rgb (_vca->presentation_info().color ()); + return Gtkmm2ext::gdk_color_from_rgb (_vca->presentation_info().color ()); } void