*/
-#include <gtkmm/messagedialog.h>
+#include <stdint.h>
+
#include <glibmm/objectbase.h>
#include <gtkmm2ext/doi.h>
-#include "ardour/port_insert.h"
-#include "ardour/session.h"
-#include "ardour/io.h"
#include "ardour/audioengine.h"
-#include "ardour/track.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/mtdm.h"
+#include "ardour/bundle.h"
#include "ardour/data_type.h"
+#include "ardour/io.h"
#include "ardour/port.h"
-#include "ardour/bundle.h"
+#include "ardour/session.h"
#include "io_selector.h"
#include "utils.h"
#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace Gtk;
IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io)
, _io (io)
{
setup_type ();
-
+
/* signal flow from 0 to 1 */
_find_inputs_for_io_outputs = (_io->direction() == IO::Output);
so we can't call setup_all_ports (which results in a call to Route::foreach_processor)
without a deadlock unless we break things up with this idle handler.
*/
-
+
Glib::signal_idle().connect_once (sigc::mem_fun (*this, &IOSelector::io_changed));
}
if (dim == _other) {
- _ports[_other].gather (_session, type(), _find_inputs_for_io_outputs, false);
+ _ports[_other].gather (_session, type(), _find_inputs_for_io_outputs, false, show_only_bundles ());
} else {
ARDOUR::Bundle::PortList const & our_ports = c[_ours].bundle->channel_ports (c[_ours].channel);
ARDOUR::Bundle::PortList const & other_ports = c[_other].bundle->channel_ports (c[_other].channel);
- Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock());
-
for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) {
for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
- Port* f = _session->engine().get_port_by_name (*i);
+ boost::shared_ptr<Port> f = _session->engine().get_port_by_name (*i);
if (!f) {
return;
}
- if (s) {
- _io->connect (f, *j, 0);
- } else {
- _io->disconnect (f, *j, 0);
- }
+ if (s) {
+ if (!f->connected_to (*j)) {
+ _io->connect (f, *j, 0);
+ }
+ } else {
+ if (f->connected_to (*j)) {
+ _io->disconnect (f, *j, 0);
+ }
+ }
}
}
}
PortMatrixNode::State
IOSelector::get_state (ARDOUR::BundleChannel c[2]) const
{
+ if (c[0].bundle->nchannels() == ChanCount::ZERO || c[1].bundle->nchannels() == ChanCount::ZERO) {
+ return PortMatrixNode::NOT_ASSOCIATED;
+ }
+
ARDOUR::Bundle::PortList const & our_ports = c[_ours].bundle->channel_ports (c[_ours].channel);
ARDOUR::Bundle::PortList const & other_ports = c[_other].bundle->channel_ports (c[_other].channel);
for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) {
for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) {
- Port* f = _session->engine().get_port_by_name (*i);
+ boost::shared_ptr<Port> f = _session->engine().get_port_by_name (*i);
/* since we are talking about an IO, our ports should all have an associated Port *,
so the above call should never fail */
return (dim == _other);
}
-string
+std::string
IOSelector::disassociation_verb () const
{
return _("Disconnect");
}
-string
+std::string
IOSelector::channel_noun () const
{
return _("port");
}
IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
- : _selector (this, session, io)
+ : ArdourWindow (_("I/O selector"))
+ , _selector (this, session, io)
{
set_name ("IOSelectorWindow2");
- set_title (_("I/O selector"));
add (_selector);
- set_position (Gtk::WIN_POS_MOUSE);
-
io_name_changed (this);
show_all ();
IOSelectorWindow::wm_delete (GdkEventAny* /*event*/)
{
_selector.Finished (IOSelector::Accepted);
- hide ();
- return true;
+ return false;
}
IOSelectorWindow::on_show ()
{
Gtk::Window::on_show ();
- pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
+ std::pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
}
{
ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
- string title;
+ std::string title;
if (!_selector.find_inputs_for_io_outputs()) {
title = string_compose(_("%1 input"), _selector.io()->name());