Always optimize zita-resampler, nothing to debug here

[ardour.git] / gtk2_ardour / plugin_ui.cc

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 32e7fb18c9c201321a99e3c7d66b260dcc2a6abe..a91a0b81975860ccab276dcda412b500662d1469 100644 (file)
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -32,15 +32,13 @@
 
 #include "gtkmm/widget.h"
 #include "gtkmm/box.h"
-#include "gtkmm2ext/click_box.h"
-#include "gtkmm2ext/fastmeter.h"
-#include "gtkmm2ext/barcontroller.h"
+
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/doi.h"
-#include "gtkmm2ext/slider_controller.h"
 #include "gtkmm2ext/application.h"
 
 #include "widgets/tooltips.h"
+#include "widgets/fastmeter.h"
 
 #include "ardour/session.h"
 #include "ardour/plugin.h"
@@ -65,7 +63,6 @@
 
 #include "ardour_window.h"
 #include "ardour_ui.h"
-#include "prompter.h"
 #include "plugin_ui.h"
 #include "utils.h"
 #include "gui_thread.h"
@@ -432,12 +429,12 @@ PluginUIWindow::on_key_release_event (GdkEventKey *event)
                        if (_pluginui->non_gtk_gui()) {
                                _pluginui->forward_key_event (event);
                        }
-                       return true;
                }
-               return false;
        } else {
-               return true;
+               gtk_window_propagate_key_event (GTK_WINDOW(gobj()), event);
        }
+       /* don't forward releases */
+       return true;
 }
 
 void
@@ -552,8 +549,8 @@ PlugUIBase::plugin_going_away ()
 void
 PlugUIBase::set_latency_label ()
 {
-       framecnt_t const l = insert->effective_latency ();
-       framecnt_t const sr = insert->session().frame_rate ();
+       samplecnt_t const l = insert->effective_latency ();
+       samplecnt_t const sr = insert->session().sample_rate ();
 
        string t;
 
@@ -570,7 +567,7 @@ void
 PlugUIBase::latency_button_clicked ()
 {
        if (!latency_gui) {
-               latency_gui = new LatencyGUI (*(insert.get()), insert->session().frame_rate(), insert->session().get_block_size());
+               latency_gui = new LatencyGUI (*(insert.get()), insert->session().sample_rate(), insert->session().get_block_size());
                latency_dialog = new ArdourWindow (_("Edit Latency"));
                /* use both keep-above and transient for to try cover as many
                   different WM's as possible.