/*
- Copyright (C) 2007 Paul Davis
+ Copyright (C) 2007 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
#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 ();
}
BundleEditorMatrix::get_state (BundleChannel c[2]) const
{
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;
BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b)
{
if (b == _bundle) {
-
+
NameChannelDialog d;
d.set_position (Gtk::WIN_POS_MOUSE);
-
+
if (d.run () != Gtk::RESPONSE_ACCEPT) {
return;
}
-
+
_bundle->add_channel (d.get_name());
setup_ports (OURS);
-
+
} else {
-
+
PortMatrix::add_channel (b);
-
+
}
}
return (dim == OTHER);
}
-BundleEditor::BundleEditor (Session& session, boost::shared_ptr<UserBundle> bundle, bool add)
+string
+BundleEditorMatrix::disassociation_verb () const
+{
+ return _("Disassociate");
+}
+
+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);
t->attach (*Gtk::manage (a), 1, 2, 1, 2);
_input_or_output.append_text (_("Input"));
_input_or_output.append_text (_("Output"));
-
+
if (bundle->ports_are_inputs()) {
_input_or_output.set_active_text (_("Input"));
} else {
a = new Gtk::Alignment (0, 0.5, 0, 1);
a->add (_type);
t->attach (*Gtk::manage (a), 1, 2, 2, 3);
-
+
_type.append_text (_("Audio"));
_type.append_text (_("MIDI"));
-
+
switch (bundle->type ()) {
case DataType::AUDIO:
_type.set_active_text (_("Audio"));
}
_type.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::type_changed));
-
+
get_vbox()->pack_start (*Gtk::manage (t), false, false);
get_vbox()->pack_start (_matrix);
get_vbox()->set_spacing (4);
- add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
- if (add) {
- add_button (Gtk::Stock::ADD, Gtk::RESPONSE_ACCEPT);
- } else {
- add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_ACCEPT);
- }
-
+ add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
show_all ();
+}
- resize (32768, 32768);
+void
+BundleEditor::on_show ()
+{
+ Gtk::Window::on_show ();
+ pair<uint32_t, uint32_t> const pm_max = _matrix.max_size ();
+ resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
}
void
BundleEditor::input_or_output_changed ()
{
_bundle->remove_ports_from_channels ();
-
+
if (_input_or_output.get_active_text() == _("Output")) {
_bundle->set_ports_are_outputs ();
} else {
BundleEditor::type_changed ()
{
_bundle->remove_ports_from_channels ();
-
+
DataType const t = _type.get_active_text() == _("Audio") ?
DataType::AUDIO : DataType::MIDI;
}
-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);
}
-
+
/* New / Edit / Delete buttons */
Gtk::VBox* buttons = new Gtk::VBox;
buttons->set_spacing (8);
delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::DELETE, Gtk::ICON_SIZE_BUTTON)));
delete_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::delete_clicked));
buttons->pack_start (delete_button, false, false);
-
+
Gtk::HBox* h = new Gtk::HBox;
h->set_spacing (8);
h->set_border_width (8);
sigc::mem_fun (*this, &BundleManager::set_button_sensitivity)
);
+ _tree_view.signal_row_activated().connect (
+ sigc::mem_fun (*this, &BundleManager::row_activated)
+ );
+
set_button_sensitivity ();
show_all ();
/* Start off with a single channel */
b->add_channel ("1");
- BundleEditor e (_session, b, true);
+ _session->add_bundle (b);
+ add_bundle (b);
- if (e.run () == Gtk::RESPONSE_ACCEPT) {
- _session.add_bundle (b);
- add_bundle (b);
- }
+ BundleEditor e (_session, b);
+ e.run ();
}
void
Gtk::TreeModel::iterator i = _tree_view.get_selection()->get_selected();
if (i) {
boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
- BundleEditor e (_session, b, false);
- if (e.run () == Gtk::RESPONSE_ACCEPT) {
- _session.set_dirty ();
- }
+ BundleEditor e (_session, b);
+ e.run ();
}
}
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
if ((c & Bundle::NameChanged) == 0) {
return;
}
-
+
Gtk::TreeModel::iterator i = _list_model->children().begin ();
while (i != _list_model->children().end()) {
boost::shared_ptr<UserBundle> t = (*i)[_list_model_columns.bundle];
}
}
+void
+BundleManager::row_activated (Gtk::TreeModel::Path const & p, Gtk::TreeViewColumn*)
+{
+ Gtk::TreeModel::iterator i = _list_model->get_iter (p);
+ if (!i) {
+ return;
+ }
+
+ boost::shared_ptr<UserBundle> b = (*i)[_list_model_columns.bundle];
+ BundleEditor e (_session, b);
+ e.run ();
+}
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)
void
NameChannelDialog::setup ()
-{
+{
Gtk::HBox* box = Gtk::manage (new Gtk::HBox ());
box->pack_start (*Gtk::manage (new Gtk::Label (_("Name"))));
box->pack_start (_name);
+ _name.set_activates_default (true);
get_vbox ()->pack_end (*box);
box->show_all ();
{
return _name.get_text ();
}
+
projects / ardour.git / blobdiff