show() widgets explicitly, one little file at a time

[ardour.git] / gtk2_ardour / io_selector.cc

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index aa7d4a58dc255acfdb2e2e9574f5204c802c2c57..308db8438d9f35c1112b3c81f23fb9a846c10237 100644 (file)
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -30,7 +30,7 @@
 #include <ardour/route.h>
 #include <ardour/audioengine.h>
 #include <ardour/port.h>
-#include <ardour/insert.h>
+#include <ardour/port_insert.h>
 #include <ardour/session.h>
 #include <ardour/audio_diskstream.h>
 
@@ -250,7 +250,7 @@ IOSelector::IOSelector (Session& sess, boost::shared_ptr<IO> ior, bool input)
                io->output_changed.connect (mem_fun(*this, &IOSelector::ports_changed));
        }
 
-       io->name_changed.connect (mem_fun(*this, &IOSelector::name_changed));
+       io->NameChanged.connect (mem_fun(*this, &IOSelector::name_changed));
 }
 
 IOSelector::~IOSelector ()
@@ -298,9 +298,9 @@ IOSelector::set_button_sensitivity ()
 
 
 void
-IOSelector::name_changed (void* src)
+IOSelector::name_changed ()
 {
-       ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::name_changed), src));
+       ENSURE_GUI_THREAD(mem_fun(*this, &IOSelector::name_changed));
        
        display_ports ();
 }
@@ -335,7 +335,7 @@ IOSelector::rescan ()
 
        /* get relevant current JACK ports */
 
-       ports = session.engine().get_ports ("", JACK_DEFAULT_AUDIO_TYPE, for_input ? JackPortIsOutput : JackPortIsInput);
+       ports = session.engine().get_ports ("", io->default_type().to_jack_type(), for_input ? JackPortIsOutput : JackPortIsInput);
 
        if (ports == 0) {
                return;
@@ -765,8 +765,8 @@ IOSelector::redisplay ()
 }
 
 PortInsertUI::PortInsertUI (Session& sess, boost::shared_ptr<PortInsert> pi)
-       : input_selector (sess, pi, true),
-         output_selector (sess, pi, false)
+       : input_selector (sess, pi->io(), true),
+         output_selector (sess, pi->io(), false)
 {
        hbox.pack_start (output_selector, true, true);
        hbox.pack_start (input_selector, true, true);