GlobalPortMatrix::setup_ports (int dim)
{
_ports[dim].suspend_signals ();
- _ports[dim].gather (_session, type(), dim == IN, false);
+ _ports[dim].gather (_session, type(), dim == IN, false, show_only_bundles ());
_ports[dim].resume_signals ();
}
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) {
- Port* p = _session->engine().get_port_by_name (*i);
- Port* q = _session->engine().get_port_by_name (*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);
if (p) {
if (s) {
return PortMatrixNode::NOT_ASSOCIATED;
}
+ if (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) {
+ return PortMatrixNode::NOT_ASSOCIATED;
+ }
+
Bundle::PortList const & in_ports = c[IN].bundle->channel_ports (c[IN].channel);
Bundle::PortList const & out_ports = c[OUT].bundle->channel_ports (c[OUT].channel);
if (in_ports.empty() || out_ports.empty()) {
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) {
- Port* p = _session->engine().get_port_by_name (*i);
- Port* q = _session->engine().get_port_by_name (*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);
if (!p && !q) {
/* two non-Ardour ports; things are slightly more involved */
}
GlobalPortMatrixWindow::GlobalPortMatrixWindow (Session* s, DataType t)
- : ArdourDialog (X_("reset me soon"))
- , _port_matrix (this, s, t)
+ : ArdourWindow (X_("reset me soon"))
+ , _port_matrix (this, s, t)
{
switch (t) {
case DataType::AUDIO:
break;
}
- get_vbox()->pack_start (_port_matrix, true, true);
+ signal_key_press_event().connect (sigc::mem_fun (_port_matrix, &PortMatrix::key_press));
+
+ add (_port_matrix);
_port_matrix.show ();
}