X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=2d33b54af358a312f2532ed75571bdcd4766991a;hb=d8425b4a0fc1a875a3f1fdff62e222386ce3f1b4;hp=566671f0271f09e1a9f81b1e20953635baeb1287;hpb=8e7a5d77414a40550a28d61abf6eeb1e89a1ec25;p=ardour.git diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 566671f027..2d33b54af3 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ */ +#include + #include "ardour/route_group.h" #include "ardour/session.h" #include "mixer_group_tabs.h" @@ -29,12 +31,12 @@ using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace PBD; MixerGroupTabs::MixerGroupTabs (Mixer_UI* m) - : _mixer (m), - _menu (0) + : _mixer (m) { - + } @@ -42,7 +44,7 @@ list MixerGroupTabs::compute_tabs () const { list tabs; - + Tab tab; tab.from = 0; tab.group = 0; @@ -53,7 +55,7 @@ MixerGroupTabs::compute_tabs () const MixerStrip* s = (*i)[_mixer->track_columns.strip]; - if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) { + if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) { continue; } @@ -62,14 +64,15 @@ MixerGroupTabs::compute_tabs () const if (g != tab.group) { if (tab.group) { tab.to = x; - tab.last_ui_size = s->get_width (); tabs.push_back (tab); } tab.from = x; tab.group = g; - tab.colour = s->color (); - tab.first_ui_size = s->get_width (); + + if (g) { + tab.color = group_color (g); + } } x += s->get_width (); @@ -86,30 +89,32 @@ 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(); - if (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); + if (tab.group && tab.group->is_active()) { + cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1); } else { cairo_set_source_rgba (cr, 1, 1, 1, 0.2); } - - cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2); + + 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); - pair const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2); + if (tab.group) { + pair const f = 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_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); - cairo_save (cr); - cairo_show_text (cr, f.first.c_str()); - cairo_restore (cr); + cairo_set_source_rgb (cr, 1, 1, 1); + 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); + } } double @@ -118,89 +123,73 @@ MixerGroupTabs::primary_coordinate (double x, double) const return x; } -void -MixerGroupTabs::reflect_tabs (list const & tabs) +RouteList +MixerGroupTabs::routes_for_tab (Tab const * t) const { - list::const_iterator j = tabs.begin (); - + RouteList routes; int32_t x = 0; + TreeModel::Children rows = _mixer->track_model->children (); for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) { MixerStrip* s = (*i)[_mixer->track_columns.strip]; - - if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) { - 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 */ + break; } - - if (j == tabs.end()) { - - /* already run out of tabs, so no edit group */ - s->route()->set_route_group (0, this); - - } else { - - if (x >= j->to) { - /* this tab finishes before this track starts, so onto the next tab */ - ++j; - } - - double const h = x + s->get_width() / 2; - - if (j->from < h && j->to > h) { - s->route()->set_route_group (j->group, this); - } else { - s->route()->set_route_group (0, this); - } - + + double const h = x + s->get_width() / 2; + + if (t->from < h && t->to > h) { + routes.push_back (s->route ()); } x += s->get_width (); } -} -Gtk::Menu* -MixerGroupTabs::get_menu (RouteGroup* g) -{ - if (g == 0) { - return 0; - } - - using namespace Menu_Helpers; - - delete _menu; - _menu = new Menu; - - MenuList& items = _menu->items (); - items.push_back (MenuElem (_("Edit..."), bind (mem_fun (*this, &MixerGroupTabs::edit_group), g))); - items.push_back (MenuElem (_("Subgroup"), bind (mem_fun (*this, &MixerGroupTabs::make_subgroup), g))); - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this, &MixerGroupTabs::remove_group), g))); - - return _menu; + return routes; } -void -MixerGroupTabs::edit_group (RouteGroup* g) +PropertyList +MixerGroupTabs::default_properties () const { - RouteGroupDialog d (g, Gtk::Stock::APPLY); - d.do_run (); + 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); + + return plist; } -void -MixerGroupTabs::remove_group (RouteGroup *g) +string +MixerGroupTabs::order_key () const { - _session->remove_route_group (*g); + return X_("signal"); } -void -MixerGroupTabs::make_subgroup (RouteGroup* g) +RouteList +MixerGroupTabs::selected_routes () const { - g->make_subgroup (); + RouteList rl; + BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) { + boost::shared_ptr rp = r->route(); + if (rp) { + rl.push_back (rp); + } + } + return rl; } void -MixerGroupTabs::destroy_subgroup (RouteGroup* g) +MixerGroupTabs::sync_order_keys () { - g->destroy_subgroup (); + _mixer->sync_order_keys (""); }