Remove 'pipex' from my pbd.vcproj as it's not needed for Ardour3

[ardour.git] / gtk2_ardour / editor_route_groups.cc

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index a98a120f45f1f2843bd5e0837202d9c5f968b416..72f6adfa8259abf3200d553d26f8fd81753fb05f 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -24,6 +24,8 @@
 #include <cstdlib>
 #include <cmath>
 
+#include "fix_carbon.h"
+
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
@@ -76,6 +78,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 
        _display.append_column ("", _columns.text);
        _display.append_column ("", _columns.is_visible);
+       _display.append_column ("", _columns.active_state);
        _display.append_column ("", _columns.gain);
        _display.append_column ("", _columns.gain_relative);
        _display.append_column ("", _columns.mute);
@@ -83,8 +86,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        _display.append_column ("", _columns.record);
        _display.append_column ("", _columns.monitoring);
        _display.append_column ("", _columns.select);
-       _display.append_column ("", _columns.edits);
-       _display.append_column ("", _columns.active_state);
+       _display.append_column ("", _columns.active_shared);
 
        TreeViewColumn* col;
        Gtk::Label* l;
@@ -93,14 +95,14 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
                { 0, _("Col"), _("Group Tab Color") },
                { 1, _("Name"), _("Name of Group") },
                { 2, _("V"), _("Group is visible?") },
-               { 3, S_("group|G"), _("Sharing Gain?") },
-               { 4, S_("relative|Rel"), _("Relevative Gain Changes?") },
-               { 5, S_("mute|M"), _("Sharing Mute?") },
-               { 6, S_("solo|S"), _("Sharing Solo?") },
-               { 7, _("Rec"), _("Sharing Record-enable Status?") },
-               { 8, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
-               { 9, S_("selection|Sel"), _("Sharing Selected Status?") },
-               { 10, S_("editing|E"), _("Sharing Editing?") },
+               { 3, _("On"), _("Group is enabled?") },
+               { 4, S_("group|G"), _("Sharing Gain?") },
+               { 5, S_("relative|Rel"), _("Relative Gain Changes?") },
+               { 6, S_("mute|M"), _("Sharing Mute?") },
+               { 7, S_("solo|S"), _("Sharing Solo?") },
+               { 8, _("Rec"), _("Sharing Record-enable Status?") },
+               { 9, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
+               { 10, S_("selection|Sel"), _("Sharing Selected/Editing Status?") },
                { 11, S_("active|A"), _("Sharing Active Status?") },
                { -1, 0, 0 }
        };
@@ -308,56 +310,56 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 
                
        case 3:
+               val = (*iter)[_columns.active_state];
+               group->set_active (!val, this);
+               ret = true;
+               break;
+
+       case 4:
                val = (*iter)[_columns.gain];
                group->set_gain (!val);
                ret = true;
                break;
 
-       case 4:
+       case 5:
                val = (*iter)[_columns.gain_relative];
                group->set_relative (!val, this);
                ret = true;
                break;
 
-       case 5:
+       case 6:
                val = (*iter)[_columns.mute];
                group->set_mute (!val);
                ret = true;
                break;
 
-       case 6:
+       case 7:
                val = (*iter)[_columns.solo];
                group->set_solo (!val);
                ret = true;
                break;
 
-       case 7:
+       case 8:
                val = (*iter)[_columns.record];
                group->set_recenable (!val);
                ret = true;
                break;
 
-       case 8:
+       case 9:
                val = (*iter)[_columns.monitoring];
                group->set_monitoring (!val);
                ret = true;
                break;
 
-       case 9:
+       case 10:
                val = (*iter)[_columns.select];
                group->set_select (!val);
                ret = true;
                break;
 
-       case 10:
-               val = (*iter)[_columns.edits];
-               group->set_edit (!val);
-               ret = true;
-               break;
-
        case 11:
-               val = (*iter)[_columns.active_state];
-               group->set_active (!val, this);
+               val = (*iter)[_columns.active_shared];
+               group->set_route_active (!val);
                ret = true;
                break;
 
@@ -369,7 +371,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
 }
 
 void
-EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter)
+EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter)
 {
        RouteGroup* group;
 
@@ -398,10 +400,10 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path, const Gtk::Tree
        plist.add (Properties::monitoring, val);
        val = (*iter)[_columns.select];
        plist.add (Properties::select, val);
-       val = (*iter)[_columns.edits];
-       plist.add (Properties::edit, val);
-       val = (*iter)[_columns.active_state];
+       val = (*iter)[_columns.active_shared];
        plist.add (Properties::route_active, val);
+       val = (*iter)[_columns.active_state];
+       plist.add (Properties::active, val);
        val = (*iter)[_columns.is_visible];
        plist.add (Properties::hidden, !val);
 
@@ -425,8 +427,8 @@ EditorRouteGroups::add (RouteGroup* group)
        row[_columns.record] = group->is_recenable();
        row[_columns.monitoring] = group->is_monitoring();
        row[_columns.select] = group->is_select ();
-       row[_columns.edits] = group->is_edit ();
-       row[_columns.active_state] = group->is_route_active ();
+       row[_columns.active_shared] = group->is_route_active ();
+       row[_columns.active_state] = group->is_active ();
        row[_columns.is_visible] = !group->is_hidden();
        row[_columns.gdkcolor] = GroupTabs::group_color (group);
        
@@ -441,11 +443,11 @@ EditorRouteGroups::add (RouteGroup* group)
                focus = true;
        }
 
-       group->PropertyChanged.connect (_property_changed_connections, MISSING_INVALIDATOR, ui_bind (&EditorRouteGroups::property_changed, this, group, _1), gui_context());
+       group->PropertyChanged.connect (_property_changed_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::property_changed, this, group, _1), gui_context());
 
        if (focus) {
                TreeViewColumn* col = _display.get_column (0);
-               CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (0));
+               CellRendererText* name_cell = dynamic_cast<CellRendererText*>(_display.get_column_cell_renderer (1));
                _display.set_cursor (_model->get_path (row), *col, *name_cell, true);
        }
 
@@ -473,7 +475,7 @@ EditorRouteGroups::groups_changed ()
 }
 
 void
-EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change)
+EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
 {
        _in_row_change = true;
 
@@ -495,8 +497,8 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& ch
                        (*iter)[_columns.record] = group->is_recenable ();
                        (*iter)[_columns.monitoring] = group->is_monitoring ();
                        (*iter)[_columns.select] = group->is_select ();
-                       (*iter)[_columns.edits] = group->is_edit ();
-                       (*iter)[_columns.active_state] = group->is_route_active ();
+                       (*iter)[_columns.active_shared] = group->is_route_active ();
+                       (*iter)[_columns.active_state] = group->is_active ();
                        (*iter)[_columns.is_visible] = !group->is_hidden();
                        (*iter)[_columns.gdkcolor] = GroupTabs::group_color (group);
 
@@ -552,9 +554,9 @@ EditorRouteGroups::set_session (Session* s)
 
                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());
+               arg.PropertyChanged.connect (all_route_groups_changed_connection, MISSING_INVALIDATOR, boost::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_added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::add, this, _1), gui_context());
                _session->route_group_removed.connect (
                        _session_connections, MISSING_INVALIDATOR, boost::bind (&EditorRouteGroups::groups_changed, this), gui_context()
                        );