X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_route_groups.cc;h=7bcf5008ee92492d619113520db71ef555030904;hb=4aa84f0513c6cd47561e5bb1d5ec436426fee581;hp=690ad42eaef44a6284c81325192aa305c64674a6;hpb=402cc384ced6cb152c8abe4294009fe0de0a6dea;p=ardour.git diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 690ad42eae..7bcf5008ee 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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,10 +17,13 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include -#include #include #include "ardour/route_group.h" @@ -37,52 +40,47 @@ #include "editor_route_groups.h" #include "ardour/route.h" +#include "ardour/session.h" #include "i18n.h" using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; +using Gtkmm2ext::Keyboard; EditorRouteGroups::EditorRouteGroups (Editor* e) - : EditorComponent (e), - _menu (0), - _in_row_change (false) - + : EditorComponent (e) + , _all_group_active_button (_("No Selection = All Tracks")) + , _in_row_change (false) + , _in_rebuild (false) { _model = ListStore::create (_columns); _display.set_model (_model); - _display.append_column (_("Name"), _columns.text); + int const columns = 10; + _display.append_column (_("Name"), _columns.text); _display.append_column (_("G"), _columns.gain); - _display.append_column (_("R"), _columns.record); + _display.append_column (_("Rel"), _columns.gain_relative); _display.append_column (_("M"), _columns.mute); _display.append_column (_("S"), _columns.solo); + _display.append_column (_("Rec"), _columns.record); _display.append_column (_("Sel"), _columns.select); _display.append_column (_("E"), _columns.edits); - + _display.append_column (_("A"), _columns.active_state); _display.append_column (_("Show"), _columns.is_visible); - _display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); - _display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); - _display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2)); - _display.get_column (3)->set_data (X_("colnum"), GUINT_TO_POINTER(3)); - _display.get_column (4)->set_data (X_("colnum"), GUINT_TO_POINTER(4)); - _display.get_column (5)->set_data (X_("colnum"), GUINT_TO_POINTER(5)); - _display.get_column (6)->set_data (X_("colnum"), GUINT_TO_POINTER(6)); - _display.get_column (7)->set_data (X_("colnum"), GUINT_TO_POINTER(7)); + for (int i = 0; i < columns; ++i) { + _display.get_column (i)->set_data (X_("colnum"), GUINT_TO_POINTER(i)); + } _display.get_column (0)->set_expand (true); - _display.get_column (1)->set_expand (false); - _display.get_column (2)->set_expand (false); - _display.get_column (3)->set_expand (false); - _display.get_column (4)->set_expand (false); - _display.get_column (5)->set_expand (false); - _display.get_column (6)->set_expand (false); - _display.get_column (7)->set_expand (false); + + for (int i = 1; i < columns; ++i) { + _display.get_column (i)->set_expand (false); + } _display.set_headers_visible (true); @@ -90,53 +88,35 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) CellRendererText* name_cell = dynamic_cast(_display.get_column_cell_renderer (0)); name_cell->property_editable() = true; - name_cell->signal_edited().connect (mem_fun (*this, &EditorRouteGroups::name_edit)); - + name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRouteGroups::name_edit)); + /* use checkbox for the active + visible columns */ + + for (int i = 1; i < columns; ++i) { + CellRendererToggle* active_cell = dynamic_cast (_display.get_column_cell_renderer (i)); + active_cell->property_activatable() = true; + active_cell->property_radio() = false; + } - CellRendererToggle* active_cell = dynamic_cast(_display.get_column_cell_renderer (1)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - active_cell = dynamic_cast(_display.get_column_cell_renderer (2)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - active_cell = dynamic_cast(_display.get_column_cell_renderer (3)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - active_cell = dynamic_cast(_display.get_column_cell_renderer (4)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - active_cell = dynamic_cast(_display.get_column_cell_renderer (5)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - active_cell = dynamic_cast(_display.get_column_cell_renderer (6)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - active_cell = dynamic_cast(_display.get_column_cell_renderer (7)); - active_cell->property_activatable() = true; - active_cell->property_radio() = false; - - _model->signal_row_changed().connect (mem_fun (*this, &EditorRouteGroups::row_change)); + _model->signal_row_changed().connect (sigc::mem_fun (*this, &EditorRouteGroups::row_change)); + /* What signal would you guess was emitted when the rows of your treeview are reordered + by a drag and drop? signal_rows_reordered? That would be far too easy. + No, signal_row_deleted(). + */ + _model->signal_row_deleted().connect (sigc::mem_fun (*this, &EditorRouteGroups::row_deleted)); _display.set_name ("EditGroupList"); _display.get_selection()->set_mode (SELECTION_SINGLE); _display.set_headers_visible (true); - _display.set_reorderable (false); + _display.set_reorderable (true); _display.set_rules_hint (true); _display.set_size_request (75, -1); _scroller.add (_display); _scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC); - _display.signal_button_press_event().connect (mem_fun(*this, &EditorRouteGroups::button_press_event), false); + _display.signal_button_press_event().connect (sigc::mem_fun(*this, &EditorRouteGroups::button_press_event), false); - _display_packer = new VBox; HBox* button_box = manage (new HBox()); button_box->set_homogeneous (true); @@ -153,192 +133,19 @@ EditorRouteGroups::EditorRouteGroups (Editor* e) w->show(); remove_button->add (*w); - add_button->signal_clicked().connect (mem_fun (*this, &EditorRouteGroups::new_route_group)); - remove_button->signal_clicked().connect (mem_fun (*this, &EditorRouteGroups::remove_selected)); - + add_button->signal_clicked().connect (sigc::hide_return (sigc::mem_fun (*this, &EditorRouteGroups::run_new_group_dialog))); + remove_button->signal_clicked().connect (sigc::mem_fun (*this, &EditorRouteGroups::remove_selected)); + button_box->pack_start (*add_button); button_box->pack_start (*remove_button); - _display_packer->pack_start (_scroller, true, true); - _display_packer->pack_start (*button_box, false, false); -} - - -Gtk::Menu* -EditorRouteGroups::menu (RouteGroup* g) -{ - using namespace Gtk::Menu_Helpers; - - delete _menu; - - Menu* new_from = new Menu; - MenuList& f = new_from->items (); - f.push_back (MenuElem (_("Selection..."), mem_fun (*this, &EditorRouteGroups::new_from_selection))); - f.push_back (MenuElem (_("Record Enabled..."), mem_fun (*this, &EditorRouteGroups::new_from_rec_enabled))); - f.push_back (MenuElem (_("Soloed..."), mem_fun (*this, &EditorRouteGroups::new_from_soloed))); - - _menu = new Menu; - _menu->set_name ("ArdourContextMenu"); - MenuList& items = _menu->items(); - - items.push_back (MenuElem (_("New..."), mem_fun(*this, &EditorRouteGroups::new_route_group))); - items.push_back (MenuElem (_("New From"), *new_from)); - if (g) { - items.push_back (MenuElem (_("Edit..."), bind (mem_fun (*this, &EditorRouteGroups::edit), g))); - items.push_back (MenuElem (_("Fit to Window"), bind (mem_fun (*_editor, &Editor::fit_route_group), g))); - items.push_back (MenuElem (_("Subgroup"), bind (mem_fun (*this, &EditorRouteGroups::subgroup), g))); - items.push_back (MenuElem (_("Collect"), bind (mem_fun (*this, &EditorRouteGroups::collect), g))); - } - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Activate All"), mem_fun(*this, &EditorRouteGroups::activate_all))); - items.push_back (MenuElem (_("Disable All"), mem_fun(*this, &EditorRouteGroups::disable_all))); - - return _menu; -} - -void -EditorRouteGroups::subgroup (RouteGroup* g) -{ - g->make_subgroup (); -} - -void -EditorRouteGroups::unsubgroup (RouteGroup* g) -{ - g->destroy_subgroup (); -} - -void -EditorRouteGroups::activate_all () -{ - _session->foreach_route_group ( - bind (mem_fun (*this, &EditorRouteGroups::set_activation), true) - ); -} - -void -EditorRouteGroups::disable_all () -{ - _session->foreach_route_group ( - bind (mem_fun (*this, &EditorRouteGroups::set_activation), false) - ); -} - -void -EditorRouteGroups::set_activation (RouteGroup* g, bool a) -{ - g->set_active (a, this); -} - -void -EditorRouteGroups::new_route_group () -{ - RouteGroup* g = new RouteGroup ( - *_session, - "", - RouteGroup::Active, - (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit) - ); - - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); - - if (r == Gtk::RESPONSE_OK) { - _session->add_route_group (g); - } else { - delete g; - } -} - -void -EditorRouteGroups::new_from_selection () -{ - RouteGroup* g = new RouteGroup ( - *_session, - "", - RouteGroup::Active, - (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit | RouteGroup::Select) - ); - - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); - - if (r == Gtk::RESPONSE_OK) { - _session->add_route_group (g); - - for (TrackSelection::iterator i = _editor->get_selection().tracks.begin(); i != _editor->get_selection().tracks.end(); ++i) { - RouteTimeAxisView* rtv = dynamic_cast (*i); - if (rtv) { - rtv->route()->set_route_group (g, this); - } - } - - } else { - delete g; - } -} - -void -EditorRouteGroups::new_from_rec_enabled () -{ - RouteGroup* g = new RouteGroup ( - *_session, - "", - RouteGroup::Active, - (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit | RouteGroup::RecEnable) - ); - - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); - - if (r == Gtk::RESPONSE_OK) { - _session->add_route_group (g); - - for (Editor::TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) { - RouteTimeAxisView* rtv = dynamic_cast (*i); - if (rtv && rtv->route()->record_enabled()) { - rtv->route()->set_route_group (g, this); - } - } - - } else { - delete g; - } -} + _all_group_active_button.show (); -void -EditorRouteGroups::new_from_soloed () -{ - RouteGroup* g = new RouteGroup ( - *_session, - "", - RouteGroup::Active, - (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit) - ); - - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); - - if (r == Gtk::RESPONSE_OK) { - _session->add_route_group (g); - - for (Editor::TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) { - RouteTimeAxisView* rtv = dynamic_cast (*i); - if (rtv && !rtv->route()->is_master() && rtv->route()->soloed()) { - rtv->route()->set_route_group (g, this); - } - } - - } else { - delete g; - } -} + _display_packer.pack_start (_scroller, true, true); + _display_packer.pack_start (_all_group_active_button, false, false); + _display_packer.pack_start (*button_box, false, false); -void -EditorRouteGroups::edit (RouteGroup* g) -{ - RouteGroupDialog d (g, Gtk::Stock::APPLY); - d.do_run (); + _all_group_active_button.signal_toggled().connect (sigc::mem_fun (*this, &EditorRouteGroups::all_group_toggled)); } void @@ -353,7 +160,7 @@ EditorRouteGroups::remove_selected () TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); TreeIter iter; - + /* selection mode is single, so rows.begin() is it */ if ((iter = _model->get_iter (*i))) { @@ -369,7 +176,7 @@ EditorRouteGroups::remove_selected () void EditorRouteGroups::button_clicked () { - new_route_group (); + run_new_group_dialog (); } gint @@ -377,7 +184,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) { TreeModel::Path path; TreeIter iter; - RouteGroup* group = 0; + RouteGroup* group = 0; TreeViewColumn* column; int cellx; int celly; @@ -387,13 +194,13 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) if (p) { iter = _model->get_iter (path); } - + if (iter) { group = (*iter)[_columns.routegroup]; } if (Keyboard::is_context_menu_event (ev)) { - menu(group)->popup (1, ev->time); + _editor->_group_tabs->get_menu(group)->popup (1, ev->time); return true; } @@ -406,15 +213,14 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) if (Keyboard::is_edit_event (ev)) { if ((iter = _model->get_iter (path))) { if ((group = (*iter)[_columns.routegroup]) != 0) { - // edit_route_group (group); #ifdef GTKOSX _display.queue_draw(); #endif return true; } } - - } + + } break; case 1: @@ -430,8 +236,8 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) case 2: if ((iter = _model->get_iter (path))) { - bool record = (*iter)[_columns.record]; - (*iter)[_columns.record] = !record; + bool gain_relative = (*iter)[_columns.gain_relative]; + (*iter)[_columns.gain_relative] = !gain_relative; #ifdef GTKOSX _display.queue_draw(); #endif @@ -462,6 +268,17 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) break; case 5: + if ((iter = _model->get_iter (path))) { + bool record = (*iter)[_columns.record]; + (*iter)[_columns.record] = !record; +#ifdef GTKOSX + _display.queue_draw(); +#endif + return true; + } + break; + + case 6: if ((iter = _model->get_iter (path))) { bool select = (*iter)[_columns.select]; (*iter)[_columns.select] = !select; @@ -472,7 +289,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) } break; - case 6: + case 7: if ((iter = _model->get_iter (path))) { bool edits = (*iter)[_columns.edits]; (*iter)[_columns.edits] = !edits; @@ -483,10 +300,10 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) } break; - case 7: + case 8: if ((iter = _model->get_iter (path))) { - bool visible = (*iter)[_columns.is_visible]; - (*iter)[_columns.is_visible] = !visible; + bool active_state = (*iter)[_columns.active_state]; + (*iter)[_columns.active_state] = !active_state; #ifdef GTKOSX _display.queue_draw(); #endif @@ -494,15 +311,26 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) } break; + case 9: + if ((iter = _model->get_iter (path))) { + bool is_visible = (*iter)[_columns.is_visible]; + (*iter)[_columns.is_visible] = !is_visible; +#ifdef GTKOSX + _display.queue_draw(); +#endif + return true; + } + break; + default: break; } - + return false; } -void -EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter) +void +EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter) { RouteGroup* group; @@ -514,49 +342,48 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeM return; } - if ((*iter)[_columns.is_visible]) { - for (Editor::TrackViewList::const_iterator j = _editor->get_track_views().begin(); j != _editor->get_track_views().end(); ++j) { - if ((*j)->route_group() == group) { - _editor->_routes->show_track_in_display (**j); - } - } - } else { - for (Editor::TrackViewList::const_iterator j = _editor->get_track_views().begin(); j != _editor->get_track_views().end(); ++j) { - if ((*j)->route_group() == group) { - _editor->hide_track_in_display (**j); - } - } - } - - group->set_property (RouteGroup::Gain, (*iter)[_columns.gain]); - group->set_property (RouteGroup::RecEnable, (*iter)[_columns.record]); - group->set_property (RouteGroup::Mute, (*iter)[_columns.mute]); - group->set_property (RouteGroup::Solo, (*iter)[_columns.solo]); - group->set_property (RouteGroup::Select, (*iter)[_columns.select]); - group->set_property (RouteGroup::Edit, (*iter)[_columns.edits]); - - string name = (*iter)[_columns.text]; - - if (name != group->name()) { - group->set_name (name); - } + PropertyList plist; + plist.add (Properties::name, string ((*iter)[_columns.text])); + + bool val = (*iter)[_columns.gain]; + plist.add (Properties::gain, val); + val = (*iter)[_columns.gain_relative]; + plist.add (Properties::relative, val); + val = (*iter)[_columns.mute]; + plist.add (Properties::mute, val); + val = (*iter)[_columns.solo]; + plist.add (Properties::solo, val); + val = (*iter)[_columns.record]; + plist.add (Properties::recenable, val); + val = (*iter)[_columns.select]; + plist.add (Properties::select, val); + val = (*iter)[_columns.edits]; + plist.add (Properties::edit, val); + val = (*iter)[_columns.active_state]; + plist.add (Properties::route_active, val); + + group->set_hidden (!(*iter)[_columns.is_visible], this); + + group->apply_changes (plist); } void EditorRouteGroups::add (RouteGroup* group) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &EditorRouteGroups::add), group)); + ENSURE_GUI_THREAD (*this, &EditorRouteGroups::add, group) bool focus = false; TreeModel::Row row = *(_model->append()); - + + row[_columns.gain] = group->is_gain (); + row[_columns.gain_relative] = group->is_relative (); + row[_columns.mute] = group->is_mute (); + row[_columns.solo] = group->is_solo (); + row[_columns.record] = group->is_recenable(); + row[_columns.select] = group->is_select (); + row[_columns.edits] = group->is_edit (); + row[_columns.active_state] = group->is_route_active (); row[_columns.is_visible] = !group->is_hidden(); - row[_columns.gain] = group->property(RouteGroup::Gain); - row[_columns.record] = group->property(RouteGroup::RecEnable); - row[_columns.mute] = group->property(RouteGroup::Mute); - row[_columns.solo] = group->property(RouteGroup::Solo); - row[_columns.select] = group->property(RouteGroup::Select); - row[_columns.edits] = group->property(RouteGroup::Edit); _in_row_change = true; @@ -569,9 +396,9 @@ EditorRouteGroups::add (RouteGroup* group) focus = true; } - group->FlagsChanged.connect (bind (mem_fun (*this, &EditorRouteGroups::flags_changed), group)); + group->PropertyChanged.connect (_property_changed_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::property_changed, this, group, _1), gui_context()); - if (focus) { + if (focus) { TreeViewColumn* col = _display.get_column (0); CellRendererText* name_cell = dynamic_cast(_display.get_column_cell_renderer (0)); _display.set_cursor (_model->get_path (row), *col, *name_cell, true); @@ -585,62 +412,72 @@ EditorRouteGroups::add (RouteGroup* group) void EditorRouteGroups::groups_changed () { - ENSURE_GUI_THREAD (mem_fun (*this, &EditorRouteGroups::groups_changed)); + ENSURE_GUI_THREAD (*this, &EditorRouteGroups::groups_changed); + + _in_rebuild = true; /* just rebuild the while thing */ _model->clear (); - { - TreeModel::Row row; - row = *(_model->append()); - row[_columns.is_visible] = true; - row[_columns.text] = (_("-all-")); - row[_columns.routegroup] = 0; + if (_session) { + _session->foreach_route_group (sigc::mem_fun (*this, &EditorRouteGroups::add)); } - _session->foreach_route_group (mem_fun (*this, &EditorRouteGroups::add)); + _in_rebuild = false; } void -EditorRouteGroups::flags_changed (void* src, RouteGroup* group) +EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &EditorRouteGroups::flags_changed), src, group)); - _in_row_change = true; - Gtk::TreeModel::Children children = _model->children(); + Gtk::TreeModel::Children children = _model->children(); for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) { if (group == (*iter)[_columns.routegroup]) { - (*iter)[_columns.is_visible] = !group->is_hidden(); (*iter)[_columns.text] = group->name(); - (*iter)[_columns.gain] = group->property(RouteGroup::Gain); - (*iter)[_columns.record] = group->property(RouteGroup::RecEnable); - (*iter)[_columns.mute] = group->property(RouteGroup::Mute); - (*iter)[_columns.solo] = group->property(RouteGroup::Solo); - (*iter)[_columns.select] = group->property(RouteGroup::Select); - (*iter)[_columns.edits] = group->property(RouteGroup::Edit); + (*iter)[_columns.gain] = group->is_gain (); + (*iter)[_columns.gain_relative] = group->is_relative (); + (*iter)[_columns.mute] = group->is_mute (); + (*iter)[_columns.solo] = group->is_solo (); + (*iter)[_columns.record] = group->is_recenable (); + (*iter)[_columns.select] = group->is_select (); + (*iter)[_columns.edits] = group->is_edit (); + (*iter)[_columns.active_state] = group->is_route_active (); + (*iter)[_columns.is_visible] = !group->is_hidden(); } } _in_row_change = false; - _editor->_group_tabs->set_dirty (); + if (change.contains (Properties::name) || change.contains (Properties::active)) { + _editor->_group_tabs->set_dirty (); + } + + for (TrackViewList::const_iterator i = _editor->get_track_views().begin(); i != _editor->get_track_views().end(); ++i) { + if ((*i)->route_group() == group) { + if (group->is_hidden ()) { + _editor->hide_track_in_display (*i); + } else { + _editor->_routes->show_track_in_display (**i); + } + } + } } void -EditorRouteGroups::name_edit (const Glib::ustring& path, const Glib::ustring& new_text) +EditorRouteGroups::name_edit (const std::string& path, const std::string& new_text) { RouteGroup* group; TreeIter iter; - + if ((iter = _model->get_iter (path))) { - + if ((group = (*iter)[_columns.routegroup]) == 0) { return; } - + if (new_text != group->name()) { group->set_name (new_text); } @@ -656,68 +493,84 @@ EditorRouteGroups::clear () } void -EditorRouteGroups::connect_to_session (Session* s) +EditorRouteGroups::set_session (Session* s) { - EditorComponent::connect_to_session (s); + SessionHandlePtr::set_session (s); - _session_connections.push_back (_session->route_group_added.connect (mem_fun (*this, &EditorRouteGroups::add))); - _session_connections.push_back (_session->route_group_removed.connect (mem_fun (*this, &EditorRouteGroups::groups_changed))); + if (_session) { + + RouteGroup& arg (_session->all_route_group()); + + arg.PropertyChanged.connect (all_route_groups_changed_connection, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::all_group_changed, this, _1), gui_context()); + + _session->route_group_added.connect (_session_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::add, this, _1), gui_context()); + _session->route_group_removed.connect ( + _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context() + ); + _session->route_groups_reordered.connect ( + _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context() + ); + } + + PBD::PropertyChange pc; + pc.add (Properties::select); + pc.add (Properties::active); + all_group_changed (pc); groups_changed (); } -struct CollectSorter { - bool operator () (Route* a, Route* b) { - return a->order_key (N_ ("editor")) < b->order_key (N_ ("editor")); +void +EditorRouteGroups::run_new_group_dialog () +{ + RouteList rl; + + return _editor->_group_tabs->run_new_group_dialog (rl); +} + +void +EditorRouteGroups::all_group_toggled () +{ + if (_session) { + _session->all_route_group().set_select (_all_group_active_button.get_active()); } -}; +} + +void +EditorRouteGroups::all_group_changed (const PropertyChange&) +{ + if (_session) { + RouteGroup& arg (_session->all_route_group()); + _all_group_active_button.set_active (arg.is_active() && arg.is_select()); + } else { + _all_group_active_button.set_active (false); + } +} -/** Collect all members of a RouteGroup so that they are together in the Editor. - * @param g Group to collect. +/** Called when a model row is deleted, but also when the model is + * reordered by a user drag-and-drop; the latter is what we are + * interested in here. */ void -EditorRouteGroups::collect (RouteGroup* g) +EditorRouteGroups::row_deleted (Gtk::TreeModel::Path const &) { - list routes = g->route_list (); - routes.sort (CollectSorter ()); - int const N = routes.size (); - - list::iterator i = routes.begin (); - Editor::TrackViewList::const_iterator j = _editor->get_track_views().begin(); - - int diff = 0; - int coll = -1; - while (i != routes.end() && j != _editor->get_track_views().end()) { - - RouteTimeAxisView* rtv = dynamic_cast (*j); - if (rtv) { - - boost::shared_ptr r = rtv->route (); - int const k = r->order_key (N_ ("editor")); - - if (*i == r.get()) { - - if (coll == -1) { - coll = k; - diff = N - 1; - } else { - --diff; - } - - r->set_order_key (N_ ("editor"), coll); - - ++coll; - ++i; - - } else { - - r->set_order_key (N_ ("editor"), k + diff); - - } - } - - ++j; + if (_in_rebuild) { + /* We need to ignore this in cases where we're not doing a drag-and-drop + re-order. + */ + return; } - _editor->_routes->sync_order_keys (N_ ("editor")); + /* Re-write the session's route group list so that the new order is preserved */ + + list new_list; + + Gtk::TreeModel::Children children = _model->children(); + for (Gtk::TreeModel::Children::iterator i = children.begin(); i != children.end(); ++i) { + new_list.push_back ((*i)[_columns.routegroup]); + } + + _session->reorder_route_groups (new_list); } + +