#include <gtkmm/table.h>
#include <gtkmm/comboboxtext.h>
#include <gtkmm/alignment.h>
+
#include "ardour/session.h"
#include "ardour/user_bundle.h"
#include "ardour/audioengine.h"
#include "bundle_manager.h"
+#include "gui_thread.h"
#include "i18n.h"
#include "utils.h"
using namespace std;
using namespace ARDOUR;
-BundleEditorMatrix::BundleEditorMatrix (
- Gtk::Window* parent, Session& session, boost::shared_ptr<Bundle> bundle
- )
- : PortMatrix (parent, session, bundle->type()),
- _bundle (bundle)
+BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
+ : PortMatrix (parent, session, bundle->type())
+ , _bundle (bundle)
{
_port_group = boost::shared_ptr<PortGroup> (new PortGroup (""));
_port_group->add_bundle (_bundle);
+
+ setup_all_ports ();
+ init ();
}
void
_ports[OURS].add_group (_port_group);
} else {
_ports[OTHER].suspend_signals ();
- _ports[OTHER].gather (_session, _bundle->ports_are_inputs());
+
+ /* 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, _bundle->ports_are_inputs(), true);
_ports[OTHER].remove_bundle (_bundle);
_ports[OTHER].resume_signals ();
}
return (dim == OTHER);
}
-BundleEditor::BundleEditor (Session& session, boost::shared_ptr<UserBundle> bundle)
+BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle)
: ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle)
{
Gtk::Table* t = new Gtk::Table (3, 2);
}
-BundleManager::BundleManager (Session& session)
- : ArdourDialog (_("Bundle Manager")), _session (session), edit_button (_("Edit")), delete_button (_("Delete"))
+BundleManager::BundleManager (Session* session)
+ : ArdourDialog (_("Bundle Manager"))
+ , edit_button (_("Edit"))
+ , delete_button (_("Delete"))
{
+ set_session (session);
+
_list_model = Gtk::ListStore::create (_list_model_columns);
_tree_view.set_model (_list_model);
_tree_view.append_column (_("Name"), _list_model_columns.name);
_tree_view.set_headers_visible (false);
- boost::shared_ptr<BundleList> bundles = _session.bundles ();
+ boost::shared_ptr<BundleList> bundles = _session->bundles ();
for (BundleList::iterator i = bundles->begin(); i != bundles->end(); ++i) {
add_bundle (*i);
}
/* Start off with a single channel */
b->add_channel ("1");
- _session.add_bundle (b);
+ _session->add_bundle (b);
add_bundle (b);
BundleEditor e (_session, b);
Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
if (i) {
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
- _session.remove_bundle (b);
+ _session->remove_bundle (b);
_list_model->erase (i);
}
}
(*i)[_list_model_columns.name] = u->name ();
(*i)[_list_model_columns.bundle] = u;
- u->Changed.connect (sigc::bind (sigc::mem_fun (*this, &BundleManager::bundle_changed), u));
+ u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
}
void
}
void
-BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn* c)
+BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn*)
{
Gtk::TreeModel::iterator i = _list_model->get_iter (p);
if (!i) {
}
NameChannelDialog::NameChannelDialog ()
- : ArdourDialog (_("Add channel")),
+ : ArdourDialog (_("Add Channel")),
_adding (true)
{
setup ();
}
NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
- : ArdourDialog (_("Rename channel")),
+ : ArdourDialog (_("Rename Channel")),
_bundle (b),
_channel (c),
_adding (false)