X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.cc;h=03a557a03ba22d1cb8f7bcf9166d795ec0dcef89;hb=419006dd834827f22be9a73753c2355214b3cdc9;hp=b8d30dc989809eced10d35f5750c40304c040c58;hpb=bf0f4fe07769718b70e65fb78830fb3b951148ac;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index b8d30dc989..03a557a03b 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -18,21 +18,29 @@ */ #include + #include "ardour/session.h" #include "ardour/route_group.h" #include "ardour/route.h" +#include "ardour/vca_manager.h" +#include "ardour/vca.h" + +#include "gtkmm2ext/doi.h" #include "gui_thread.h" #include "route_group_dialog.h" #include "group_tabs.h" #include "keyboard.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "ardour_ui.h" +#include "rgb_macros.h" +#include "ui_config.h" #include "utils.h" using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using Gtkmm2ext::Keyboard; list GroupTabs::_used_colors; @@ -43,6 +51,7 @@ GroupTabs::GroupTabs () , _dragging_new_tab (0) { add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &GroupTabs::queue_draw)); } GroupTabs::~GroupTabs () @@ -65,8 +74,8 @@ GroupTabs::set_session (Session* s) _session->RouteRemovedFromRouteGroup.connect ( _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_removed_from_route_group, this, _1, _2), gui_context() ); - - _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); + + _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this, (cairo_rectangle_t*)0), gui_context()); } } @@ -134,13 +143,13 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else if (ev->button == 3) { RouteGroup* g = t ? t->group : 0; - - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) { - /* edit */ - RouteGroupDialog d (g, false); - d.do_run (); + + if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) && g) { + remove_group (g); + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) { + edit_group (g); } else { - Menu* m = get_menu (g); + Menu* m = get_menu (g, true); if (m) { m->popup (ev->button, ev->time); } @@ -187,36 +196,31 @@ GroupTabs::on_button_release_event (GdkEventButton*) if (_dragging == 0) { return false; } - + if (!_drag_moved) { - + if (_dragging->group) { /* toggle active state */ _dragging->group->set_active (!_dragging->group->is_active (), this); } - + } else { /* finish drag */ RouteList routes = routes_for_tab (_dragging); - + if (!routes.empty()) { if (_dragging_new_tab) { - RouteGroup* g = create_and_add_group (); - if (g) { - for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) { - g->add (*i); - } - } + run_new_group_dialog (&routes, false); } else { boost::shared_ptr r = _session->get_routes (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - + bool const was_in_tab = find ( _initial_dragging_routes.begin(), _initial_dragging_routes.end(), *i ) != _initial_dragging_routes.end (); - + bool const now_in_tab = find (routes.begin(), routes.end(), *i) != routes.end(); - + if (was_in_tab && !now_in_tab) { _dragging->group->remove (*i); } else if (!was_in_tab && now_in_tab) { @@ -225,11 +229,11 @@ GroupTabs::on_button_release_event (GdkEventButton*) } } } - + set_dirty (); queue_draw (); } - + _dragging = 0; _initial_dragging_routes.clear (); @@ -237,7 +241,7 @@ GroupTabs::on_button_release_event (GdkEventButton*) } void -GroupTabs::render (cairo_t* cr) +GroupTabs::render (cairo_t* cr, cairo_rectangle_t*) { if (_dragging == 0) { _tabs = compute_tabs (); @@ -250,7 +254,7 @@ GroupTabs::render (cairo_t* cr) cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); cairo_rectangle (cr, 0, 0, get_width(), get_height()); cairo_fill (cr); - + /* tabs */ for (list::const_iterator i = _tabs.begin(); i != _tabs.end(); ++i) { @@ -296,31 +300,73 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato return under; } +void +GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items) +{ + using namespace Menu_Helpers; + Menu *new_from; + + new_from = new Menu; + { + MenuList& f = new_from->items (); + f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), false))); + f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), false))); + f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), false))); + } + items.push_back (MenuElem (_("Create New Group From..."), *new_from)); + + new_from = new Menu; + { + MenuList& f = new_from->items (); + f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), true))); + f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), true))); + f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), true))); + } + items.push_back (MenuElem (_("Create New Group with Master From..."), *new_from)); +} + Gtk::Menu* -GroupTabs::get_menu (RouteGroup* g) +GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) { using namespace Menu_Helpers; delete _menu; - Menu* new_from = new Menu; - MenuList& f = new_from->items (); - f.push_back (MenuElem (_("Selection..."), sigc::mem_fun (*this, &GroupTabs::new_from_selection))); - f.push_back (MenuElem (_("Record Enabled..."), sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled))); - f.push_back (MenuElem (_("Soloed..."), sigc::mem_fun (*this, &GroupTabs::new_from_soloed))); - _menu = new Menu; _menu->set_name ("ArdourContextMenu"); + MenuList& items = _menu->items(); + Menu* vca_menu; + + const VCAList vcas = _session->vca_manager().vcas (); - items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); - items.push_back (MenuElem (_("Create New Group From"), *new_from)); + if (!in_tab_area) { + /* context menu is not for a group tab, show the "create new + from" items here + */ + add_new_from_items (items); + } if (g) { + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Edit Group..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group), g))); items.push_back (MenuElem (_("Collect Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); items.push_back (MenuElem (_("Remove Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); + items.push_back (SeparatorElem()); + + vca_menu = new Menu; + MenuList& f (vca_menu->items()); + f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), 0, g, true))); + + for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) { + f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true))); + } + items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu)); + + + items.push_back (SeparatorElem()); + if (g->has_subgroup()) { items.push_back (MenuElem (_("Remove Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::un_subgroup), g))); } else { @@ -328,51 +374,160 @@ GroupTabs::get_menu (RouteGroup* g) } items.push_back (MenuElem (_("Add New Aux Bus (pre-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PreFader))); items.push_back (MenuElem (_("Add New Aux Bus (post-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PostFader))); + items.push_back (SeparatorElem()); + } add_menu_items (_menu, g); + if (in_tab_area) { + /* context menu is for a group tab, show the "create new + from" items here + */ + add_new_from_items (items); + } + + items.push_back (SeparatorElem()); + + vca_menu = new Menu; + { + MenuList& f (vca_menu->items()); + f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); + for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) { + f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), (*v)->number()))); + } + } + + items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu)); + + vca_menu = new Menu; + { + MenuList& f (vca_menu->items()); + f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), 0))); + for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) { + f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), (*v)->number()))); + } + + } + items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu)); + + vca_menu = new Menu; + { + MenuList& f (vca_menu->items()); + f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), 0))); + for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) { + f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), (*v)->number()))); + } + + } + items.push_back (MenuElem (_("Assign Soloed to VCA..."), *vca_menu)); + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Enable All Groups"), sigc::mem_fun(*this, &GroupTabs::activate_all))); items.push_back (MenuElem (_("Disable All Groups"), sigc::mem_fun(*this, &GroupTabs::disable_all))); return _menu; - } void -GroupTabs::new_from_selection () +GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const { - RouteList rl = selected_routes (); - if (rl.empty()) { + if (!_session || !group) { + return; + } + + boost::shared_ptr master; + + if (which == 0) { + if (_session->vca_manager().create_vca (1)) { + /* error */ + return; + } + + /* VCAs use 1-based counting. Get most recently created VCA... */ + which = _session->vca_manager().n_vcas(); + } + + master = _session->vca_manager().vca_by_number (which); + + if (!master) { + /* should never happen; if it does, basically something deeply + odd happened, no reason to tell user because there's no + sensible explanation. + */ return; } - run_new_group_dialog (rl); + group->assign_master (master); + + if (rename_master){ + master->set_name (group->name()); + } } void -GroupTabs::new_from_rec_enabled () +GroupTabs::assign_some_to_master (uint32_t which, RouteList rl) { - boost::shared_ptr rl = _session->get_routes (); + if (!_session) { + return; + } - RouteList rec_enabled; + boost::shared_ptr master; - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - if ((*i)->record_enabled()) { - rec_enabled.push_back (*i); + if (which == 0) { + if (_session->vca_manager().create_vca (1)) { + /* error */ + return; } + + /* VCAs use 1-based counting. Get most recently created VCA... */ + which = _session->vca_manager().n_vcas(); } - if (rec_enabled.empty()) { + master = _session->vca_manager().vca_by_number (which); + + if (!master) { + /* should never happen; if it does, basically something deeply + odd happened, no reason to tell user because there's no + sensible explanation. + */ return; } - run_new_group_dialog (rec_enabled); + + if (rl.empty()) { + return; + } + + for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) { + (*r)->assign (master, false); + } } -void -GroupTabs::new_from_soloed () +RouteList +GroupTabs::get_rec_enabled () +{ + RouteList rec_enabled; + + if (!_session) { + return rec_enabled; + } + + boost::shared_ptr rl = _session->get_routes (); + + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + boost::shared_ptr trk (boost::dynamic_pointer_cast (*i)); + if (trk && trk->rec_enable_control()->get_value()) { + rec_enabled.push_back (*i); + } + } + + return rec_enabled; +} + + +RouteList +GroupTabs::get_soloed () { boost::shared_ptr rl = _session->get_routes (); @@ -384,54 +539,102 @@ GroupTabs::new_from_soloed () } } - if (soloed.empty()) { - return; - } + return soloed; +} - run_new_group_dialog (soloed); +void +GroupTabs::assign_selection_to_master (uint32_t which) +{ + assign_some_to_master (which, selected_routes ()); } void -GroupTabs::run_new_group_dialog (RouteList const & rl) +GroupTabs::assign_recenabled_to_master (uint32_t which) { - RouteGroup* g = new RouteGroup (*_session, ""); - g->apply_changes (default_properties ()); + assign_some_to_master (which, get_rec_enabled()); +} + +void +GroupTabs::assign_soloed_to_master (uint32_t which) +{ + assign_some_to_master (which, get_soloed()); +} - RouteGroupDialog d (g, true); +void +GroupTabs::new_from_selection (bool with_master) +{ + RouteList rl (selected_routes()); + run_new_group_dialog (&rl, with_master); +} - if (d.do_run ()) { - delete g; - } else { - _session->add_route_group (g); - for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) { - g->add (*i); - } - } +void +GroupTabs::new_from_rec_enabled (bool with_master) +{ + RouteList rl (get_rec_enabled()); + run_new_group_dialog (&rl, with_master); } -RouteGroup * -GroupTabs::create_and_add_group () const +void +GroupTabs::new_from_soloed (bool with_master) { + RouteList rl (get_soloed()); + run_new_group_dialog (&rl, with_master); +} + +void +GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master) +{ + if (rl && rl->empty()) { + return; + } + RouteGroup* g = new RouteGroup (*_session, ""); + RouteGroupDialog* d = new RouteGroupDialog (g, true); - g->apply_changes (default_properties ()); + d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_group_dialog_finished), d, rl ? new RouteList (*rl): 0, with_master)); + d->present (); +} - RouteGroupDialog d (g, true); +void +GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const +{ + if (r == RESPONSE_OK) { - if (d.do_run ()) { - delete g; - return 0; + if (!d->name_check()) { + return; + } + + _session->add_route_group (d->group()); + + if (rl) { + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + d->group()->add (*i); + } + + if (with_master) { + assign_group_to_master (0, d->group(), true); /* zero => new master */ + } + } + } else { + delete d->group (); } - _session->add_route_group (g); - return g; + delete rl; + delete_when_idle (d); } void GroupTabs::edit_group (RouteGroup* g) { - RouteGroupDialog d (g, false); - d.do_run (); + RouteGroupDialog* d = new RouteGroupDialog (g, false); + d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group_dialog_finished), d)); + d->present (); +} + +void +GroupTabs::edit_group_dialog_finished (int r, RouteGroupDialog* d) const +{ + delete_when_idle (d); } void @@ -446,26 +649,6 @@ GroupTabs::un_subgroup (RouteGroup* g) g->destroy_subgroup (); } -struct CollectSorter { - CollectSorter (RouteSortOrderKey key) : _key (key) {} - - bool operator () (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key (_key) < b->order_key (_key); - } - - RouteSortOrderKey _key; -}; - -struct OrderSorter { - OrderSorter (RouteSortOrderKey key) : _key (key) {} - - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key (_key) < b->order_key (_key); - } - - RouteSortOrderKey _key; -}; - /** Collect all members of a RouteGroup so that they are together in the Editor or Mixer. * @param g Group to collect. */ @@ -473,19 +656,22 @@ void GroupTabs::collect (RouteGroup* g) { boost::shared_ptr group_routes = g->route_list (); - group_routes->sort (CollectSorter (order_key ())); + group_routes->sort (Stripable::PresentationOrderSorter()); int const N = group_routes->size (); RouteList::iterator i = group_routes->begin (); boost::shared_ptr routes = _session->get_routes (); - routes->sort (OrderSorter (order_key ())); + routes->sort (Stripable::PresentationOrderSorter()); RouteList::const_iterator j = routes->begin (); int diff = 0; int coll = -1; + + PresentationInfo::ChangeSuspender cs; + while (i != group_routes->end() && j != routes->end()) { - int const k = (*j)->order_key (order_key ()); + PresentationInfo::order_t const k = (*j)->presentation_info ().order(); if (*i == *j) { @@ -496,21 +682,19 @@ GroupTabs::collect (RouteGroup* g) --diff; } - (*j)->set_order_key (order_key (), coll); + (*j)->set_presentation_order (coll); ++coll; ++i; } else { - (*j)->set_order_key (order_key (), k + diff); + (*j)->set_presentation_order (k + diff); } ++j; } - - sync_order_keys (); } void @@ -538,28 +722,47 @@ GroupTabs::set_activation (RouteGroup* g, bool a) void GroupTabs::remove_group (RouteGroup* g) { + RouteList rl (*(g->route_list().get())); _session->remove_route_group (*g); + + PresentationInfo::ChangeSuspender cs; + + for (RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { + (*i)->presentation_info().PropertyChanged (Properties::color); + } } /** Set the color of the tab of a route group */ void -GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color) +GroupTabs::set_group_color (RouteGroup* group, uint32_t color) { assert (group); + uint32_t r, g, b, a; + + UINT_TO_RGBA (color, &r, &g, &b, &a); /* Hack to disallow black route groups; force a dark grey instead */ - if (color.get_red() == 0 && color.get_green() == 0 && color.get_blue() == 0) { - color.set_grey_p (0.1); + const uint32_t dark_gray = 25; + + if (r < dark_gray && g < dark_gray && b < dark_gray) { + r = dark_gray; + g = dark_gray; + b = dark_gray; } - + GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; char buf[64]; - snprintf (buf, sizeof (buf), "%d:%d:%d", color.get_red(), color.get_green(), color.get_blue()); + + /* for historical reasons the colors must be stored as 16 bit color + * values. Ugh. + */ + + snprintf (buf, sizeof (buf), "%d:%d:%d", (r<<8), (g<<8), (b<<8)); gui_state.set_property (group_gui_id (group), "color", buf); - + /* the group color change notification */ - + PBD::PropertyChange change; change.add (Properties::color); group->PropertyChanged (change); @@ -585,35 +788,35 @@ GroupTabs::group_gui_id (RouteGroup* group) } /** @return the color to use for a route group tab */ -Gdk::Color +uint32_t GroupTabs::group_color (RouteGroup* group) { assert (group); - - GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; + GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; string const gui_id = group_gui_id (group); - bool empty; string const color = gui_state.get_string (gui_id, "color", &empty); + if (empty) { /* no color has yet been set, so use a random one */ - Gdk::Color const color = unique_random_color (_used_colors); - set_group_color (group, color); - return color; + uint32_t c = gdk_color_to_rgba (unique_random_color (_used_colors)); + set_group_color (group, c); + return c; } - Gdk::Color c; - int r, g, b; + /* for historical reasons, colors are stored as 16 bit values. + */ + sscanf (color.c_str(), "%d:%d:%d", &r, &g, &b); - c.set_red (r); - c.set_green (g); - c.set_blue (b); - - return c; + r /= 256; + g /= 256; + b /= 256; + + return RGBA_TO_UINT (r, g, b, 255); } void @@ -625,7 +828,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg) */ emit_gui_changed_for_members (rg); - + set_dirty (); } @@ -639,7 +842,7 @@ GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) return; } - r->gui_changed (X_("color"), 0); + r->presentation_info().PropertyChanged (Properties::color); set_dirty (); } @@ -654,7 +857,7 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w return; } - r->gui_changed (X_("color"), 0); + r->presentation_info().PropertyChanged (Properties::color); set_dirty (); } @@ -662,7 +865,9 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w void GroupTabs::emit_gui_changed_for_members (RouteGroup* rg) { + PresentationInfo::ChangeSuspender cs; + for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) { - (*i)->gui_changed (X_("color"), 0); + (*i)->presentation_info().PropertyChanged (Properties::color); } }