X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.cc;h=1332d4ba10d7d81039a9ecd45a10cb187cd49277;hb=63b02a265a6d5e821198b5e3fcc1f6ba6d83a129;hp=e1ac807b8afc5ac54e00e8a7f409fa757f438f18;hpb=6df29331f7263f73d07b8814b02b7cbc9571fe4c;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index e1ac807b8a..1332d4ba10 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -27,12 +27,16 @@ #include "group_tabs.h" #include "keyboard.h" #include "i18n.h" +#include "ardour_ui.h" +#include "utils.h" using namespace std; using namespace Gtk; using namespace ARDOUR; using Gtkmm2ext::Keyboard; +list GroupTabs::_used_colors; + GroupTabs::GroupTabs () : _menu (0) , _dragging (0) @@ -52,7 +56,16 @@ GroupTabs::set_session (Session* s) SessionHandlePtr::set_session (s); if (_session) { - _session->RouteGroupChanged.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); + _session->RouteGroupPropertyChanged.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_group_property_changed, this, _1), gui_context() + ); + _session->RouteAddedToRouteGroup.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_added_to_route_group, this, _1, _2), gui_context() + ); + _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()); } } @@ -97,9 +110,10 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) list::iterator j = _tabs.insert (next, n); t = &(*j); } - + } else { _dragging_new_tab = false; + _initial_dragging_routes = routes_for_tab (t); } _dragging = t; @@ -120,11 +134,17 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else if (ev->button == 3) { RouteGroup* g = t ? t->group : 0; - Menu* m = get_menu (g); - if (m) { - m->popup (ev->button, ev->time); + + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) { + /* edit */ + RouteGroupDialog d (g, false); + d.do_run (); + } else { + Menu* m = get_menu (g); + if (m) { + m->popup (ev->button, ev->time); + } } - } return true; @@ -160,34 +180,23 @@ GroupTabs::on_motion_notify_event (GdkEventMotion* ev) bool -GroupTabs::on_button_release_event (GdkEventButton* ev) +GroupTabs::on_button_release_event (GdkEventButton*) { if (_dragging == 0) { return false; } - + if (!_drag_moved) { - + if (_dragging->group) { - - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - - /* edit */ - RouteGroupDialog d (_dragging->group, Gtk::Stock::APPLY); - d.do_run (); - - } else { - - /* toggle active state */ - _dragging->group->set_active (!_dragging->group->is_active (), this); - - } + /* 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 (); @@ -199,24 +208,28 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) } else { boost::shared_ptr r = _session->get_routes (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - - if (find (routes.begin(), routes.end(), *i) == routes.end()) { - /* this route is not on the list of those that should be in _dragging's group */ - if ((*i)->route_group() == _dragging->group) { - _dragging->group->remove (*i); - } - } else { + + 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) { _dragging->group->add (*i); } } } } - + set_dirty (); queue_draw (); } - + _dragging = 0; + _initial_dragging_routes.clear (); return true; } @@ -230,10 +243,12 @@ GroupTabs::render (cairo_t* cr) /* background */ - cairo_set_source_rgb (cr, 0, 0, 0); - cairo_rectangle (cr, 0, 0, _width, _height); - cairo_fill (cr); + Gdk::Color c = get_style()->get_base (Gtk::STATE_NORMAL); + 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) { @@ -244,8 +259,8 @@ GroupTabs::render (cairo_t* cr) /** Convert a click position to a tab. * @param c Click position. - * @param prev Filled in with the previous tab to the click, or 0. - * @param next Filled in with the next tab after the click, or 0. + * @param prev Filled in with the previous tab to the click, or _tabs.end(). + * @param next Filled in with the next tab after the click, or _tabs.end(). * @return Tab under the click, or 0. */ @@ -259,6 +274,7 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato while (i != _tabs.end()) { if (i->from > c) { + *next = i; break; } @@ -275,14 +291,6 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato ++i; } - if (i != _tabs.end()) { - *next = i; - - if (under) { - (*next)++; - } - } - return under; } @@ -303,26 +311,31 @@ GroupTabs::get_menu (RouteGroup* g) _menu->set_name ("ArdourContextMenu"); MenuList& items = _menu->items(); - items.push_back (MenuElem (_("New..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); - items.push_back (MenuElem (_("New From"), *new_from)); - + 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 (g) { - items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group), g))); - items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + 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()); + if (g->has_subgroup()) { + items.push_back (MenuElem (_("Remove Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::un_subgroup), g))); + } else { + items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + } 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 (MenuElem (_("Collect"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); } add_menu_items (_menu, g); - + items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Activate All"), sigc::mem_fun(*this, &GroupTabs::activate_all))); - items.push_back (MenuElem (_("Disable All"), sigc::mem_fun(*this, &GroupTabs::disable_all))); + 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 @@ -374,7 +387,6 @@ GroupTabs::new_from_soloed () } run_new_group_dialog (soloed); - } void @@ -383,19 +395,15 @@ GroupTabs::run_new_group_dialog (RouteList const & rl) RouteGroup* g = new RouteGroup (*_session, ""); g->apply_changes (default_properties ()); - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); + RouteGroupDialog d (g, true); - switch (r) { - case Gtk::RESPONSE_OK: - case Gtk::RESPONSE_ACCEPT: + 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); } - break; - default: - delete g; } } @@ -406,14 +414,13 @@ GroupTabs::create_and_add_group () const g->apply_changes (default_properties ()); - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); + RouteGroupDialog d (g, true); - if (r != Gtk::RESPONSE_OK) { + if (d.do_run ()) { delete g; return 0; } - + _session->add_route_group (g); return g; } @@ -421,7 +428,7 @@ GroupTabs::create_and_add_group () const void GroupTabs::edit_group (RouteGroup* g) { - RouteGroupDialog d (g, Gtk::Stock::APPLY); + RouteGroupDialog d (g, false); d.do_run (); } @@ -431,14 +438,30 @@ GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement) g->make_subgroup (aux, placement); } +void +GroupTabs::un_subgroup (RouteGroup* g) +{ + g->destroy_subgroup (); +} + struct CollectSorter { - CollectSorter (std::string const & key) : _key (key) {} - + CollectSorter (RouteSortOrderKey key) : _key (key) {} + bool operator () (boost::shared_ptr a, boost::shared_ptr b) { return a->order_key (_key) < b->order_key (_key); } - std::string _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. @@ -453,6 +476,7 @@ GroupTabs::collect (RouteGroup* g) RouteList::iterator i = group_routes->begin (); boost::shared_ptr routes = _session->get_routes (); + routes->sort (OrderSorter (order_key ())); RouteList::const_iterator j = routes->begin (); int diff = 0; @@ -476,9 +500,9 @@ GroupTabs::collect (RouteGroup* g) ++i; } else { - + (*j)->set_order_key (order_key (), k + diff); - + } ++j; @@ -508,9 +532,135 @@ GroupTabs::set_activation (RouteGroup* g, bool a) { g->set_active (a, this); } - + void GroupTabs::remove_group (RouteGroup* g) { _session->remove_route_group (*g); } + +/** Set the color of the tab of a route group */ +void +GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color) +{ + assert (group); + + /* 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); + } + + 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()); + 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); + + /* This is a bit of a hack, but this might change + our route's effective color, so emit gui_changed + for our routes. + */ + + emit_gui_changed_for_members (group); +} + +/** @return the ID string to use for the GUI state of a route group */ +string +GroupTabs::group_gui_id (RouteGroup* group) +{ + assert (group); + + char buf[64]; + snprintf (buf, sizeof (buf), "route_group %s", group->id().to_s().c_str ()); + + return buf; +} + +/** @return the color to use for a route group tab */ +Gdk::Color +GroupTabs::group_color (RouteGroup* group) +{ + assert (group); + + 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; + } + + Gdk::Color c; + + int r, g, b; + + sscanf (color.c_str(), "%d:%d:%d", &r, &g, &b); + + c.set_red (r); + c.set_green (g); + c.set_blue (b); + + return c; +} + +void +GroupTabs::route_group_property_changed (RouteGroup* rg) +{ + /* This is a bit of a hack, but this might change + our route's effective color, so emit gui_changed + for our routes. + */ + + emit_gui_changed_for_members (rg); + + set_dirty (); +} + +void +GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) +{ + /* Similarly-spirited hack as in route_group_property_changed */ + + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + r->gui_changed (X_("color"), 0); + + set_dirty (); +} + +void +GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w) +{ + /* Similarly-spirited hack as in route_group_property_changed */ + + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + r->gui_changed (X_("color"), 0); + + set_dirty (); +} + +void +GroupTabs::emit_gui_changed_for_members (RouteGroup* rg) +{ + for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) { + (*i)->gui_changed (X_("color"), 0); + } +}