Fix crash when X11 is not available for VST UIs

[ardour.git] / gtk2_ardour / lxvst_plugin_ui.h

diff --git a/gtk2_ardour/lxvst_plugin_ui.h b/gtk2_ardour/lxvst_plugin_ui.h
index 522f24c2dacace476354007b8688dc821ad79085..2cc775322e01289498cef827ce4e7ef0f68b9e01 100644 (file)
--- a/gtk2_ardour/lxvst_plugin_ui.h
+++ b/gtk2_ardour/lxvst_plugin_ui.h
@@ -1,26 +1,26 @@
 /*
-    Copyright (C) 2012 Paul Davis 
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2011-2015 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2013-2017 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __lxvst_plugin_ui_h__
 #define __lxvst_plugin_ui_h__
 
-#include <sigc++/signal.h>
+#include "pbd/signals.h"
 #include "vst_plugin_ui.h"
 
 #ifdef LXVST_SUPPORT
@@ -32,14 +32,14 @@ namespace ARDOUR {
 
 class LXVSTPluginUI : public VSTPluginUI
 {
-  public:
+public:
        LXVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
        ~LXVSTPluginUI ();
 
        int get_preferred_height ();
-       
-       bool start_updating (GdkEventAny *);
-       bool stop_updating (GdkEventAny *);
+
+       bool start_updating (GdkEventAny*) { return false; }
+       bool stop_updating (GdkEventAny*) { return false; }
 
        int package (Gtk::Window&);
        void forward_key_event (GdkEventKey *);
@@ -49,7 +49,7 @@ private:
        void resize_callback ();
        int get_XID ();
 
-       sigc::connection _screen_update_connection;
+       PBD::ScopedConnection _resize_connection;
 };
 
 #endif //LXVST_SUPPORT