try to restore original semantics for scheduling butler transport work in Session...

[ardour.git] / gtk2_ardour / lxvst_plugin_ui.cc

diff --git a/gtk2_ardour/lxvst_plugin_ui.cc b/gtk2_ardour/lxvst_plugin_ui.cc
index 31bb6c879b64663d7e40f2a86d85c89bf17177e1..17dc89255a76ea765789736e0434de3147732303 100644 (file)
--- a/gtk2_ardour/lxvst_plugin_ui.cc
+++ b/gtk2_ardour/lxvst_plugin_ui.cc
@@ -18,9 +18,9 @@
 */
 
 #include "ardour/lxvst_plugin.h"
-#include "ardour/vstfx.h"
+#include "ardour/linux_vst_support.h"
 #include "lxvst_plugin_ui.h"
-#include "ardour_ui.h"
+#include "timers.h"
 #include <gdk/gdkx.h>
 
 #define LXVST_H_FIDDLE 40
@@ -46,15 +46,15 @@ LXVSTPluginUI::~LXVSTPluginUI ()
 
 
 bool
-LXVSTPluginUI::start_updating (GdkEventAny* ignored)
+LXVSTPluginUI::start_updating (GdkEventAny*)
 {
        _screen_update_connection.disconnect();
-       _screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun(*this, &LXVSTPluginUI::resize_callback));
+       _screen_update_connection = Timers::rapid_connect (mem_fun(*this, &LXVSTPluginUI::resize_callback));
        return false;
 }
 
 bool
-LXVSTPluginUI::stop_updating (GdkEventAny* ignored)
+LXVSTPluginUI::stop_updating (GdkEventAny*)
 {
        _screen_update_connection.disconnect();
        return false;
@@ -116,7 +116,7 @@ LXVSTPluginUI::package (Gtk::Window& win)
 }
 
 void
-LXVSTPluginUI::forward_key_event (GdkEventKey* ev)
+LXVSTPluginUI::forward_key_event (GdkEventKey*)
 {
        std::cerr << "LXVSTPluginUI : keypress forwarding to linuxVSTs unsupported" << std::endl;
 }
@@ -141,7 +141,7 @@ LXVSTPluginUI::get_XID ()
        */
        
        while (!(_vst->state()->been_activated)) {
-               usleep (1000);
+               Glib::usleep (1000);
        }
        
        int const id = _vst->state()->xid;
@@ -163,7 +163,7 @@ static error_handler_t vstfx_error_handler;
 static error_handler_t gtk_error_handler;
 
 static int 
-gtk_xerror_handler (Display* disp, XErrorEvent* ev)
+gtk_xerror_handler (Display*, XErrorEvent*)
 {
        std::cerr << "** ERROR ** LXVSTPluginUI : Trapped an X Window System Error" << std::endl;