new MIDI binding maps for Korg nanoKontrol and M-Audio Axiom 25 from Chooch Schubert...
[ardour.git] / gtk2_ardour / io_selector.cc
index 9399a6aaa7c5000c166b0e0219ba970c7baaf218..f3bc947355f80e5e5f71b705ee4c6a9063ac4a93 100644 (file)
@@ -136,6 +136,8 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
        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) {
 
@@ -159,7 +161,7 @@ IOSelector::get_state (ARDOUR::BundleChannel c[2]) const
        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);
 
-       if (our_ports.empty() || other_ports.empty()) {
+       if (!_session || our_ports.empty() || other_ports.empty()) {
                /* we're looking at a bundle with no parts associated with this channel,
                   so nothing to connect */
                return PortMatrixNode::NOT_ASSOCIATED;
@@ -254,7 +256,7 @@ IOSelectorWindow::on_show ()
 }
 
 void
-IOSelectorWindow::io_name_changed (void* src)
+IOSelectorWindow::io_name_changed (void*)
 {
        ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
 
@@ -269,175 +271,3 @@ IOSelectorWindow::io_name_changed (void* src)
        set_title (title);
 }
 
-PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::shared_ptr<ARDOUR::PortInsert> pi)
-        : _pi (pi)
-        , latency_button (_("Measure Latency"))
-        , input_selector (parent, sess, pi->input())
-        , output_selector (parent, sess, pi->output())
-{
-        latency_hbox.pack_start (latency_button, false, false);
-        latency_hbox.pack_start (latency_display, false, false);
-        latency_frame.add (latency_hbox);
-        
-       output_selector.set_min_height_divisor (2);
-       input_selector.set_min_height_divisor (2);
-        
-        pack_start (latency_frame);
-       pack_start (output_selector, true, true);
-       pack_start (input_selector, true, true);
-
-        latency_button.signal_toggled().connect (mem_fun (*this, &PortInsertUI::latency_button_toggled));
-}
-
-bool
-PortInsertUI::check_latency_measurement ()
-{
-        MTDM* mtdm = _pi->mtdm ();
-
-        if (mtdm->resolve () < 0) {
-                latency_display.set_text (_("No signal detected"));
-                return true;
-        }
-
-        if (mtdm->err () > 0.3) {
-                mtdm->invert ();
-                mtdm->resolve ();
-        }
-
-        char buf[64];
-        nframes_t sample_rate = AudioEngine::instance()->frame_rate();
-
-        if (sample_rate == 0) {
-                latency_display.set_text (_("Disconnected from audio engine"));
-                _pi->stop_latency_detection ();
-                return false;
-        }
-
-        snprintf (buf, sizeof (buf), "%10.3lf frames %10.3lf ms", mtdm->del (), mtdm->del () * 1000.0f/sample_rate);
-
-        bool solid = true;
-
-        if (mtdm->err () > 0.2) {
-                strcat (buf, " ??");
-                solid = false;
-        }
-
-        if (mtdm->inv ()) {
-                strcat (buf, " (Inv)");
-                solid = false;
-        }
-
-        if (solid) {
-                _pi->set_measured_latency ((nframes_t) rint (mtdm->del()));
-                strcat (buf, " (set)");
-        }
-
-        latency_display.set_text (buf);
-        return true;
-}
-
-void
-PortInsertUI::latency_button_toggled ()
-{
-        if (latency_button.get_active ()) {
-
-                _pi->start_latency_detection ();
-                latency_display.set_text (_("Detecting ..."));
-                latency_timeout = Glib::signal_timeout().connect (mem_fun (*this, &PortInsertUI::check_latency_measurement), 250);
-
-        } else {
-                _pi->stop_latency_detection ();
-                latency_timeout.disconnect ();
-        }
-}
-
-
-void
-PortInsertUI::redisplay ()
-{
-       input_selector.setup_ports (input_selector.other());
-       output_selector.setup_ports (output_selector.other());
-}
-
-void
-PortInsertUI::finished (IOSelector::Result r)
-{
-       input_selector.Finished (r);
-       output_selector.Finished (r);
-}
-
-
-PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARDOUR::PortInsert> pi, bool can_cancel)
-       : ArdourDialog ("port insert dialog"),
-         _portinsertui (this, sess, pi),
-         ok_button (can_cancel ? _("OK"): _("Close")),
-         cancel_button (_("Cancel"))
-{
-
-       set_name ("IOSelectorWindow");
-       string title = _("Port Insert ");
-       title += pi->name();
-       set_title (title);
-
-       ok_button.set_name ("IOSelectorButton");
-       if (!can_cancel) {
-               ok_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON)));
-       }
-       cancel_button.set_name ("IOSelectorButton");
-
-       if (can_cancel) {
-               cancel_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CANCEL, Gtk::ICON_SIZE_BUTTON)));
-               get_action_area()->pack_start (cancel_button, false, false);
-       } else {
-               cancel_button.hide();
-       }
-       get_action_area()->pack_start (ok_button, false, false);
-
-       get_vbox()->pack_start (_portinsertui);
-
-       ok_button.signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
-       cancel_button.signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::cancel));
-
-       signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
-
-       pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context());
-}
-
-bool
-PortInsertWindow::wm_delete (GdkEventAny* /*event*/)
-{
-       accept ();
-       return true;
-}
-
-void
-PortInsertWindow::plugin_going_away ()
-{
-       ENSURE_GUI_THREAD (*this, &PortInsertWindow::plugin_going_away)
-
-       going_away_connection.disconnect ();
-       delete_when_idle (this);
-}
-
-void
-PortInsertWindow::on_map ()
-{
-       _portinsertui.redisplay ();
-       Window::on_map ();
-}
-
-
-void
-PortInsertWindow::cancel ()
-{
-       _portinsertui.finished (IOSelector::Cancelled);
-       hide ();
-}
-
-void
-PortInsertWindow::accept ()
-{
-       _portinsertui.finished (IOSelector::Accepted);
-       hide ();
-}
-