/* when we gather, allow the matrix to contain bundles with duplicate port sets,
otherwise in some cases the basic system IO ports may be hidden, making
the bundle editor useless */
-
- _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true);
+
+ _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true, show_only_bundles ());
_ports[OTHER].remove_bundle (_bundle);
_ports[OTHER].resume_signals ();
}
PortMatrixNode::State
BundleEditorMatrix::get_state (BundleChannel c[2]) const
{
+ if (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) {
+ return PortMatrixNode::NOT_ASSOCIATED;
+ }
+
Bundle::PortList const& pl = c[OTHER].bundle->channel_ports (c[OTHER].channel);
if (pl.empty ()) {
return PortMatrixNode::NOT_ASSOCIATED;
}
-
+
for (Bundle::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) {
if (!c[OURS].bundle->port_attached_to_channel (c[OURS].channel, *i)) {
return PortMatrixNode::NOT_ASSOCIATED;
}
bool
-BundleEditorMatrix::can_add_channel (boost::shared_ptr<Bundle> b) const
+BundleEditorMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
{
if (b == _bundle) {
return true;
}
- return PortMatrix::can_add_channel (b);
+ return PortMatrix::can_add_channels (b);
}
void
sigc::mem_fun (*this, &BundleManager::row_activated)
);
+ Gtk::Button* close_but = add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
+ close_but->signal_clicked ().connect (sigc::mem_fun (*this, &Gtk::Window::hide));
+
set_button_sensitivity ();
show_all ();
(*i)[_list_model_columns.name] = u->name ();
(*i)[_list_model_columns.bundle] = u;
- u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
+ u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
}
void
if (!i) {
return;
}
-
+
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
BundleEditor e (_session, b);
e.run ();