X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=bccf649b42df9f08220d1c28dfd7dbfe5e8ae621;hb=99d251de7d36d074f36ba5e8b549b0bf6a39016b;hp=a52271d0de9543b7956ef38aaa0262fbc0ad6257;hpb=b5c21e65fc236ea75bc00961941d80ea42c0fa61;p=ardour.git diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index a52271d0de..bccf649b42 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -17,24 +17,32 @@ */ +#include + +#include "gtkmm2ext/utils.h" + #include "ardour/route_group.h" -#include "ardour/session.h" + +#include "canvas/colors.h" + #include "mixer_group_tabs.h" #include "mixer_strip.h" #include "mixer_ui.h" +#include "rgb_macros.h" +#include "route_group_dialog.h" +#include "ui_config.h" #include "utils.h" + #include "i18n.h" -#include "route_group_dialog.h" using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; MixerGroupTabs::MixerGroupTabs (Mixer_UI* m) - : GroupTabs (0), - _mixer (m), - _menu (0) + : _mixer (m) { } @@ -55,6 +63,10 @@ MixerGroupTabs::compute_tabs () const MixerStrip* s = (*i)[_mixer->track_columns.strip]; + if (!s) { + continue; + } + if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) { continue; } @@ -69,10 +81,15 @@ MixerGroupTabs::compute_tabs () const tab.from = x; tab.group = g; - tab.colour = s->color (); + + if (g) { + tab.color = group_color (g); + } } - x += s->get_width (); + int ww = 0, wh = 0; + s->get_size_request (ww, wh); // widget may not be realized, get_width() is invalid. + x += ww; } if (tab.group) { @@ -86,28 +103,35 @@ MixerGroupTabs::compute_tabs () const void MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const { - double const arc_radius = _height; + double const arc_radius = get_height(); + double r, g, b, a; if (tab.group && tab.group->is_active()) { - cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.get_blue_p (), 1); + ArdourCanvas::color_to_rgba (tab.color, r, g, b, a); } else { - cairo_set_source_rgba (cr, 1, 1, 1, 0.2); + ArdourCanvas::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a); } - cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2); + a = 1.0; + + cairo_set_source_rgba (cr, r, g, b, a); + cairo_arc (cr, tab.from + arc_radius, get_height(), arc_radius, M_PI, 3 * M_PI / 2); cairo_line_to (cr, tab.to - arc_radius, 0); - cairo_arc (cr, tab.to - arc_radius, _height, arc_radius, 3 * M_PI / 2, 2 * M_PI); - cairo_line_to (cr, tab.from, _height); + cairo_arc (cr, tab.to - arc_radius, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI); + cairo_line_to (cr, tab.from, get_height()); cairo_fill (cr); if (tab.group) { - pair const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2); - + pair const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2); + cairo_text_extents_t ext; cairo_text_extents (cr, tab.group->name().c_str(), &ext); - - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2); + + ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a)); + ArdourCanvas::color_to_rgba (c, r, g, b, a); + + cairo_set_source_rgb (cr, r, g, b); + cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, get_height() - ext.height / 2); cairo_save (cr); cairo_show_text (cr, f.first.c_str()); cairo_restore (cr); @@ -131,9 +155,13 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const MixerStrip* s = (*i)[_mixer->track_columns.strip]; - if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) { - continue; - } + if (!s) { + continue; + } + + if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) { + continue; + } if (x >= t->to) { /* tab finishes before this track starts */ @@ -152,74 +180,21 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const return routes; } -Gtk::Menu* -MixerGroupTabs::get_menu (RouteGroup* g) +RouteList +MixerGroupTabs::selected_routes () const { - if (g == 0) { - return 0; + RouteList rl; + BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) { + boost::shared_ptr rp = r->route(); + if (rp) { + rl.push_back (rp); + } } - - using namespace Menu_Helpers; - - delete _menu; - _menu = new Menu; - - MenuList& items = _menu->items (); - items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::edit_group), g))); - items.push_back (MenuElem (_("Subgroup"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::make_subgroup), g))); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::remove_group), g))); - - return _menu; -} - -void -MixerGroupTabs::edit_group (RouteGroup* g) -{ - RouteGroupDialog d (g, Gtk::Stock::APPLY); - d.do_run (); -} - -void -MixerGroupTabs::remove_group (RouteGroup *g) -{ - _session->remove_route_group (*g); + return rl; } void -MixerGroupTabs::make_subgroup (RouteGroup* g) +MixerGroupTabs::sync_order_keys () { - g->make_subgroup (); -} - -void -MixerGroupTabs::destroy_subgroup (RouteGroup* g) -{ - g->destroy_subgroup (); -} - -ARDOUR::RouteGroup * -MixerGroupTabs::new_route_group () const -{ - PropertyList plist; - - plist.add (Properties::active, true); - plist.add (Properties::mute, true); - plist.add (Properties::solo, true); - plist.add (Properties::gain, true); - plist.add (Properties::recenable, true); - - RouteGroup* g = new RouteGroup (*_session, ""); - g->set_properties (plist); - - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); - - if (r != Gtk::RESPONSE_OK) { - delete g; - return 0; - } - - _session->add_route_group (g); - return g; + _mixer->sync_order_keys_from_treeview (); }