X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=6482abebc2ad7f653b8200635824c4a4a987790e;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=7ab162d3c862677a600e67d9938cc5872550d906;hpb=442eef90ab056ed373e8f5992602700a9f40cbe1;p=ardour.git diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 7ab162d3c8..6482abebc2 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,20 +17,28 @@ */ +#include + +#include "gtkmm2ext/utils.h" + #include "ardour/route_group.h" #include "ardour/session.h" #include "mixer_group_tabs.h" #include "mixer_strip.h" #include "mixer_ui.h" #include "utils.h" +#include "i18n.h" +#include "route_group_dialog.h" using namespace std; +using namespace Gtk; using namespace ARDOUR; +using namespace PBD; MixerGroupTabs::MixerGroupTabs (Mixer_UI* m) : _mixer (m) { - + } @@ -38,34 +46,38 @@ list MixerGroupTabs::compute_tabs () const { list tabs; - + Tab tab; tab.from = 0; tab.group = 0; int32_t x = 0; - for (list::iterator i = _mixer->strips.begin(); i != _mixer->strips.end(); ++i) { + 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 ((*i)->route()->is_master() || (*i)->route()->is_control() || !(*i)->marked_for_display()) { + if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) { continue; } - RouteGroup* g = (*i)->route_group (); + RouteGroup* g = s->route_group (); if (g != tab.group) { if (tab.group) { tab.to = x; - tab.last_ui_size = (*i)->get_width (); tabs.push_back (tab); } tab.from = x; tab.group = g; - tab.colour = (*i)->color (); - tab.first_ui_size = (*i)->get_width (); + + if (g) { + tab.color = group_color (g); + } } - x += (*i)->get_width (); + x += s->get_width (); } if (tab.group) { @@ -79,30 +91,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 = 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_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 @@ -111,41 +125,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; - for (list::iterator i = _mixer->strips.begin(); i != _mixer->strips.end(); ++i) { - if ((*i)->route()->is_master() || (*i)->route()->is_control() || !(*i)->marked_for_display()) { - continue; + 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_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 */ - (*i)->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 + (*i)->get_width() / 2; - - if (j->from < h && j->to > h) { - (*i)->route()->set_route_group (j->group, this); - } else { - (*i)->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 += (*i)->get_width (); + x += s->get_width (); + } + + return routes; +} + +PropertyList +MixerGroupTabs::default_properties () 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); + + return plist; +} + +string +MixerGroupTabs::order_key () const +{ + return X_("signal"); +} + +RouteList +MixerGroupTabs::selected_routes () const +{ + 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::sync_order_keys () +{ + _mixer->sync_order_keys (""); +}