Use conf.fatal for fatal configuration errors

[ardour.git] / gtk2_ardour / global_port_matrix.h

diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h
index 2ecf26c33d5903bd2d7e5ea0710d3959878d9840..3381563572c92859c0ad84dfa6022b9cf4395594 100644 (file)
--- a/gtk2_ardour/global_port_matrix.h
+++ b/gtk2_ardour/global_port_matrix.h
@@ -1,21 +1,22 @@
 /*
-    Copyright (C) 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-2010 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2009-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2010-2013 Paul Davis <paul@linuxaudiosystems.com>
+ *
+ * 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 __ardour_gtk_global_port_matrix_h__
 #define __ardour_gtk_global_port_matrix_h__
@@ -23,7 +24,7 @@
 #include <gtkmm/button.h>
 #include "port_matrix.h"
 #include "port_group.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 class GlobalPortMatrix : public PortMatrix
 {
@@ -31,6 +32,7 @@ public:
        GlobalPortMatrix (Gtk::Window*, ARDOUR::Session*, ARDOUR::DataType);
 
        void setup_ports (int);
+       void set_session (ARDOUR::Session* s);
 
        void set_state (ARDOUR::BundleChannel c[2], bool);
        PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
@@ -45,12 +47,12 @@ public:
 private:
        /* see PortMatrix: signal flow from 0 to 1 (out to in) */
        enum {
-               OUT = 0,
-               IN = 1,
+               FLOW_OUT = 0,
+               FLOW_IN = 1,
        };
 };
 
-class GlobalPortMatrixWindow : public ArdourDialog
+class GlobalPortMatrixWindow : public ArdourWindow
 {
 public:
        GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);