Connect Script Manager "Edit" -> Lua Scripting Window

[ardour.git] / gtk2_ardour / port_insert_ui.cc

diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc
index 5546fd533b53223aaba6e619eee1eec40cf5ce48..0bf86532995e0d4f15c205b51e29694cdb76bce7 100644 (file)
--- a/gtk2_ardour/port_insert_ui.cc
+++ b/gtk2_ardour/port_insert_ui.cc
@@ -22,22 +22,14 @@
 
 #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/data_type.h"
-#include "ardour/port.h"
-#include "ardour/bundle.h"
+#include "ardour/port_insert.h"
+#include "ardour/session.h"
 
 #include "port_insert_ui.h"
-#include "utils.h"
 #include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace Gtk;
@@ -50,6 +42,7 @@ PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::s
 {
         latency_hbox.pack_start (latency_button, false, false);
         latency_hbox.pack_start (latency_display, false, false);
+       latency_hbox.set_spacing (4);
 
        output_selector.set_min_height_divisor (2);
        input_selector.set_min_height_divisor (2);
@@ -58,7 +51,7 @@ PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::s
         notebook.append_page (input_selector, _("Return/Input"));
 
         notebook.set_current_page (0);
-        
+
         set_spacing (12);
         pack_start (notebook, true, true);
         pack_start (latency_hbox, false, false);
@@ -66,17 +59,18 @@ PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::s
         update_latency_display ();
 
         latency_button.signal_toggled().connect (mem_fun (*this, &PortInsertUI::latency_button_toggled));
+       latency_button.set_name (X_("MeasureLatencyButton"));
 }
 
 void
 PortInsertUI::update_latency_display ()
 {
-        framecnt_t const sample_rate = input_selector.session()->engine().frame_rate();
+        framecnt_t const sample_rate = AudioEngine::instance()->sample_rate();
         if (sample_rate == 0) {
                 latency_display.set_text (_("Disconnected from audio engine"));
         } else {
                 char buf[64];
-                snprintf (buf, sizeof (buf), "%10.3lf frames %10.3lf ms", 
+                snprintf (buf, sizeof (buf), "%10.3lf frames %10.3lf ms",
                           (float)_pi->latency(), (float)_pi->latency() * 1000.0f/sample_rate);
                 latency_display.set_text(buf);
         }
@@ -98,7 +92,7 @@ PortInsertUI::check_latency_measurement ()
         }
 
         char buf[128];
-        framecnt_t const sample_rate = AudioEngine::instance()->frame_rate();
+        framecnt_t const sample_rate = AudioEngine::instance()->sample_rate();
 
         if (sample_rate == 0) {
                 latency_display.set_text (_("Disconnected from audio engine"));
@@ -168,31 +162,26 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
 {
 
        set_name ("IOSelectorWindow");
-       string title = _("Port Insert ");
+       std::string title = _("Port Insert ");
        title += pi->name();
        set_title (title);
 
        get_vbox()->pack_start (_portinsertui);
 
-       signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
+       Gtk::Button* cancel_but = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+       Gtk::Button* ok_but = add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+
+       cancel_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::cancel));
+       ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
 
-       pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context());
+       signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
 }
 
 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);
+       return false;
 }
 
 void