move color column for editor groups up front

[ardour.git] / gtk2_ardour / io_selector.cc

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index b9e19de7adb867df65427576e7b99bfc6c4ef9f0..d7b65dc58b68354e5ca05e882ecaeeb46bd90814 100644 (file)
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <gtkmm/messagedialog.h>
 #include <glibmm/objectbase.h>
 
 #include <gtkmm2ext/doi.h>
@@ -139,15 +138,19 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
        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);
+                               if (!f->connected_to (*j)) {
+                                       _io->connect (f, *j, 0);
+                               }
                         } else {
-                                _io->disconnect (f, *j, 0);
+                               if (f->connected_to (*j)) {
+                                       _io->disconnect (f, *j, 0);
+                               }
                         }
                }
        }
@@ -172,7 +175,7 @@ IOSelector::get_state (ARDOUR::BundleChannel c[2]) const
        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 */
@@ -217,12 +220,12 @@ IOSelector::channel_noun () const
 }
 
 IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
-       : ArdourDialog (_("I/O selector"))
-        , _selector (this, session, io)
+       : ArdourWindow (_("I/O selector"))
+       , _selector (this, session, io)
 {
        set_name ("IOSelectorWindow2");
 
-       get_vbox()->pack_start (_selector);
+       add (_selector);
 
        set_position (Gtk::WIN_POS_MOUSE);