From c65b95f6d383dc5f74037d9ba6db96efe7a7f2d3 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 25 Feb 2012 09:19:03 +0000
Subject: [PATCH] Tidy.

git-svn-id: svn://localhost/ardour2/branches/3.0@11520 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/lv2_plugin_ui.cc |  5 ++---
 gtk2_ardour/lv2_plugin_ui.h  | 37 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index 70fbf448c6..7cf230e4ec 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008-2011 Paul Davis
+    Copyright (C) 2008-2012 Paul Davis
     Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,6 @@
     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.
-
 */
 
 #include "ardour/lv2_plugin.h"
@@ -31,8 +30,8 @@
 #include <lilv/lilv.h>
 #include <suil/suil.h>
 
-using namespace Gtk;
 using namespace ARDOUR;
+using namespace Gtk;
 using namespace PBD;
 
 #define NS_UI "http://lv2plug.in/ns/extensions/ui#"
diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h
index 8500312856..071ad2a1dc 100644
--- a/gtk2_ardour/lv2_plugin_ui.h
+++ b/gtk2_ardour/lv2_plugin_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008-2011 Paul Davis
+    Copyright (C) 2008-2012 Paul Davis
     Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,6 @@
     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.
-
 */
 
 #ifndef __ardour_lv2_plugin_ui_h__
@@ -25,12 +24,12 @@
 #include "gtk2ardour-config.h"
 #endif
 
-#include <vector>
-#include <map>
 #include <list>
+#include <map>
+#include <vector>
 
-#include <sigc++/signal.h>
 #include <gtkmm/widget.h>
+#include <sigc++/signal.h>
 
 #include "ardour_dialog.h"
 #include "ardour/types.h"
@@ -48,7 +47,8 @@ namespace ARDOUR {
 class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 {
   public:
-	LV2PluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::LV2Plugin>);
+	LV2PluginUI (boost::shared_ptr<ARDOUR::PluginInsert>,
+	             boost::shared_ptr<ARDOUR::LV2Plugin>);
 	~LV2PluginUI ();
 
 	gint get_preferred_height ();
@@ -62,23 +62,22 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 
 	void parameter_changed (uint32_t, float);
 
+	typedef boost::shared_ptr<ARDOUR::AutomationControl> ControllableRef;
+
 	boost::shared_ptr<ARDOUR::LV2Plugin> _lv2;
-	std::vector<int> _output_ports;
-	sigc::connection _screen_update_connection;
-
-	Gtk::Widget* _gui_widget;
-	float*       _values;
-	std::vector<boost::shared_ptr<ARDOUR::AutomationControl> > _controllables;
-
-	struct lv2_external_ui_host _external_ui_host;
-	LV2_Feature _external_ui_feature;
-	struct lv2_external_ui* _external_ui_ptr;
-	Gtk::Window* _win_ptr;
+	std::vector<int>                     _output_ports;
+	sigc::connection                     _screen_update_connection;
+	Gtk::Widget*                         _gui_widget;
+	float*                               _values;
+	std::vector<ControllableRef>         _controllables;
+	struct lv2_external_ui_host          _external_ui_host;
+	LV2_Feature                          _external_ui_feature;
+	struct lv2_external_ui*              _external_ui_ptr;
+	Gtk::Window*                         _win_ptr;
+	void*                                _inst;
 
 	static void on_external_ui_closed(void* controller);
 
-	void* _inst;
-
 	static void write_from_ui(void*       controller,
 	                          uint32_t    port_index,
 	                          uint32_t    buffer_size,