Make sure that tests are rebuilt even when only their headers change.

[ardour.git] / gtk2_ardour / mixer_group_tabs.cc

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index d0299cb959388b6ef5d8160193f70d9b4830df56..a52271d0de9543b7956ef38aaa0262fbc0ad6257 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -29,6 +29,7 @@
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
        : GroupTabs (0),
@@ -54,7 +55,7 @@ MixerGroupTabs::compute_tabs () const
 
                MixerStrip* s = (*i)[_mixer->track_columns.strip];
 
-               if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) {
+               if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
                        continue;
                }
 
@@ -130,7 +131,7 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 
                MixerStrip* s = (*i)[_mixer->track_columns.strip];
 
-               if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) {
+               if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
                        continue;
                }
 
@@ -164,10 +165,10 @@ MixerGroupTabs::get_menu (RouteGroup* g)
        _menu = new Menu;
 
        MenuList& items = _menu->items ();
-       items.push_back (MenuElem (_("Edit..."), bind (mem_fun (*this, &MixerGroupTabs::edit_group), g)));
-       items.push_back (MenuElem (_("Subgroup"), bind (mem_fun (*this, &MixerGroupTabs::make_subgroup), g)));
+       items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::edit_group), g)));
+       items.push_back (MenuElem (_("Subgroup"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::make_subgroup), g)));
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this, &MixerGroupTabs::remove_group), g)));
+       items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::remove_group), g)));
 
        return _menu;
 }
@@ -200,12 +201,16 @@ MixerGroupTabs::destroy_subgroup (RouteGroup* g)
 ARDOUR::RouteGroup *
 MixerGroupTabs::new_route_group () const
 {
-       RouteGroup* g = new RouteGroup (
-               *_session,
-               "",
-               RouteGroup::Active,
-               (RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo | RouteGroup::RecEnable)
-               );
+       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);
+
+       RouteGroup* g = new RouteGroup (*_session, "");
+       g->set_properties (plist);
 
        RouteGroupDialog d (g, Gtk::Stock::NEW);
        int const r = d.do_run ();