#include <cstdlib>
#include <cmath>
+#include "fix_carbon.h"
+
#include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/cell_renderer_color_selector.h"
#include "ardour/route_group.h"
+#include "ardour/route.h"
+#include "ardour/session.h"
+#include "ardour_ui.h"
#include "editor.h"
+#include "editor_group_tabs.h"
+#include "editor_route_groups.h"
+#include "editor_routes.h"
+#include "gui_thread.h"
#include "keyboard.h"
#include "marker.h"
-#include "time_axis_view.h"
#include "prompter.h"
-#include "gui_thread.h"
-#include "editor_group_tabs.h"
#include "route_group_dialog.h"
#include "route_time_axis.h"
-#include "editor_routes.h"
-#include "editor_route_groups.h"
-#include "ardour_ui.h"
-
-#include "ardour/route.h"
-#include "ardour/session.h"
+#include "time_axis_view.h"
+#include "utils.h"
#include "i18n.h"
Gtkmm2ext::CellRendererColorSelector* color_renderer = manage (new Gtkmm2ext::CellRendererColorSelector);
TreeViewColumn* color_column = manage (new TreeViewColumn ("", *color_renderer));
+
color_column->add_attribute (color_renderer->property_color(), _columns.gdkcolor);
_display.append_column (*color_column);
_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);
_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;
{ 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 }
};
switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
case 0:
- c = (*iter)[_columns.gdkcolor];
-
+ c = (*iter)[_columns.gdkcolor];
color_dialog.get_colorsel()->set_previous_color (c);
color_dialog.get_colorsel()->set_current_color (c);
break;
case RESPONSE_ACCEPT:
c = color_dialog.get_colorsel()->get_current_color();
- GroupTabs::set_group_color (group, c);
+ GroupTabs::set_group_color (group, gdk_color_to_rgba (c));
ARDOUR_UI::config()->set_dirty ();
break;
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;
}
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;
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);
group->apply_changes (plist);
- GroupTabs::set_group_color ((*iter)[_columns.routegroup], (*iter)[_columns.gdkcolor]);
+ GroupTabs::set_group_color ((*iter)[_columns.routegroup], gdk_color_to_rgba ((*iter)[_columns.gdkcolor]));
}
void
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);
+
+ Gdk::Color c;
+ set_color_from_rgba (c, GroupTabs::group_color (group));
+ row[_columns.gdkcolor] = c;
_in_row_change = true;
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);
}
}
void
-EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change)
+EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
{
_in_row_change = true;
(*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);
+
+ Gdk::Color c;
+ set_color_from_rgba (c, GroupTabs::group_color (group));
+ (*iter)[_columns.gdkcolor] = c;
break;
}
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()
);
projects / ardour.git / blobdiff