X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.cc;h=63d8d5925691cdf4ad4c4d599790b72b948c47f3;hb=1f6c54a2f053caa8afec70f2acffdb7f7d73f09f;hp=91e865069c74e97bb1142467872b45e6e5483298;hpb=b81fec9d58e18785494c4c554c1c5eac80417860;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 91e865069c..63d8d59256 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -25,11 +25,13 @@ #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" @@ -84,9 +86,8 @@ GroupTabs::set_session (Session* s) void GroupTabs::on_size_request (Gtk::Requisition *req) { - /* Use a dummy, small width and the actual height that we want */ - req->width = 16; - req->height = 16; + req->width = std::max (16.f, rintf (16.f * UIConfiguration::instance().get_ui_scale())); + req->height = std::max (16.f, rintf (16.f * UIConfiguration::instance().get_ui_scale())); } bool @@ -142,10 +143,10 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) 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, true); if (m) { @@ -208,12 +209,7 @@ GroupTabs::on_button_release_event (GdkEventButton*) 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) { @@ -244,8 +240,9 @@ GroupTabs::on_button_release_event (GdkEventButton*) } void -GroupTabs::render (cairo_t* cr, cairo_rectangle_t*) +GroupTabs::render (Cairo::RefPtr const& ctx, cairo_rectangle_t*) { + cairo_t* cr = ctx->cobj(); if (_dragging == 0) { _tabs = compute_tabs (); } @@ -309,7 +306,7 @@ GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items) using namespace Menu_Helpers; Menu *new_from; - new_from = new Menu; + new_from = manage (new Menu); { MenuList& f = new_from->items (); f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), false))); @@ -318,7 +315,7 @@ GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items) } items.push_back (MenuElem (_("Create New Group From..."), *new_from)); - new_from = new Menu; + new_from = manage (new Menu); { MenuList& f = new_from->items (); f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), true))); @@ -344,9 +341,6 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) const VCAList vcas = _session->vca_manager().vcas (); if (!in_tab_area) { - 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 with Control Master ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group_with_master)))); - /* context menu is not for a group tab, show the "create new from" items here */ @@ -361,15 +355,18 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) 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))); + if (g->has_control_master()) { + items.push_back (MenuElem (_("Drop Group from VCA..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::unassign_group_to_master), g->group_master_number(), g))); + } else { + vca_menu = manage (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 (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g))); + 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 (MenuElem (_("Assign Group to Control Master..."), *vca_menu)); - items.push_back (SeparatorElem()); @@ -395,38 +392,38 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) items.push_back (SeparatorElem()); - vca_menu = new Menu; + vca_menu = manage (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 (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), (*v)->number()))); + 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 Control Master..."), *vca_menu)); + items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu)); - vca_menu = new Menu; + vca_menu = manage (new Menu); { MenuList& f (vca_menu->items()); - f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); + 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 (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), (*v)->number()))); + 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 Control Master..."), *vca_menu)); + items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu)); - vca_menu = new Menu; + vca_menu = manage (new Menu); { MenuList& f (vca_menu->items()); - f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); + 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 (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), (*v)->number()))); + 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 Control Master..."))); + 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))); @@ -436,7 +433,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) } void -GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group) +GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const { if (!_session || !group) { return; @@ -450,8 +447,8 @@ GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group) return; } - /* VCAs use 1-based counting. Get most recently created VCA... */ - which = _session->vca_manager().n_vcas(); + /* Get most recently created VCA... */ + which = _session->vca_manager().vcas().back()->number(); } master = _session->vca_manager().vca_by_number (which); @@ -465,25 +462,51 @@ GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group) } group->assign_master (master); + + if (rename_master){ + master->set_name (group->name()); + } } void -GroupTabs::assign_some_to_master (uint32_t which, RouteList rl) +GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const +{ + if (!_session || !group) { + return; + } + + boost::shared_ptr 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; + } + + group->unassign_master (master); +} + +void +GroupTabs::assign_some_to_master (uint32_t which, RouteList rl, std::string vcaname) { if (!_session) { return; } boost::shared_ptr master; + bool set_name = false; if (which == 0) { if (_session->vca_manager().create_vca (1)) { /* error */ return; } + set_name = true; - /* VCAs use 1-based counting. Get most recently created VCA... */ - which = _session->vca_manager().n_vcas(); + /* Get most recently created VCA... */ + which = _session->vca_manager().vcas().back()->number(); } master = _session->vca_manager().vca_by_number (which); @@ -504,6 +527,9 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl) for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) { (*r)->assign (master); } + if (set_name && !vcaname.empty()) { + master->set_name (vcaname); + } } RouteList @@ -547,7 +573,7 @@ GroupTabs::get_soloed () void GroupTabs::assign_selection_to_master (uint32_t which) { - assign_some_to_master (which, selected_routes ()); + assign_some_to_master (which, selected_routes (), _("Selection")); } void @@ -565,82 +591,78 @@ GroupTabs::assign_soloed_to_master (uint32_t which) void GroupTabs::new_from_selection (bool with_master) { - run_new_group_dialog (selected_routes(), with_master); + RouteList rl (selected_routes()); + run_new_group_dialog (&rl, with_master); } void GroupTabs::new_from_rec_enabled (bool with_master) { - run_new_group_dialog (get_rec_enabled(), with_master); + RouteList rl (get_rec_enabled()); + run_new_group_dialog (&rl, with_master); } void GroupTabs::new_from_soloed (bool with_master) { - run_new_group_dialog (get_soloed(), 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) +GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master) { - if (rl.empty()) { + if (rl && rl->empty()) { return; } RouteGroup* g = new RouteGroup (*_session, ""); - RouteGroupDialog d (g, true); + RouteGroupDialog* d = new RouteGroupDialog (g, true); - 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); - } - } + 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 (); } -RouteGroup * -GroupTabs::create_and_add_group () const +void +GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const { - RouteGroup* g = new RouteGroup (*_session, ""); - RouteGroupDialog d (g, true); - - if (d.do_run ()) { - delete g; - return 0; - } + if (r == RESPONSE_OK) { - _session->add_route_group (g); - return g; -} + if (!d->name_check()) { + return; + } -RouteGroup * -GroupTabs::create_and_add_master () const -{ - return 0; -} + _session->add_route_group (d->group()); -RouteGroup * -GroupTabs::create_and_add_group_with_master () const -{ - RouteGroup* g = new RouteGroup (*_session, ""); - RouteGroupDialog d (g, true); + if (rl) { + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + d->group()->add (*i); + } - if (d.do_run ()) { - delete g; - return 0; + 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 @@ -655,18 +677,6 @@ GroupTabs::un_subgroup (RouteGroup* g) g->destroy_subgroup (); } -struct CollectSorter { - bool operator () (boost::shared_ptr a, boost::shared_ptr b) { - return a->presentation_info () < b->presentation_info(); - } -}; - -struct OrderSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->presentation_info() < b->presentation_info(); - } -}; - /** Collect all members of a RouteGroup so that they are together in the Editor or Mixer. * @param g Group to collect. */ @@ -674,19 +684,22 @@ void GroupTabs::collect (RouteGroup* g) { boost::shared_ptr group_routes = g->route_list (); - group_routes->sort (CollectSorter ()); + group_routes->sort (Stripable::Sorter()); int const N = group_routes->size (); RouteList::iterator i = group_routes->begin (); boost::shared_ptr routes = _session->get_routes (); - routes->sort (OrderSorter ()); + routes->sort (Stripable::Sorter()); RouteList::const_iterator j = routes->begin (); int diff = 0; int coll = -1; + + PresentationInfo::ChangeSuspender cs; + while (i != group_routes->end() && j != routes->end()) { - PresentationInfo::order_t const k = (*j)->presentation_info ().group_order(); + PresentationInfo::order_t const k = (*j)->presentation_info ().order(); if (*i == *j) { @@ -697,21 +710,19 @@ GroupTabs::collect (RouteGroup* g) --diff; } - (*j)->set_presentation_group_order_explicit (coll); + (*j)->set_presentation_order (coll); ++coll; ++i; } else { - (*j)->set_presentation_group_order_explicit (k + diff); + (*j)->set_presentation_order (k + diff); } ++j; } - - _session->notify_presentation_info_change (); } void @@ -739,7 +750,10 @@ GroupTabs::set_activation (RouteGroup* g, bool a) void GroupTabs::remove_group (RouteGroup* g) { + boost::shared_ptr rl (g->route_list ()); _session->remove_route_group (*g); + + emit_gui_changed_for_members (rl); } /** Set the color of the tab of a route group */ @@ -747,41 +761,8 @@ void 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 (r == 0 && g == 0 && b == 0) { - r = 25; - g = 25; - b = 25; - } - - GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; - - char buf[64]; - - /* 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); - - /* 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); + PresentationInfo::ChangeSuspender cs; + group->set_rgba (color); } /** @return the ID string to use for the GUI state of a route group */ @@ -802,6 +783,14 @@ GroupTabs::group_color (RouteGroup* group) { assert (group); + /* prefer libardour color, if set */ + uint32_t rgba = group->rgba (); + if (rgba != 0) { + return rgba; + } + + /* backwards compatibility, load old color */ + GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; string const gui_id = group_gui_id (group); bool empty; @@ -816,8 +805,7 @@ GroupTabs::group_color (RouteGroup* group) int r, g, b; - /* for historical reasons, colors are stored as 16 bit values. - */ + /* for historical reasons, colors are stored as 16 bit values. */ sscanf (color.c_str(), "%d:%d:%d", &r, &g, &b); @@ -825,6 +813,9 @@ GroupTabs::group_color (RouteGroup* group) g /= 256; b /= 256; + group->migrate_rgba (RGBA_TO_UINT (r, g, b, 255)); + gui_state.remove_node (gui_id); + return RGBA_TO_UINT (r, g, b, 255); } @@ -836,7 +827,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg) for our routes. */ - emit_gui_changed_for_members (rg); + emit_gui_changed_for_members (rg->route_list ()); set_dirty (); } @@ -851,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 (); } @@ -866,15 +857,17 @@ 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 (); } void -GroupTabs::emit_gui_changed_for_members (RouteGroup* rg) +GroupTabs::emit_gui_changed_for_members (boost::shared_ptr rl) { - for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) { - (*i)->gui_changed (X_("color"), 0); + PresentationInfo::ChangeSuspender cs; + + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + (*i)->presentation_info().PropertyChanged (Properties::color); } }