X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=6482abebc2ad7f653b8200635824c4a4a987790e;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=861a4fd2dac84321d2e8a7e6b00c43f77aae64ce;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 861a4fd2da..6482abebc2 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -17,6 +17,10 @@
 
 */
 
+#include <boost/foreach.hpp>
+
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "mixer_group_tabs.h"
@@ -29,11 +33,10 @@
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
-	: GroupTabs (0),
-	  _mixer (m),
-	  _menu (0)
+	: _mixer (m)
 {
 
 }
@@ -54,7 +57,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;
 		}
 
@@ -68,7 +71,10 @@ MixerGroupTabs::compute_tabs () const
 
 			tab.from = x;
 			tab.group = g;
-			tab.colour = s->color ();
+
+			if (g) {
+				tab.color = group_color (g);
+			}
 		}
 
 		x += s->get_width ();
@@ -85,28 +91,28 @@ MixerGroupTabs::compute_tabs () const
 void
 MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
-	double const arc_radius = _height;
+	double const arc_radius = get_height();
 
 	if (tab.group && tab.group->is_active()) {
-		cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.get_blue_p (), 1);
+		cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1);
 	} else {
 		cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
 	}
 
-	cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2);
+	cairo_arc (cr, tab.from + arc_radius, get_height(), arc_radius, M_PI, 3 * M_PI / 2);
 	cairo_line_to (cr, tab.to - arc_radius, 0);
-	cairo_arc (cr, tab.to - arc_radius, _height, arc_radius, 3 * M_PI / 2, 2 * M_PI);
-	cairo_line_to (cr, tab.from, _height);
+	cairo_arc (cr, tab.to - arc_radius, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI);
+	cairo_line_to (cr, tab.from, get_height());
 	cairo_fill (cr);
 
 	if (tab.group) {
-		pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
-		
+		pair<string, double> const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+
 		cairo_text_extents_t ext;
 		cairo_text_extents (cr, tab.group->name().c_str(), &ext);
-		
+
 		cairo_set_source_rgb (cr, 1, 1, 1);
-		cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2);
+		cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, get_height() - ext.height / 2);
 		cairo_save (cr);
 		cairo_show_text (cr, f.first.c_str());
 		cairo_restore (cr);
@@ -130,7 +136,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;
 	 	}
 
@@ -151,70 +157,41 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 	return routes;
 }
 
-Gtk::Menu*
-MixerGroupTabs::get_menu (RouteGroup* g)
+PropertyList
+MixerGroupTabs::default_properties () const
 {
-	if (g == 0) {
-		return 0;
-	}
-
-	using namespace Menu_Helpers;
-
-	delete _menu;
-	_menu = new Menu;
+	PropertyList plist;
 
-	MenuList& items = _menu->items ();
-	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"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::remove_group), g)));
-
-	return _menu;
-}
+	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);
 
-void
-MixerGroupTabs::edit_group (RouteGroup* g)
-{
-	RouteGroupDialog d (g, Gtk::Stock::APPLY);
-	d.do_run ();
+	return plist;
 }
 
-void
-MixerGroupTabs::remove_group (RouteGroup *g)
+string
+MixerGroupTabs::order_key () const
 {
-	_session->remove_route_group (*g);
+	return X_("signal");
 }
 
-void
-MixerGroupTabs::make_subgroup (RouteGroup* g)
+RouteList
+MixerGroupTabs::selected_routes () const
 {
-	g->make_subgroup ();
+	RouteList rl;
+	BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) {
+		boost::shared_ptr<Route> rp = r->route();
+		if (rp) {
+			rl.push_back (rp);
+		}
+	}
+	return rl;
 }
 
 void
-MixerGroupTabs::destroy_subgroup (RouteGroup* g)
+MixerGroupTabs::sync_order_keys ()
 {
-	g->destroy_subgroup ();
-}
-
-ARDOUR::RouteGroup *
-MixerGroupTabs::new_route_group () const
-{
-	RouteGroup* g = new RouteGroup (
-		*_session,
-		"",
-		RouteGroup::Active,
-		(RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo | RouteGroup::RecEnable)
-		);
-
-	RouteGroupDialog d (g, Gtk::Stock::NEW);
-	int const r = d.do_run ();
-
-	if (r != Gtk::RESPONSE_OK) {
-		delete g;
-		return 0;
-	}
-	
-	_session->add_route_group (g);
-	return g;
+	_mixer->sync_order_keys ("");
 }