projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install single color theme file during waf install
[ardour.git]
/
gtk2_ardour
/
global_port_matrix.cc
diff --git
a/gtk2_ardour/global_port_matrix.cc
b/gtk2_ardour/global_port_matrix.cc
index e1bdfb199e8872c14a473a6b7461618d2d2817e9..706b4b672752038e893703b3cd71d5968cbff890 100644
(file)
--- a/
gtk2_ardour/global_port_matrix.cc
+++ b/
gtk2_ardour/global_port_matrix.cc
@@
-19,6
+19,7
@@
#include <gtkmm/image.h>
#include <gtkmm/stock.h>
#include <gtkmm/image.h>
#include <gtkmm/stock.h>
+
#include "global_port_matrix.h"
#include "utils.h"
#include "global_port_matrix.h"
#include "utils.h"
@@
-31,6
+32,7
@@
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
: PortMatrix (p, s, t)
GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, Session* s, DataType t)
: PortMatrix (p, s, t)
@@
-82,9
+84,9
@@
GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
} else {
/* two non-Ardour ports */
if (s) {
} else {
/* two non-Ardour ports */
if (s) {
-
jack_connect (_session->engine().jack (), j->c_str(), i->c_str()
);
+
AudioEngine::instance()->connect (*j, *i
);
} else {
} else {
-
jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str()
);
+
AudioEngine::instance()->disconnect (*j, *i
);
}
}
}
}
}
}
@@
-113,33
+115,25
@@
GlobalPortMatrix::get_state (BundleChannel c[2]) const
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
- boost::shared_ptr<Port> p =
_session->engine().
get_port_by_name (*i);
- boost::shared_ptr<Port> q =
_session->engine().
get_port_by_name (*j);
+ boost::shared_ptr<Port> p =
AudioEngine::instance()->
get_port_by_name (*i);
+ boost::shared_ptr<Port> q =
AudioEngine::instance()->
get_port_by_name (*j);
if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */
if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */
- /* XXX: is this the easiest way to do this? */
- /* XXX: isn't this very inefficient? */
- jack_client_t* jack = _session->engine().jack ();
- jack_port_t* jp = jack_port_by_name (jack, i->c_str());
- if (jp == 0) {
+ /* get a port handle for one of them .. */
+
+ PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (*i);
+ if (!ph) {
return PortMatrixNode::NOT_ASSOCIATED;
}
return PortMatrixNode::NOT_ASSOCIATED;
}
- char const ** c = jack_port_get_all_connections (jack, jp);
-
- char const ** p = c;
+ /* see if it is connected to the other one ... */
- while (p && *p != 0) {
- if (strcmp (*p, j->c_str()) == 0) {
- free (c);
- return PortMatrixNode::ASSOCIATED;
- }
- ++p;
+ if (AudioEngine::instance()->port_engine().connected_to (ph, *j, false)) {
+ return PortMatrixNode::ASSOCIATED;
}
}
- free (c);
return PortMatrixNode::NOT_ASSOCIATED;
}
return PortMatrixNode::NOT_ASSOCIATED;
}