projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP: whitespace
[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 d88ad12faaa5a2407fd8ddf8682cc5d110f70d9a..3def23a6a3d6c47c7f47d64d33931bbc015d04ea 100644
(file)
--- a/
gtk2_ardour/global_port_matrix.h
+++ b/
gtk2_ardour/global_port_matrix.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2009 Paul Davis
+ 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
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
@@
-23,27
+23,22
@@
#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 "i18n.h"
+#include "ardour_window.h"
class GlobalPortMatrix : public PortMatrix
{
public:
class GlobalPortMatrix : public PortMatrix
{
public:
- GlobalPortMatrix (
ARDOUR::Session&
, ARDOUR::DataType);
+ GlobalPortMatrix (
Gtk::Window*, ARDOUR::Session*
, ARDOUR::DataType);
void setup_ports (int);
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;
- std::string disassociation_verb () const {
- return _("Disconnect");
- }
+ std::string disassociation_verb () const;
+ std::string channel_noun () const;
- std::string channel_noun () const {
- return _("port");
- }
-
bool list_is_global (int) const {
return true;
}
bool list_is_global (int) const {
return true;
}
@@
-51,22
+46,21
@@
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:
{
public:
- GlobalPortMatrixWindow (ARDOUR::Session&, ARDOUR::DataType);
+ GlobalPortMatrixWindow (ARDOUR::Session *, ARDOUR::DataType);
+
+ void set_session (ARDOUR::Session *);
private:
private:
- void on_realize ();
- void max_size_changed ();
- void set_max_size ();
-
+ void on_show ();
+
GlobalPortMatrix _port_matrix;
Gtk::Button _rescan_button;
Gtk::CheckButton _show_ports_button;
GlobalPortMatrix _port_matrix;
Gtk::Button _rescan_button;
Gtk::CheckButton _show_ports_button;