Use conf.fatal for fatal configuration errors

[ardour.git] / gtk2_ardour / port_matrix_component.h

diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h
index 86cd0565ae48cffa1309754f8df6470bd4ea672b..ba1d2ae52655b49a8d64fe1bd64beaf69722243c 100644 (file)
--- a/gtk2_ardour/port_matrix_component.h
+++ b/gtk2_ardour/port_matrix_component.h
@@ -1,21 +1,20 @@
 /*
-    Copyright (C) 2002-2009 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2009-2011 Carl Hetherington <carl@carlh.net>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __gtk_ardour_port_matrix_component_h__
 #define __gtk_ardour_port_matrix_component_h__
@@ -31,6 +30,7 @@ class PortGroup;
 class PortGroupList;
 
 namespace ARDOUR {
+       class Bundle;
        class BundleChannel;
 }
 
@@ -49,8 +49,8 @@ public:
        virtual double parent_to_component_y (double y) const = 0;
        virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
        virtual void draw_extra (cairo_t *) = 0;
-       virtual void button_press (double, double, int, uint32_t) {}
-       virtual void button_release (double, double, int, uint32_t) {}
+       virtual void button_press (double, double, GdkEventButton *) {}
+       virtual void button_release (double, double, GdkEventButton *) {}
        virtual void motion (double, double) {}
 
        void set_show_ports (bool);
@@ -137,7 +137,7 @@ protected:
        }
 
        /** @return colour to paint grid squares when they can't be associated */
-       static Gdk::Color unknown_colour () {
+       static Gdk::Color non_connectable_colour () {
                return Gdk::Color ("#cccccc");
        }
 
@@ -154,9 +154,9 @@ protected:
        /* XXX */
        static Gdk::Color get_a_bundle_colour (int x) {
                if ((x % 2) == 0) {
-                       return Gdk::Color ("#547027");
+                       return Gdk::Color ("#555555");
                } else {
-                       return Gdk::Color ("#3552a6");
+                       return Gdk::Color ("#666666");
                }
        }