projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consistent use of context-menu popups
[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 734c2ff60944b38f2847cb58c986781d34b19e16..3def23a6a3d6c47c7f47d64d33931bbc015d04ea 100644
(file)
--- a/
gtk2_ardour/global_port_matrix.h
+++ b/
gtk2_ardour/global_port_matrix.h
@@
-23,7
+23,7
@@
#include <gtkmm/button.h>
#include "port_matrix.h"
#include "port_group.h"
#include <gtkmm/button.h>
#include "port_matrix.h"
#include "port_group.h"
-#include "ardour_
dialog
.h"
+#include "ardour_
window
.h"
class GlobalPortMatrix : public PortMatrix
{
class GlobalPortMatrix : public PortMatrix
{
@@
-31,6
+31,7
@@
public:
GlobalPortMatrix (Gtk::Window*, ARDOUR::Session*, ARDOUR::DataType);
void setup_ports (int);
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;
void set_state (ARDOUR::BundleChannel c[2], bool);
PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
@@
-45,13
+46,12
@@
public:
private:
/* see PortMatrix: signal flow from 0 to 1 (out to in) */
enum {
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 Gtk::Window
+class GlobalPortMatrixWindow : public ArdourWindow
{
public:
GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);
{
public:
GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);