NO-OP whitespace & foratting of header files

112 files changed, 697 insertions, 684 deletions

diff --git a/gtk2_ardour/about.h b/gtk2_ardour/about.h
index 83e9c4b69d..47340f907d 100644
--- a/gtk2_ardour/about.h
+++ b/gtk2_ardour/about.h
@@ -28,11 +28,11 @@ class ConfigInfoDialog;
 
 class About : public Gtk::AboutDialog, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	About ();
 	~About ();
 
-  private:
+private:
 	ConfigInfoDialog* config_info;
 	void show_config_info ();
 
diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h
index c79fe477c8..cb6ed66812 100644
--- a/gtk2_ardour/add_route_dialog.h
+++ b/gtk2_ardour/add_route_dialog.h
@@ -47,7 +47,7 @@ class RouteGroupDialog;
 
 class AddRouteDialog : public ArdourDialog
 {
-  public:
+public:
 	AddRouteDialog ();
 	~AddRouteDialog ();
 
@@ -80,11 +80,11 @@ class AddRouteDialog : public ArdourDialog
 	RouteDialogs::InsertAt insert_at();
 	bool use_strict_io();
 
- 	void on_response (int response_id) {
+	void on_response (int response_id) {
 		Gtk::Dialog::on_response (response_id);
 	}
 
-  private:
+private:
 	Gtk::Entry name_template_entry;
 	Gtk::ComboBoxText track_bus_combo;
 	Gtk::Adjustment routes_adjustment;
@@ -117,9 +117,9 @@ class AddRouteDialog : public ArdourDialog
 	void on_show ();
 
 	struct ChannelSetup {
-	    std::string name;
-	    std::string template_path;
-	    uint32_t    channels;
+		std::string name;
+		std::string template_path;
+		uint32_t    channels;
 	};
 
 	typedef std::vector<ChannelSetup> ChannelSetups;
diff --git a/gtk2_ardour/add_video_dialog.h b/gtk2_ardour/add_video_dialog.h
index 3d5ff54030..6e3ced2dbf 100644
--- a/gtk2_ardour/add_video_dialog.h
+++ b/gtk2_ardour/add_video_dialog.h
@@ -40,7 +40,7 @@ enum VtlImportOption {
 
 class AddVideoDialog : public ArdourDialog
 {
-  public:
+public:
 	AddVideoDialog (ARDOUR::Session*);
 	~AddVideoDialog ();
 
@@ -49,7 +49,7 @@ class AddVideoDialog : public ArdourDialog
 	bool launch_xjadeo ();
 	bool auto_set_session_fps ();
 
-  private:
+private:
 	void on_show ();
 	bool page_switch();
 	void set_action_ok(bool yn);
@@ -87,7 +87,7 @@ class AddVideoDialog : public ArdourDialog
 	/* Harvid Browser related */
 	class HarvidColumns : public Gtk::TreeModel::ColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<std::string> id;
 		Gtk::TreeModelColumn<std::string> uri;
 		Gtk::TreeModelColumn<std::string> filename;
diff --git a/gtk2_ardour/ardour_display.h b/gtk2_ardour/ardour_display.h
index 1b7c65480e..e80f8fdc57 100644
--- a/gtk2_ardour/ardour_display.h
+++ b/gtk2_ardour/ardour_display.h
@@ -31,17 +31,15 @@
 
 class ArdourDisplay : public ArdourDropdown
 {
-  public:
+public:
 
 	ArdourDisplay (Element e = default_elements);
 	virtual ~ArdourDisplay ();
 
 	boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
- 	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
+	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
 
-//	bool on_button_release_event (GdkEventButton*);
 	bool on_scroll_event (GdkEventScroll* ev);
-//	bool on_motion_notify_event (GdkEventMotion *ev) ;
 
 	void add_controllable_preset (const char*, float);
 	void handle_controllable_preset (float p);
diff --git a/gtk2_ardour/ardour_dropdown.h b/gtk2_ardour/ardour_dropdown.h
index ee8b320b83..9931a91e3c 100644
--- a/gtk2_ardour/ardour_dropdown.h
+++ b/gtk2_ardour/ardour_dropdown.h
@@ -31,7 +31,7 @@
 
 class ArdourDropdown : public ArdourButton
 {
-  public:
+public:
 
 	ArdourDropdown (Element e = default_elements);
 	virtual ~ArdourDropdown ();
@@ -47,7 +47,7 @@ class ArdourDropdown : public ArdourButton
 
 	Gtk::Menu_Helpers::MenuList& items () { return _menu.items (); }
 
-  private:
+private:
 	Gtk::Menu      _menu;
 
 	bool _scrolling_disabled;
diff --git a/gtk2_ardour/au_pluginui.h b/gtk2_ardour/au_pluginui.h
index a8582cd955..eafe822078 100644
--- a/gtk2_ardour/au_pluginui.h
+++ b/gtk2_ardour/au_pluginui.h
@@ -14,7 +14,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 __gtk2_ardour_auplugin_ui_h__
@@ -75,7 +74,7 @@ class AUPluginUI;
 
 class AUPluginUI : public PlugUIBase, public Gtk::VBox
 {
-  public:
+public:
 	AUPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>);
 	~AUPluginUI ();
 
@@ -110,7 +109,7 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
 	void start_live_resize ();
 	void end_live_resize ();
 
-  private:
+private:
 	WindowRef wr;
 	boost::shared_ptr<ARDOUR::AUPlugin> au;
 	int prefheight;
@@ -133,7 +132,7 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
 
 	NSWindow*           cocoa_window;
 	NSView*             au_view;
-        NSRect              last_au_frame;
+	NSRect              last_au_frame;
 	bool                in_live_resize;
 	uint32_t            plugin_requested_resize;
 
@@ -175,7 +174,7 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
 	static bool timer_callback ();
 	static sigc::connection timer_connection;
 
-  public:
+public:
 	static void start_cf_timer ();
 	static void stop_cf_timer ();
 };
diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h
index 083a39dfbc..4d8c9de9bc 100644
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -51,13 +51,13 @@ class AudioRegionView;
 
 class AudioRegionEditor : public RegionEditor
 {
-  public:
+public:
 	AudioRegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::AudioRegion>);
 	~AudioRegionEditor ();
 
 	void peak_amplitude_thread ();
 
-  private:
+private:
 
 	void region_changed (PBD::PropertyChange const &);
 
diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index ed160301ac..cc0ab0500e 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -50,20 +50,20 @@ class RouteTimeAxisView;
 
 class AudioRegionView : public RegionView
 {
-  public:
+public:
 	AudioRegionView (ArdourCanvas::Container *,
-			 RouteTimeAxisView&,
-			 boost::shared_ptr<ARDOUR::AudioRegion>,
-			 double initial_samples_per_pixel,
-			 uint32_t base_color);
+	                 RouteTimeAxisView&,
+	                 boost::shared_ptr<ARDOUR::AudioRegion>,
+	                 double initial_samples_per_pixel,
+	                 uint32_t base_color);
 
 	AudioRegionView (ArdourCanvas::Container *,
-			 RouteTimeAxisView&,
-			 boost::shared_ptr<ARDOUR::AudioRegion>,
-			 double samples_per_pixel,
-			 uint32_t base_color,
-			 bool recording,
-			 TimeAxisViewItem::Visibility);
+	                 RouteTimeAxisView&,
+	                 boost::shared_ptr<ARDOUR::AudioRegion>,
+	                 double samples_per_pixel,
+	                 uint32_t base_color,
+	                 bool recording,
+	                 TimeAxisViewItem::Visibility);
 
 	AudioRegionView (const AudioRegionView& other, boost::shared_ptr<ARDOUR::AudioRegion>);
 
@@ -138,12 +138,12 @@ class AudioRegionView : public RegionView
 		return _end_xfade_visible;
 	}
 
-  protected:
+protected:
 
 	/* this constructor allows derived types
-	   to specify their visibility requirements
-	   to the TimeAxisViewItem parent class
-	*/
+	 * to specify their visibility requirements
+	 * to the TimeAxisViewItem parent class
+	 */
 
 	enum Flags {
 		WaveformVisible = 0x4,
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index 443a39063b..53da6e9eb0 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -50,7 +50,7 @@ class Selection;
 
 class AudioStreamView : public StreamView
 {
-  public:
+public:
 	AudioStreamView (AudioTimeAxisView&);
 
 	int     set_amplitude_above_axis (gdouble app);
@@ -64,7 +64,7 @@ class AudioStreamView : public StreamView
 	RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool);
 	void set_selected_points (PointSelection&);
 
-  private:
+private:
 	void setup_rec_box ();
 	void rec_peak_range_ready (framepos_t start, ARDOUR::framecnt_t cnt, boost::weak_ptr<ARDOUR::Source> src);
 	void update_rec_regions (ARDOUR::framepos_t, ARDOUR::framecnt_t);
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 521cef8c2a..a5f8beffff 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -63,9 +63,9 @@ class AutomationTimeAxisView;
 
 class AudioTimeAxisView : public RouteTimeAxisView
 {
-  public:
- 	AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
- 	virtual ~AudioTimeAxisView ();
+public:
+	AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
+	virtual ~AudioTimeAxisView ();
 
 	void set_route (boost::shared_ptr<ARDOUR::Route>);
 
@@ -80,7 +80,7 @@ class AudioTimeAxisView : public RouteTimeAxisView
 
 	void first_idle ();
 
-  private:
+private:
 	friend class AudioStreamView;
 	friend class AudioRegionView;
 
diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h
index 67f720dc5f..eed0bb7bbb 100644
--- a/gtk2_ardour/automation_streamview.h
+++ b/gtk2_ardour/automation_streamview.h
@@ -40,7 +40,7 @@ class AutomationRegionView;
 
 class AutomationStreamView : public StreamView
 {
-  public:
+public:
 	AutomationStreamView (AutomationTimeAxisView& tv);
 	~AutomationStreamView ();
 
@@ -70,7 +70,7 @@ class AutomationStreamView : public StreamView
 	            float                                     times,
 	            boost::shared_ptr<ARDOUR::AutomationList> list);
 
-  private:
+private:
 	void setup_rec_box ();
 
 	RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_data, bool recording = false);
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 1ca2e75712..e95199ae15 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -54,19 +54,20 @@ class AutomationStreamView;
 class AutomationController;
 class ItemCounts;
 
-class AutomationTimeAxisView : public TimeAxisView {
-  public:
+class AutomationTimeAxisView : public TimeAxisView
+{
+public:
 	AutomationTimeAxisView (ARDOUR::Session*,
-				boost::shared_ptr<ARDOUR::Stripable>,
-				boost::shared_ptr<ARDOUR::Automatable>,
-				boost::shared_ptr<ARDOUR::AutomationControl>,
-				Evoral::Parameter,
-				PublicEditor&,
-				TimeAxisView& parent,
-				bool show_regions,
-				ArdourCanvas::Canvas& canvas,
-				const std::string & name, /* translatable */
-				const std::string & plug_name = "");
+	                        boost::shared_ptr<ARDOUR::Stripable>,
+	                        boost::shared_ptr<ARDOUR::Automatable>,
+	                        boost::shared_ptr<ARDOUR::AutomationControl>,
+	                        Evoral::Parameter,
+	                        PublicEditor&,
+	                        TimeAxisView& parent,
+	                        bool show_regions,
+	                        ArdourCanvas::Canvas& canvas,
+	                        const std::string & name, /* translatable */
+	                        const std::string & plug_name = "");
 
 	~AutomationTimeAxisView();
 
@@ -127,10 +128,10 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 	static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
 
-  protected:
+protected:
 	/* Note that for MIDI controller "automation" (in regions), all of these
-	   may be set.  In this case, _automatable is likely _route so the
-	   controller will send immediate events out the route's MIDI port. */
+	 * may be set.  In this case, _automatable is likely _route so the
+	 * controller will send immediate events out the route's MIDI port. */
 
 	/** parent strip */
 	boost::shared_ptr<ARDOUR::Stripable> _stripable;
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 77518116a3..ac38db86c0 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -52,7 +52,7 @@ namespace ARDOUR {
  */
 class AxisView : public virtual PBD::ScopedConnectionList, public virtual ARDOUR::SessionHandlePtr, public virtual Selectable
 {
-  public:
+public:
 	virtual std::string name() const = 0;
 	virtual Gdk::Color color() const = 0;
 
@@ -63,21 +63,21 @@ class AxisView : public virtual PBD::ScopedConnectionList, public virtual ARDOUR
 
 	virtual std::string state_id() const = 0;
 	/* for now, we always return properties in string form.
-	 */
+	*/
 	std::string gui_property (const std::string& property_name) const;
 
 	bool get_gui_property (const std::string& property_name, std::string& value) const;
 
 	template <typename T>
-	bool get_gui_property (const std::string& property_name, T& value) const
-	{
-		std::string str = gui_property (property_name);
-
-		if (!str.empty ()) {
-			return PBD::string_to<T>(str, value);
+		bool get_gui_property (const std::string& property_name, T& value) const
+		{
+			std::string str = gui_property (property_name);
+
+			if (!str.empty ()) {
+				return PBD::string_to<T>(str, value);
+			}
+			return false;
 		}
-		return false;
-	}
 
 	void set_gui_property (const std::string& property_name, const std::string& value);
 
@@ -112,7 +112,7 @@ class AxisView : public virtual PBD::ScopedConnectionList, public virtual ARDOUR
 	 */
 	static Gdk::Color unique_random_color();
 
-  protected:
+protected:
 	AxisView ();
 	virtual ~AxisView();
 
diff --git a/gtk2_ardour/big_clock_window.h b/gtk2_ardour/big_clock_window.h
index a073bcc099..e51f0304eb 100644
--- a/gtk2_ardour/big_clock_window.h
+++ b/gtk2_ardour/big_clock_window.h
@@ -26,10 +26,10 @@ class AudioClock;
 
 class BigClockWindow : public ArdourWindow
 {
-    public:
+public:
 	BigClockWindow (AudioClock&);
 
-    private:
+private:
 	AudioClock& clock;
 	Gtk::Requisition default_size;
 
diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index 468346e54c..f553b5cccd 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -36,7 +36,7 @@ namespace ARDOUR {
 
 class BundleEditorMatrix : public PortMatrix
 {
-  public:
+public:
 	BundleEditorMatrix (Gtk::Window *, ARDOUR::Session *, boost::shared_ptr<ARDOUR::Bundle>);
 
 	void set_state (ARDOUR::BundleChannel c[2], bool s);
@@ -54,7 +54,7 @@ class BundleEditorMatrix : public PortMatrix
 
 	std::string disassociation_verb () const;
 
-  private:
+private:
 	enum {
 		OTHER = 0,
 		OURS = 1
@@ -66,13 +66,13 @@ class BundleEditorMatrix : public PortMatrix
 
 class BundleEditor : public ArdourDialog
 {
-  public:
+public:
 	BundleEditor (ARDOUR::Session *, boost::shared_ptr<ARDOUR::UserBundle>);
 
-  protected:
+protected:
 	void on_map ();
 
-  private:
+private:
 	void name_changed ();
 	void input_or_output_changed ();
 	void on_show ();
@@ -85,10 +85,10 @@ class BundleEditor : public ArdourDialog
 
 class BundleManager : public ArdourDialog
 {
-  public:
+public:
 	BundleManager (ARDOUR::Session *);
 
-  private:
+private:
 
 	void new_clicked ();
 	void edit_clicked ();
diff --git a/gtk2_ardour/button_joiner.h b/gtk2_ardour/button_joiner.h
index 1010ea1c46..8f009c8dbc 100644
--- a/gtk2_ardour/button_joiner.h
+++ b/gtk2_ardour/button_joiner.h
@@ -27,15 +27,16 @@
 #include "gtkmm2ext/activatable.h"
 #include "gtkmm2ext/cairo_widget.h"
 
-class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable {
-  public:
+class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable
+{
+public:
 	ButtonJoiner (const std::string&, Gtk::Widget&, Gtk::Widget&, bool central_link = false);
 	~ButtonJoiner ();
 
 	void set_related_action (Glib::RefPtr<Gtk::Action>);
 	void set_active_state (Gtkmm2ext::ActiveState);
 
-  protected:
+protected:
 	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	bool on_button_release_event (GdkEventButton*);
 	void on_size_request (Gtk::Requisition*);
@@ -46,7 +47,7 @@ class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable {
 	void action_tooltip_changed ();
 	void action_toggled ();
 
-  private:
+private:
 	Gtk::Widget&   left;
 	Gtk::Widget&   right;
 	Gtk::HBox      packer;
diff --git a/gtk2_ardour/clock_group.h b/gtk2_ardour/clock_group.h
index 2a32ef122d..2dea47b302 100644
--- a/gtk2_ardour/clock_group.h
+++ b/gtk2_ardour/clock_group.h
@@ -25,8 +25,9 @@
 
 #include "audio_clock.h"
 
-class ClockGroup : public sigc::trackable {
-  public:
+class ClockGroup : public sigc::trackable
+{
+public:
 	ClockGroup ();
 	~ClockGroup ();
 
@@ -36,7 +37,7 @@ class ClockGroup : public sigc::trackable {
 	void add (AudioClock&);
 	void remove (AudioClock&);
 
-  private:
+private:
 	std::set<AudioClock*> clocks;
 	bool ignore_changes;
 	AudioClock::Mode _clock_mode;
diff --git a/gtk2_ardour/color_theme_manager.h b/gtk2_ardour/color_theme_manager.h
index 104bca847b..9049c8b744 100644
--- a/gtk2_ardour/color_theme_manager.h
+++ b/gtk2_ardour/color_theme_manager.h
@@ -41,7 +41,7 @@ class ArdourDialog;
 
 class ColorThemeManager : public OptionEditorMiniPage
 {
-  public:
+public:
 	ColorThemeManager();
 	~ColorThemeManager();
 
@@ -62,13 +62,13 @@ class ColorThemeManager : public OptionEditorMiniPage
 
 	Gtk::Widget& tip_widget();
 
-  private:
+private:
 	Gtk::Button reset_button;
 	Gtk::Notebook notebook;
 
 	/* handls response from color dialog when it is used to
-	   edit a derived color.
-	*/
+	 * edit a derived color.
+	 */
 	void palette_color_response (int, std::string);
 
 	Gtk::ScrolledWindow palette_scroller;
@@ -76,29 +76,29 @@ class ColorThemeManager : public OptionEditorMiniPage
 	ArdourCanvas::Container* palette_group;
 
 	/* these methods create and manage a canvas for use in either the
-	   palette tab or in a separate dialog. Different behaviour is
-	   accomplished by changing the event handler passed into the
-	   allocation handler. We do it there because we have to rebuild
-	   the canvas on allocation events, and during the rebuild, connect
-	   each rectangle to the event handler.
-
-	   the alternative is one event handler for the canvas and a map
-	   of where each color rectangle is. nothing wrong with this
-	   but the per-rect event setup is simpler and avoids building
-	   and looking up the map information.
-	*/
+	 * palette tab or in a separate dialog. Different behaviour is
+	 * accomplished by changing the event handler passed into the
+	 * allocation handler. We do it there because we have to rebuild
+	 * the canvas on allocation events, and during the rebuild, connect
+	 * each rectangle to the event handler.
+	 *
+	 * the alternative is one event handler for the canvas and a map
+	 * of where each color rectangle is. nothing wrong with this
+	 * but the per-rect event setup is simpler and avoids building
+	 * and looking up the map information.
+	 */
 	ArdourCanvas::Container* initialize_palette_canvas (ArdourCanvas::Canvas& canvas);
 	void build_palette_canvas (ArdourCanvas::Canvas&, ArdourCanvas::Container&, sigc::slot<bool,GdkEvent*,std::string> event_handler);
 	void palette_canvas_allocated (Gtk::Allocation& alloc, ArdourCanvas::Container* group, ArdourCanvas::Canvas* canvas, sigc::slot<bool,GdkEvent*,std::string> event_handler);
 	void palette_size_request (Gtk::Requisition*);
 
 	/* handles events from a palette canvas inside the palette (derived
-	   colors) tab
-	*/
+	 * colors) tab
+	 */
 	bool palette_event (GdkEvent*, std::string name);
 	/* allows user to edit a named color (e.g. "color 3") after clicking
-	   on it inside the palette tab.
-	*/
+	 * on it inside the palette tab.
+	 */
 	void edit_palette_color (std::string);
 
 	struct ColorAliasModelColumns : public Gtk::TreeModel::ColumnRecord {
diff --git a/gtk2_ardour/configinfo.h b/gtk2_ardour/configinfo.h
index 209392a8f1..f7efea4896 100644
--- a/gtk2_ardour/configinfo.h
+++ b/gtk2_ardour/configinfo.h
@@ -24,10 +24,10 @@
 
 class ConfigInfoDialog : public ArdourDialog
 {
-  public:
+public:
 	ConfigInfoDialog();
 
-  private:
+private:
 	Gtk::TextView text;
 	Gtk::ScrolledWindow scroller;
 };
diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h
index c9aab3af64..524398aa01 100644
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -43,7 +43,7 @@ namespace ArdourCanvas {
 
 class ControlPoint : public Selectable
 {
-  public:
+public:
 	ControlPoint (AutomationLine& al);
 	ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
 	virtual ~ControlPoint ();
@@ -82,7 +82,7 @@ class ControlPoint : public Selectable
 
 	static PBD::Signal1<void, ControlPoint *> CatchDeletion;
 
-  private:
+private:
 	ArdourCanvas::Rectangle*        _item;
 	AutomationLine&                  _line;
 	ARDOUR::AutomationList::iterator _model;
diff --git a/gtk2_ardour/control_slave_ui.h b/gtk2_ardour/control_slave_ui.h
index 0c8de7a972..8a7ae5fd6d 100644
--- a/gtk2_ardour/control_slave_ui.h
+++ b/gtk2_ardour/control_slave_ui.h
@@ -41,12 +41,12 @@ namespace ARDOUR {
 
 class ControlSlaveUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-   public:
+public:
 	ControlSlaveUI (ARDOUR::Session*);
 	~ControlSlaveUI ();
 	void set_stripable (boost::shared_ptr<ARDOUR::Stripable>);
 
-   private:
+private:
 	boost::shared_ptr<ARDOUR::Stripable> stripable;
 	PBD::ScopedConnectionList connections;
 	PBD::ScopedConnectionList master_connections;
diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index 8e582baa52..911b9a7df6 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -49,7 +49,7 @@ namespace ArdourCanvas {
 
 class CrossfadeEditor : public ArdourDialog
 {
-  public:
+public:
 	CrossfadeEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Crossfade>, double miny, double maxy);
 	~CrossfadeEditor ();
 
@@ -57,8 +57,7 @@ class CrossfadeEditor : public ArdourDialog
 
 	static const double canvas_border;
 
-	/* these are public so that a caller/subclass can make them do the right thing.
-	 */
+	/* these are public so that a caller/subclass can make them do the right thing. */
 
 	Gtk::Button* cancel_button;
 	Gtk::Button* ok_button;
@@ -83,11 +82,11 @@ class CrossfadeEditor : public ArdourDialog
 	static Presets* fade_in_presets;
 	static Presets* fade_out_presets;
 
-  protected:
+protected:
 	bool on_key_press_event (GdkEventKey*);
 	bool on_key_release_event (GdkEventKey*);
 
-  private:
+private:
 	boost::shared_ptr<ARDOUR::Crossfade> xfade;
 
 	Gtk::VBox vpacker;
diff --git a/gtk2_ardour/duplicate_routes_dialog.h b/gtk2_ardour/duplicate_routes_dialog.h
index acc7ad4e38..d817ac56c9 100644
--- a/gtk2_ardour/duplicate_routes_dialog.h
+++ b/gtk2_ardour/duplicate_routes_dialog.h
@@ -40,12 +40,12 @@ class Editor;
 
 class DuplicateRouteDialog : public ArdourDialog
 {
-  public:
+public:
 	DuplicateRouteDialog ();
 
 	int restart (ARDOUR::Session*);
 
-  private:
+private:
 	Gtk::Entry name_template_entry;
 	Gtk::VBox playlist_button_box;
 	Gtk::Label playlist_option_label;
@@ -64,7 +64,7 @@ class DuplicateRouteDialog : public ArdourDialog
 	RouteDialogs::InsertAt insert_at();
 	ARDOUR::PlaylistDisposition playlist_disposition() const;
 
-   private:
+private:
 	Gtk::ComboBoxText insert_at_combo;
 };
 
diff --git a/gtk2_ardour/editor_cursors.h b/gtk2_ardour/editor_cursors.h
index b8ad2e51ac..5c1125c801 100644
--- a/gtk2_ardour/editor_cursors.h
+++ b/gtk2_ardour/editor_cursors.h
@@ -29,8 +29,9 @@
 
 class Editor;
 
-class EditorCursor {
-  public:
+class EditorCursor
+{
+public:
 	EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
 	EditorCursor (Editor&);
 	~EditorCursor ();
@@ -53,7 +54,7 @@ class EditorCursor {
 
 	PBD::Signal1<void, framepos_t> PositionChanged;
 
-  private:
+private:
 	Editor&               _editor;
 	ArdourCanvas::Arrow*  _track_canvas_item;
 	framepos_t            _current_frame;
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index f3fc99d53f..17e459ba67 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -501,7 +501,7 @@ private:
 /** "Drag" to cut a region (action only on button release) */
 class RegionCutDrag : public Drag
 {
-    public:
+public:
 	RegionCutDrag (Editor*, ArdourCanvas::Item*, framepos_t);
 	~RegionCutDrag ();
 
@@ -510,7 +510,7 @@ class RegionCutDrag : public Drag
 	void finished (GdkEvent*, bool);
 	void aborted (bool);
 
-    private:
+private:
 	EditorCursor* line;
 };
 
@@ -551,7 +551,7 @@ private:
 /** Drags to move MIDI notes */
 class NoteDrag : public Drag
 {
-  public:
+public:
 	NoteDrag (Editor*, ArdourCanvas::Item*);
 
 	void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
@@ -560,7 +560,7 @@ class NoteDrag : public Drag
 	void aborted (bool);
 
 	void setup_pointer_frame_offset ();
-  private:
+private:
 
 	double total_dx (GdkEvent * event) const; // total movement in quarter notes
 	int8_t total_dy () const;
@@ -1274,7 +1274,7 @@ private:
  */
 class CrossfadeEdgeDrag : public Drag
 {
-  public:
+public:
 	CrossfadeEdgeDrag (Editor*, AudioRegionView*, ArdourCanvas::Item*, bool start);
 
 	void start_grab (GdkEvent*, Gdk::Cursor* c = 0);
@@ -1290,7 +1290,7 @@ class CrossfadeEdgeDrag : public Drag
 		return std::make_pair (4, 4);
 	}
 
-  private:
+private:
 	AudioRegionView* arv;
 	bool start;
 };
diff --git a/gtk2_ardour/editor_locations.h b/gtk2_ardour/editor_locations.h
index 6ed6f8db50..17e1748325 100644
--- a/gtk2_ardour/editor_locations.h
+++ b/gtk2_ardour/editor_locations.h
@@ -34,7 +34,7 @@ namespace Gtk {
 
 class EditorLocations : public EditorComponent, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	EditorLocations (Editor *);
 
 	void set_session (ARDOUR::Session *);
@@ -43,7 +43,7 @@ class EditorLocations : public EditorComponent, public ARDOUR::SessionHandlePtr
 	XMLNode & get_state () const;
 	int set_state (const XMLNode&);
 
-  private:
+private:
 	Gtk::ScrolledWindow _scroller;
 	LocationUI* _locations;
 };
diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 303f640828..f10e37bae6 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -38,8 +38,9 @@
 #include "ardour_dialog.h"
 #include "ardour_button.h"
 
-class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
-  public:
+class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList
+{
+public:
 	EngineControl ();
 	~EngineControl ();
 
@@ -51,7 +52,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 	void set_desired_sample_rate (uint32_t);
 	bool try_autostart ();
 
-  private:
+private:
 	Gtk::Notebook notebook;
 
 	Gtk::Label engine_status;
@@ -182,17 +183,17 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 	void configure_midi_devices ();
 
 	struct MidiDeviceSetting {
-	std::string name;
-	bool enabled;
-	uint32_t input_latency;
-	uint32_t output_latency;
-
-	MidiDeviceSetting (std::string n, bool en = true, uint32_t inl = 0, uint32_t oul = 0)
-		: name (n)
-		, enabled (en)
-		, input_latency (inl)
-		, output_latency (oul)
-	{}
+		std::string name;
+		bool enabled;
+		uint32_t input_latency;
+		uint32_t output_latency;
+
+		MidiDeviceSetting (std::string n, bool en = true, uint32_t inl = 0, uint32_t oul = 0)
+			: name (n)
+			, enabled (en)
+			, input_latency (inl)
+			, output_latency (oul)
+		{}
 	};
 
 	typedef boost::shared_ptr<MidiDeviceSetting> MidiDeviceSettings;
@@ -200,44 +201,44 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 	std::vector<MidiDeviceSettings> _midi_devices;
 
 	MidiDeviceSettings find_midi_device(std::string devicename) const {
-	for (std::vector<MidiDeviceSettings>::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) {
-		if ((*p)->name == devicename) {
-		return *p;
+		for (std::vector<MidiDeviceSettings>::const_iterator p = _midi_devices.begin(); p != _midi_devices.end(); ++p) {
+			if ((*p)->name == devicename) {
+				return *p;
+			}
 		}
-	}
-	return MidiDeviceSettings();
+		return MidiDeviceSettings();
 	}
 
 	struct StateStruct {
-	std::string backend;
-	std::string driver;
-	std::string device;
-	std::string input_device;
-	std::string output_device;
-	float sample_rate;
-	uint32_t buffer_size;
-	uint32_t n_periods;
-	uint32_t input_latency;
-	uint32_t output_latency;
-	uint32_t input_channels;
-	uint32_t output_channels;
-	bool active;
-	bool use_buffered_io;
-	std::string midi_option;
-	std::vector<MidiDeviceSettings> midi_devices;
-	time_t lru;
-
-	StateStruct()
-		: sample_rate (48000)
-		, buffer_size (1024)
-		, input_latency (0)
-		, output_latency (0)
-		, input_channels (0)
-		, output_channels (0)
-		, active (false)
-		, use_buffered_io (false)
-		, lru (0) {}
-
+		std::string backend;
+		std::string driver;
+		std::string device;
+		std::string input_device;
+		std::string output_device;
+		float sample_rate;
+		uint32_t buffer_size;
+		uint32_t n_periods;
+		uint32_t input_latency;
+		uint32_t output_latency;
+		uint32_t input_channels;
+		uint32_t output_channels;
+		bool active;
+		bool use_buffered_io;
+		std::string midi_option;
+		std::vector<MidiDeviceSettings> midi_devices;
+		time_t lru;
+
+		StateStruct()
+			: sample_rate (48000)
+			, buffer_size (1024)
+			, input_latency (0)
+			, output_latency (0)
+			, input_channels (0)
+			, output_channels (0)
+			, active (false)
+			, use_buffered_io (false)
+			, lru (0)
+		{}
 	};
 
 	typedef boost::shared_ptr<StateStruct> State;
diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h
index d5607ef30b..d45b47ce72 100644
--- a/gtk2_ardour/export_channel_selector.h
+++ b/gtk2_ardour/export_channel_selector.h
@@ -48,14 +48,14 @@ class XMLNode;
 
 class ExportChannelSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-  protected:
+protected:
 	typedef boost::shared_ptr<ARDOUR::ExportChannelConfiguration> ChannelConfigPtr;
 	typedef std::list<ChannelConfigPtr> ChannelConfigList;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
 
 	ProfileManagerPtr manager;
 
-  public:
+public:
 	ExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager)
 		: SessionHandlePtr (session)
 		, manager (manager)
@@ -70,15 +70,14 @@ class ExportChannelSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 class PortExportChannelSelector : public ExportChannelSelector
 {
-
-  public:
+public:
 
 	PortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
 	~PortExportChannelSelector ();
 
 	void sync_with_manager ();
 
-  private:
+private:
 
 	void fill_route_list ();
 	void update_channel_count ();
@@ -101,12 +100,12 @@ class PortExportChannelSelector : public ExportChannelSelector
 
 	class RouteCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 
 		struct Channel;
 
 		RouteCols () : n_channels (0)
-			{ add (selected); add (name); add (io); add (port_list_col); }
+		{ add (selected); add (name); add (io); add (port_list_col); }
 
 		void add_channels (uint32_t chans);
 		uint32_t n_channels;
@@ -129,7 +128,7 @@ class PortExportChannelSelector : public ExportChannelSelector
 		/* Channel struct, that represents the selected port and its name */
 
 		struct Channel {
-		  public:
+		public:
 			Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
 
 			Gtk::TreeModelColumn<boost::weak_ptr<ARDOUR::AudioPort> > port;
@@ -146,7 +145,7 @@ class PortExportChannelSelector : public ExportChannelSelector
 
 		class PortCols : public Gtk::TreeModel::ColumnRecord
 		{
-		  public:
+		public:
 			PortCols () { add(selected); add(port); add(label); }
 
 			Gtk::TreeModelColumn<bool> selected;  // not used ATM
@@ -158,8 +157,9 @@ class PortExportChannelSelector : public ExportChannelSelector
 
 	/* Channels view */
 
-	class ChannelTreeView : public Gtk::TreeView {
-	  public:
+	class ChannelTreeView : public Gtk::TreeView
+	{
+	public:
 
 		ChannelTreeView (uint32_t max_channels);
 		void set_config (ChannelConfigPtr c);
@@ -172,7 +172,7 @@ class PortExportChannelSelector : public ExportChannelSelector
 
 		sigc::signal<void> CriticalSelectionChanged;
 
-	  private:
+	private:
 
 		ChannelConfigPtr config;
 		void update_config ();
@@ -199,7 +199,7 @@ class PortExportChannelSelector : public ExportChannelSelector
 
 class RegionExportChannelSelector : public ExportChannelSelector
 {
-  public:
+public:
 	RegionExportChannelSelector (ARDOUR::Session * session,
 	                             ProfileManagerPtr manager,
 	                             ARDOUR::AudioRegion const & region,
@@ -207,7 +207,7 @@ class RegionExportChannelSelector : public ExportChannelSelector
 
 	virtual void sync_with_manager ();
 
-  private:
+private:
 
 	void handle_selection ();
 
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index c45349f7c9..d03fa610f5 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -46,8 +46,7 @@ class ExportChannelSelector;
 
 class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
 {
-
-  public:
+public:
 
 	ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);
 	~ExportDialog ();
@@ -62,7 +61,7 @@ class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
 		RESPONSE_CANCEL
 	};
 
-  protected:
+protected:
 
 	void on_response (int response_id) {
 		Gtk::Dialog::on_response (response_id);
@@ -94,7 +93,7 @@ class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
 	/*** GUI components ***/
 	Gtk::Notebook export_notebook;
 
-  private:
+private:
 
 	void init ();
 
diff --git a/gtk2_ardour/export_file_notebook.h b/gtk2_ardour/export_file_notebook.h
index 84d05c1025..19271d7335 100644
--- a/gtk2_ardour/export_file_notebook.h
+++ b/gtk2_ardour/export_file_notebook.h
@@ -33,7 +33,7 @@
 
 class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 
 	ExportFileNotebook ();
 
@@ -45,7 +45,7 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 
 	sigc::signal<void> CriticalSelectionChanged;
 
-  private:
+private:
 
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
@@ -70,8 +70,9 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 	uint32_t     last_visible_page;
 	uint32_t     page_counter;
 
-	class FilePage : public Gtk::VBox {
-	  public:
+	class FilePage : public Gtk::VBox
+	{
+	public:
 		FilePage (ARDOUR::Session * s, ManagerPtr profile_manager, ExportFileNotebook * parent, uint32_t number,
 		          ARDOUR::ExportProfileManager::FormatStatePtr format_state,
 		          ARDOUR::ExportProfileManager::FilenameStatePtr filename_state);
@@ -93,7 +94,7 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 
 		sigc::signal<void> CriticalSelectionChanged;
 
-	  private:
+	private:
 		void save_format_to_manager (FormatPtr format);
 		void update_tab_label ();
 		void critical_selection_changed ();
diff --git a/gtk2_ardour/export_filename_selector.h b/gtk2_ardour/export_filename_selector.h
index a1a19b0bc7..34ef8534ce 100644
--- a/gtk2_ardour/export_filename_selector.h
+++ b/gtk2_ardour/export_filename_selector.h
@@ -27,10 +27,9 @@
 #include "ardour/export_filename.h"
 #include "ardour/session_handle.h"
 
-///
 class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	typedef boost::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
 
 	ExportFilenameSelector ();
@@ -44,7 +43,7 @@ class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	sigc::signal<void> CriticalSelectionChanged;
 
-  private:
+private:
 
 	void load_state ();
 
@@ -94,7 +93,7 @@ class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	struct DateFormatCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<DateFormat>     format;
 		Gtk::TreeModelColumn<std::string>  label;
 
@@ -110,7 +109,7 @@ class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	struct TimeFormatCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<TimeFormat>     format;
 		Gtk::TreeModelColumn<std::string>  label;
 
diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h
index 8709ff979b..35685382ee 100644
--- a/gtk2_ardour/export_format_dialog.h
+++ b/gtk2_ardour/export_format_dialog.h
@@ -38,8 +38,9 @@
 
 #include <gtkmm.h>
 
-class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList {
-  private:
+class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
+{
+private:
 
 	typedef ARDOUR::WeakExportFormatCompatibilityPtr WeakCompatPtr;
 	typedef ARDOUR::WeakExportFormatPtr WeakFormatPtr;
@@ -51,14 +52,14 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 	typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
 
 
-  public:
+public:
 
 	explicit ExportFormatDialog (FormatPtr format, bool new_dialog = false);
 	~ExportFormatDialog ();
 
 	void set_session (ARDOUR::Session* s);
 
-  private:
+private:
 
 	FormatPtr                   format;
 	ARDOUR::ExportFormatManager manager;
@@ -197,7 +198,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct CompatibilityCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::ExportFormatCompatibilityPtr>  ptr;
 		Gtk::TreeModelColumn<bool>                                  selected;
 		Gtk::TreeModelColumn<std::string>                           label;
@@ -213,7 +214,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct QualityCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::QualityPtr>  ptr;
 		Gtk::TreeModelColumn<std::string>                            color;
 		Gtk::TreeModelColumn<std::string>                            label;
@@ -225,7 +226,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct FormatCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::ExportFormatPtr>  ptr;
 		Gtk::TreeModelColumn<std::string>              color;
 		Gtk::TreeModelColumn<std::string>              label;
@@ -237,7 +238,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct SampleRateCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::ExportFormatManager::SampleRatePtr>  ptr;
 		Gtk::TreeModelColumn<std::string>                               color;
 		Gtk::TreeModelColumn<std::string>                               label;
@@ -263,7 +264,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct SRCQualityCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::ExportFormatBase::SRCQuality>  id;
 		Gtk::TreeModelColumn<std::string>                         label;
 
@@ -293,7 +294,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct SampleFormatCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::SampleFormatPtr>   ptr;
 		Gtk::TreeModelColumn<std::string>                              color;
 		Gtk::TreeModelColumn<std::string>                              label;
@@ -305,7 +306,7 @@ class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
 
 	struct DitherTypeCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::HasSampleFormat::DitherTypePtr>   ptr;
 		Gtk::TreeModelColumn<std::string>                            color;
 		Gtk::TreeModelColumn<std::string>                            label;
diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index 4af647ac9c..e416918d20 100644
--- a/gtk2_ardour/export_format_selector.h
+++ b/gtk2_ardour/export_format_selector.h
@@ -34,16 +34,14 @@ namespace ARDOUR {
 	class ExportProfileManager;
 }
 
-///
 class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-
-  private:
+private:
 
 	typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
 	typedef std::list<FormatPtr> FormatList;
 
-  public:
+public:
 
 	ExportFormatSelector ();
 	~ExportFormatSelector ();
@@ -59,7 +57,7 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	sigc::signal<void> CriticalSelectionChanged;
 
-  private:
+private:
 
 	void select_format (FormatPtr f);
 	void add_new_format ();
@@ -74,7 +72,7 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	struct FormatCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<FormatPtr>      format;
 		Gtk::TreeModelColumn<std::string>  label;
 
diff --git a/gtk2_ardour/export_preset_selector.h b/gtk2_ardour/export_preset_selector.h
index a57fc83aad..6203b76dac 100644
--- a/gtk2_ardour/export_preset_selector.h
+++ b/gtk2_ardour/export_preset_selector.h
@@ -28,8 +28,7 @@
 
 class ExportPresetSelector : public Gtk::HBox
 {
-
-  public:
+public:
 
 	ExportPresetSelector ();
 
@@ -37,7 +36,7 @@ class ExportPresetSelector : public Gtk::HBox
 
 	sigc::signal<void> CriticalSelectionChanged;
 
-  private:
+private:
 
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ManagerPtr;
 	typedef ARDOUR::ExportPresetPtr PresetPtr;
@@ -54,7 +53,7 @@ class ExportPresetSelector : public Gtk::HBox
 
 	struct PresetCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<PresetPtr>      preset;
 		Gtk::TreeModelColumn<std::string>  label;
 
diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index 91a53e5fb2..af56cc1b81 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -49,7 +49,7 @@ using ARDOUR::framecnt_t;
 /// Timespan Selector base
 class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
-  protected:
+protected:
 	typedef std::list<ARDOUR::Location *> LocationList;
 	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
@@ -58,7 +58,7 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 	typedef boost::shared_ptr<TimespanList> TimespanListPtr;
 	typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr;
 
-  public:
+public:
 
 	ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager, bool multi);
 
@@ -69,7 +69,7 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	sigc::signal<void> CriticalSelectionChanged;
 
-  protected:
+protected:
 
 	ProfileManagerPtr manager;
 	TimespanStatePtr  state;
@@ -107,7 +107,7 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	struct TimeFormatCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<TimeFormat>      format;
 		Gtk::TreeModelColumn<std::string>   label;
 
@@ -121,7 +121,7 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	struct RangeCols : public Gtk::TreeModelColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<ARDOUR::Location *>  location;
 		Gtk::TreeModelColumn<std::string>       label;
 		Gtk::TreeModelColumn<bool>              selected;
@@ -142,12 +142,12 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 /// Allows selecting multiple timespans
 class ExportTimespanSelectorMultiple : public ExportTimespanSelector
 {
-  public:
+public:
 	ExportTimespanSelectorMultiple (ARDOUR::Session * session, ProfileManagerPtr manager);
 
 	void allow_realtime_export (bool);
 
-  private:
+private:
 
 	virtual void fill_range_list ();
 
@@ -159,12 +159,12 @@ class ExportTimespanSelectorMultiple : public ExportTimespanSelector
 /// Displays one timespan
 class ExportTimespanSelectorSingle : public ExportTimespanSelector
 {
-  public:
+public:
 	ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id);
 
 	void allow_realtime_export (bool);
 
-  private:
+private:
 
 	virtual void fill_range_list ();
 	void update_timespans ();
diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h
index bf3ace9f30..8e410cb6a0 100644
--- a/gtk2_ardour/export_video_dialog.h
+++ b/gtk2_ardour/export_video_dialog.h
@@ -40,7 +40,7 @@
  */
 class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 {
-  public:
+public:
 	ExportVideoDialog ();
 	~ExportVideoDialog ();
 
@@ -55,7 +55,7 @@ class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 		Gtk::Dialog::on_response (response_id);
 	}
 
-  private:
+private:
 	TimeSelection export_range;
 
 	void on_show ();
diff --git a/gtk2_ardour/export_video_infobox.h b/gtk2_ardour/export_video_infobox.h
index d3dadf1c2a..18a32d8366 100644
--- a/gtk2_ardour/export_video_infobox.h
+++ b/gtk2_ardour/export_video_infobox.h
@@ -31,13 +31,13 @@
  */
 class ExportVideoInfobox : public ArdourDialog
 {
-  public:
+public:
 	ExportVideoInfobox (ARDOUR::Session*);
 	~ExportVideoInfobox ();
 
 	bool show_again () { return showagain_checkbox.get_active(); }
 
-  private:
+private:
 	Gtk::CheckButton showagain_checkbox;
 };
 
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index f9753187ca..943fe36ae4 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -72,12 +72,12 @@ enum MeterPointChangeTarget {
 
 class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 {
-  public:
-        GainMeterBase (ARDOUR::Session*, bool horizontal, int, int);
+public:
+	GainMeterBase (ARDOUR::Session*, bool horizontal, int, int);
 	virtual ~GainMeterBase ();
 
 	virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
-				   boost::shared_ptr<ARDOUR::PeakMeter> meter,
+	                           boost::shared_ptr<ARDOUR::PeakMeter> meter,
 	                           boost::shared_ptr<ARDOUR::Amp> amp,
 	                           boost::shared_ptr<ARDOUR::GainControl> control);
 
@@ -108,7 +108,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	static std::string short_astate_string (ARDOUR::AutoState);
 	static std::string _astate_string (ARDOUR::AutoState, bool);
 
-  protected:
+protected:
 
 	friend class MixerStrip;
 	friend class MeterStrip;
@@ -127,7 +127,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	Gtk::Adjustment              gain_adjustment;
 	Gtkmm2ext::FocusEntry        gain_display;
 	Gtkmm2ext::FocusEntry        peak_display;
-//	Gtk::Button                  peak_display;
 	Gtk::DrawingArea             meter_metric_area;
 	Gtk::DrawingArea             meter_ticks1_area;
 	Gtk::DrawingArea             meter_ticks2_area;
@@ -213,9 +212,9 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 	virtual ~GainMeter ();
 
 	virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
-				   boost::shared_ptr<ARDOUR::PeakMeter> meter,
+	                           boost::shared_ptr<ARDOUR::PeakMeter> meter,
 	                           boost::shared_ptr<ARDOUR::Amp> amp,
-				   boost::shared_ptr<ARDOUR::GainControl> control);
+	                           boost::shared_ptr<ARDOUR::GainControl> control);
 
 	int get_gm_width ();
 	void setup_meters (int len=0);
diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 1b2fb700c1..1f1189f62a 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -81,14 +81,15 @@ public:
 
 class MidiGhostRegion : public GhostRegion {
 public:
-	class GhostEvent : public sigc::trackable {
-	  public:
-	    GhostEvent(::NoteBase *, ArdourCanvas::Container *);
-	    virtual ~GhostEvent ();
-
-	    NoteBase* event;
-	    ArdourCanvas::Item* item;
-	    bool is_hit;
+	class GhostEvent : public sigc::trackable
+	{
+	public:
+		GhostEvent(::NoteBase *, ArdourCanvas::Container *);
+		virtual ~GhostEvent ();
+
+		NoteBase* event;
+		ArdourCanvas::Item* item;
+		bool is_hit;
 	};
 
 	MidiGhostRegion(MidiRegionView& rv,
diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index fe47f28bca..a9810f2d7a 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -25,7 +25,7 @@
 
 class IOSelector : public PortMatrix
 {
-  public:
+public:
 	IOSelector (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr<ARDOUR::IO>);
 
 	void set_state (ARDOUR::BundleChannel c[2], bool);
@@ -53,7 +53,7 @@ class IOSelector : public PortMatrix
 		return _other;
 	}
 
-  private:
+private:
 
 	void setup_type ();
 	void io_changed ();
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index f7b52d3ae1..2feed69403 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -32,7 +32,7 @@ class ARDOUR_UI;
 
 class ArdourKeyboard : public Gtkmm2ext::Keyboard
 {
-  public:
+public:
 	ArdourKeyboard(ARDOUR_UI&);
 
 	XMLNode& get_state (void);
@@ -67,38 +67,31 @@ class ArdourKeyboard : public Gtkmm2ext::Keyboard
 	static bool indicates_constraint (guint state);
 
 	static void set_constraint_modifier (guint);
-	/** @return Modifier mask to constrain drags in a particular direction;
-	 */
+	/** @return Modifier mask to constrain drags in a particular direction; */
 	static ModifierMask constraint_modifier () { return ModifierMask (constraint_mod); }
 
 	static void set_trim_contents_modifier (guint);
-	/** @return Modifier mask to move contents rather than region bounds during trim;
-	 */
+	/** @return Modifier mask to move contents rather than region bounds during trim; */
 	static ModifierMask trim_contents_modifier () { return ModifierMask (trim_contents_mod); }
 
 	static void set_trim_overlap_modifier (guint);
-	/** @return Modifier mask to remove region overlaps during trim;
-	 */
+	/** @return Modifier mask to remove region overlaps during trim; */
 	static ModifierMask trim_overlap_modifier () { return ModifierMask (trim_overlap_mod); }
 
 	static void set_trim_anchored_modifier (guint);
-	/** @return Modifier mask to use anchored trim;
-	 */
+	/** @return Modifier mask to use anchored trim; */
 	static ModifierMask trim_anchored_modifier () { return ModifierMask (trim_anchored_mod); }
 
 	static void set_fine_adjust_modifier (guint);
-	/** @return Modifier mask to fine adjust (control points only atm);
-	 */
+	/** @return Modifier mask to fine adjust (control points only atm); */
 	static ModifierMask fine_adjust_modifier () { return ModifierMask (fine_adjust_mod); }
 
 	static void set_push_points_modifier (guint);
-	/** @return Modifier mask to push proceeding points;
-	 */
+	/** @return Modifier mask to push proceeding points; */
 	static ModifierMask push_points_modifier () { return ModifierMask (push_points_mod); }
 
 	static void set_note_size_relative_modifier (guint);
-	/** @return Modifier mask to resize notes relatively;
-	 */
+	/** @return Modifier mask to resize notes relatively; */
 	static ModifierMask note_size_relative_modifier () { return ModifierMask (note_size_relative_mod); }
 private:
 	static guint     constraint_mod;
diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h
index aedd41d4f2..7df6491e80 100644
--- a/gtk2_ardour/keyeditor.h
+++ b/gtk2_ardour/keyeditor.h
@@ -37,7 +37,7 @@ namespace Gtkmm2ext {
 
 class KeyEditor : public ArdourWindow
 {
-  public:
+public:
 	KeyEditor ();
 
 	void add_tab (std::string const &name, Gtkmm2ext::Bindings&);
@@ -49,10 +49,10 @@ class KeyEditor : public ArdourWindow
 		_refresh_connection.disconnect ();
 	}
 
-	private:
+private:
 	class Tab : public Gtk::VBox
 	{
-		public:
+	public:
 		Tab (KeyEditor&, std::string const &name, Gtkmm2ext::Bindings*);
 
 		uint32_t populate ();
@@ -80,8 +80,8 @@ class KeyEditor : public ArdourWindow
 
 		Gtk::VBox vpacker;
 		/* give KeyEditor full access to these. This is just a helper
-		   class with no special semantics
-		*/
+		 * class with no special semantics
+		 */
 
 		KeyEditor& owner;
 		std::string name;
@@ -94,7 +94,7 @@ class KeyEditor : public ArdourWindow
 		KeyEditorColumns columns;
 		guint last_keyval;
 
-		protected:
+	protected:
 		bool key_press_event (GdkEventKey*);
 		bool key_release_event (GdkEventKey*);
 		Gtk::TreeModel::iterator find_action_path (Gtk::TreeModel::const_iterator begin, Gtk::TreeModel::const_iterator end, const std::string& path) const;
diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h
index 6957f2633a..9723b66e7d 100644
--- a/gtk2_ardour/latency_gui.h
+++ b/gtk2_ardour/latency_gui.h
@@ -46,7 +46,8 @@ class LatencyBarController : public Gtkmm2ext::BarController
 public:
 	LatencyBarController (Gtk::Adjustment& adj, LatencyGUI* g)
 		: BarController (adj, boost::shared_ptr<PBD::IgnorableControllable> (new PBD::IgnorableControllable ())),
-		  _latency_gui (g) {}
+		                 _latency_gui (g)
+	{}
 
 private:
 	LatencyGUI* _latency_gui;
@@ -56,7 +57,7 @@ private:
 
 class LatencyGUI : public Gtk::VBox
 {
-  public:
+public:
 	LatencyGUI (ARDOUR::Latent&, framepos_t sample_rate, framepos_t period_size);
 	~LatencyGUI() { }
 
@@ -64,7 +65,7 @@ class LatencyGUI : public Gtk::VBox
 	void reset ();
 	void refresh ();
 
-  private:
+private:
 	ARDOUR::Latent& _latent;
 	framepos_t initial_value;
 	framepos_t sample_rate;
diff --git a/gtk2_ardour/led.h b/gtk2_ardour/led.h
index 67f4a9bb3c..fd29f9439f 100644
--- a/gtk2_ardour/led.h
+++ b/gtk2_ardour/led.h
@@ -26,18 +26,18 @@
 
 class LED : public CairoWidget
 {
-  public:
+public:
 	LED ();
 	virtual ~LED ();
 
 	void set_diameter (float);
 
-  protected:
+protected:
 	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	void on_size_request (Gtk::Requisition* req);
 	void on_realize ();
 
-  private:
+private:
 	float _diameter;
 	float _red;
 	float _green;
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 917a0089b6..fe9fc1b7a5 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -51,7 +51,7 @@ namespace Gtk {
 
 class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::trackable
 {
-  public:
+public:
 	LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir,
 			Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical);
 	virtual ~LevelMeterBase ();
@@ -75,11 +75,11 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
 	PBD::Signal1<bool, GdkEventButton *> ButtonRelease;
 	PBD::Signal1<void, ARDOUR::MeterType> MeterTypeChanged;
 
-	protected:
+protected:
 	virtual void mtr_pack(Gtk::Widget &w) = 0;
 	virtual void mtr_remove(Gtk::Widget &w) = 0;
 
-  private:
+private:
 	PBD::EventLoop::InvalidationRecord* parent_invalidator;
 	ARDOUR::PeakMeter* _meter;
 	Gtkmm2ext::FastMeter::Orientation _meter_orientation;
@@ -131,22 +131,22 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra
 
 class LevelMeterHBox : public LevelMeterBase, public Gtk::HBox
 {
-  public:
+public:
 	LevelMeterHBox (ARDOUR::Session*);
 	~LevelMeterHBox();
 
-	protected:
+protected:
 	void mtr_pack(Gtk::Widget &w);
 	void mtr_remove(Gtk::Widget &w);
 };
 
 class LevelMeterVBox : public LevelMeterBase, public Gtk::VBox
 {
-  public:
+public:
 	LevelMeterVBox (ARDOUR::Session*);
 	~LevelMeterVBox();
 
-	protected:
+protected:
 	void mtr_pack(Gtk::Widget &w);
 	void mtr_remove(Gtk::Widget &w);
 };
diff --git a/gtk2_ardour/luawindow.h b/gtk2_ardour/luawindow.h
index 33d7fd1517..21caa54a11 100644
--- a/gtk2_ardour/luawindow.h
+++ b/gtk2_ardour/luawindow.h
@@ -47,7 +47,7 @@ class LuaWindow :
 	public ARDOUR::SessionHandlePtr,
 	public Gtkmm2ext::VisibilityTracker
 {
-  public:
+public:
 	static LuaWindow* instance();
 	~LuaWindow();
 
@@ -66,7 +66,8 @@ class LuaWindow :
 		Buffer_Scratch    = 0x10,
 	} BufferFlags;
 
-	class ScriptBuffer {
+	class ScriptBuffer
+	{
 	public:
 		ScriptBuffer (const std::string&);
 		ScriptBuffer (ARDOUR::LuaScriptInfoPtr);
@@ -82,7 +83,7 @@ class LuaWindow :
 		ARDOUR::LuaScriptInfo::ScriptType type;
 	};
 
-  private:
+private:
 	LuaWindow ();
 	static LuaWindow* _instance;
 
diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h
index da6ffca957..78b1016131 100644
--- a/gtk2_ardour/lv2_plugin_ui.h
+++ b/gtk2_ardour/lv2_plugin_ui.h
@@ -48,9 +48,9 @@ namespace ARDOUR {
 
 class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 {
-  public:
+public:
 	LV2PluginUI (boost::shared_ptr<ARDOUR::PluginInsert>,
-	             boost::shared_ptr<ARDOUR::LV2Plugin>);
+			boost::shared_ptr<ARDOUR::LV2Plugin>);
 	~LV2PluginUI ();
 
 	gint get_preferred_height ();
@@ -63,7 +63,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 	int package (Gtk::Window&);
 	void grab_focus ();
 
-  private:
+private:
 
 	void control_changed (uint32_t);
 
diff --git a/gtk2_ardour/lxvst_plugin_ui.h b/gtk2_ardour/lxvst_plugin_ui.h
index e51094573d..115db62595 100644
--- a/gtk2_ardour/lxvst_plugin_ui.h
+++ b/gtk2_ardour/lxvst_plugin_ui.h
@@ -32,7 +32,7 @@ namespace ARDOUR {
 
 class LXVSTPluginUI : public VSTPluginUI
 {
-  public:
+public:
 	LXVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
 	~LXVSTPluginUI ();
 
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index a99efc81c2..391653f090 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -44,7 +44,7 @@ class PublicEditor;
  */
 class ArdourMarker : public sigc::trackable
 {
-  public:
+public:
 	enum Type {
 		Mark,
 		Tempo,
@@ -61,7 +61,7 @@ class ArdourMarker : public sigc::trackable
 
 
 	ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
-		framepos_t frame = 0, bool handle_events = true);
+	              framepos_t frame = 0, bool handle_events = true);
 
 	virtual ~ArdourMarker ();
 
@@ -100,7 +100,7 @@ class ArdourMarker : public sigc::trackable
 
 	bool label_on_left () const;
 
-  protected:
+protected:
 	PublicEditor& editor;
 
 	Pango::FontDescription name_font;
diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h
index 0e7232537d..a5f74fd99f 100644
--- a/gtk2_ardour/meter_strip.h
+++ b/gtk2_ardour/meter_strip.h
@@ -45,7 +45,7 @@ namespace Gtk {
 
 class MeterStrip : public Gtk::VBox, public AxisView, public RouteUI
 {
-  public:
+public:
 	MeterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
 	MeterStrip (int, ARDOUR::MeterType);
 	~MeterStrip ();
@@ -79,7 +79,7 @@ class MeterStrip : public Gtk::VBox, public AxisView, public RouteUI
 
 	bool selected() const { return false; }
 
-  protected:
+protected:
 	boost::shared_ptr<ARDOUR::Route> _route;
 	PBD::ScopedConnectionList meter_route_connections;
 	PBD::ScopedConnectionList level_meter_connection;
@@ -99,7 +99,7 @@ class MeterStrip : public Gtk::VBox, public AxisView, public RouteUI
 	std::string state_id() const;
 	void set_button_names ();
 
-  private:
+private:
 	Gtk::VBox mtr_vbox;
 	Gtk::VBox nfo_vbox;
 	Gtk::EventBox mtr_container;
diff --git a/gtk2_ardour/meterbridge.h b/gtk2_ardour/meterbridge.h
index a1715b2633..71964b5556 100644
--- a/gtk2_ardour/meterbridge.h
+++ b/gtk2_ardour/meterbridge.h
@@ -44,7 +44,7 @@ class Meterbridge :
 	public ARDOUR::SessionHandlePtr,
 	public Gtkmm2ext::VisibilityTracker
 {
-  public:
+public:
 	static Meterbridge* instance();
 	~Meterbridge();
 
@@ -56,7 +56,7 @@ class Meterbridge :
 	void show_window ();
 	bool hide_window (GdkEventAny *ev);
 
-  private:
+private:
 	Meterbridge ();
 	static Meterbridge* _instance;
 
@@ -94,7 +94,8 @@ class Meterbridge :
 		}
 	};
 
-	struct MeterOrderRouteSorter {
+	struct MeterOrderRouteSorter
+	{
 		bool operator() (struct MeterBridgeStrip ma, struct MeterBridgeStrip mb) {
 			boost::shared_ptr<ARDOUR::Route> a = ma.s->route();
 			boost::shared_ptr<ARDOUR::Route> b = mb.s->route();
diff --git a/gtk2_ardour/midi_channel_dialog.h b/gtk2_ardour/midi_channel_dialog.h
index fcf239272c..8d363d35cb 100644
--- a/gtk2_ardour/midi_channel_dialog.h
+++ b/gtk2_ardour/midi_channel_dialog.h
@@ -26,11 +26,11 @@
 
 class MidiChannelDialog : public ArdourDialog
 {
-  public:
+public:
 	MidiChannelDialog (uint8_t active_channel = 0);
 	uint8_t active_channel() const;
 
-  private:
+private:
 	SingleMidiChannelSelector selector;
 };
 
diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h
index 56a3f3b7c4..730e6de889 100644
--- a/gtk2_ardour/midi_channel_selector.h
+++ b/gtk2_ardour/midi_channel_selector.h
@@ -41,7 +41,7 @@ namespace ARDOUR {
 
 class MidiChannelSelector : public Gtk::Table
 {
-  public:
+public:
 	MidiChannelSelector(int n_rows = 4, int n_columns = 4, int start_row = 0, int start_column = 0);
 	virtual ~MidiChannelSelector() = 0;
 
@@ -50,7 +50,7 @@ class MidiChannelSelector : public Gtk::Table
 	void set_channel_colors(const uint32_t new_channel_colors[16]);
 	void set_default_channel_color();
 
-  protected:
+protected:
 	virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr) = 0;
 	Gtk::Label                      _button_labels[4][4];
 	Gtkmm2ext::StatefulToggleButton _buttons[4][4];
@@ -61,14 +61,14 @@ class MidiChannelSelector : public Gtk::Table
 
 class SingleMidiChannelSelector : public MidiChannelSelector
 {
-  public:
+public:
 	SingleMidiChannelSelector(uint8_t active_channel = 0);
 
 	uint8_t get_active_channel() const { return _active_channel; }
 
 	sigc::signal<void, uint8_t> channel_selected;
 
-  protected:
+protected:
 	virtual void button_toggled(Gtk::ToggleButton* button, uint8_t button_nr);
 
 	Gtk::ToggleButton* _last_active_button;
@@ -77,9 +77,9 @@ class SingleMidiChannelSelector : public MidiChannelSelector
 
 class MidiMultipleChannelSelector : public MidiChannelSelector
 {
-  public:
+public:
 	MidiMultipleChannelSelector(ARDOUR::ChannelMode mode = ARDOUR::FilterChannels,
-				uint16_t initial_selection = 0xFFFF);
+			uint16_t initial_selection = 0xFFFF);
 
 	virtual ~MidiMultipleChannelSelector();
 
@@ -100,7 +100,7 @@ class MidiMultipleChannelSelector : public MidiChannelSelector
 	uint16_t get_selected_channels() const;
 	void     set_selected_channels(uint16_t selected_channels);
 
-  protected:
+protected:
 	ARDOUR::ChannelMode _channel_mode;
 	ARDOUR::NoteMode    _note_mode;
 
@@ -118,14 +118,14 @@ class MidiMultipleChannelSelector : public MidiChannelSelector
 
 class MidiChannelSelectorWindow : public ArdourWindow, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	MidiChannelSelectorWindow (boost::shared_ptr<ARDOUR::MidiTrack>);
 	~MidiChannelSelectorWindow ();
 
 	void set_channel_colors (const uint32_t new_channel_colors[16]);
 	void set_default_channel_color();
 
-  private:
+private:
 	boost::shared_ptr<ARDOUR::MidiTrack> track;
 	std::vector<Gtk::ToggleButton*> playback_buttons;
 	std::vector<Gtk::ToggleButton*> capture_buttons;
diff --git a/gtk2_ardour/midi_cut_buffer.h b/gtk2_ardour/midi_cut_buffer.h
index da17c50413..0f6ab74667 100644
--- a/gtk2_ardour/midi_cut_buffer.h
+++ b/gtk2_ardour/midi_cut_buffer.h
@@ -29,7 +29,7 @@ namespace ARDOUR {
 
 class MidiCutBuffer : public ARDOUR::AutomatableSequence<Evoral::Beats>
 {
-  public:
+public:
 	typedef Evoral::Beats TimeType;
 
 	MidiCutBuffer (ARDOUR::Session*);
@@ -40,7 +40,7 @@ class MidiCutBuffer : public ARDOUR::AutomatableSequence<Evoral::Beats>
 
 	void set (const Evoral::Sequence<TimeType>::Notes&);
 
-  private:
+private:
 	TimeType _origin;
 };
 
diff --git a/gtk2_ardour/midi_export_dialog.h b/gtk2_ardour/midi_export_dialog.h
index f7399af63c..813c80ca4a 100644
--- a/gtk2_ardour/midi_export_dialog.h
+++ b/gtk2_ardour/midi_export_dialog.h
@@ -27,8 +27,9 @@
 #include "ardour_dialog.h"
 #include "public_editor.h"
 
-class MidiExportDialog : public ArdourDialog {
-  public:
+class MidiExportDialog : public ArdourDialog
+{
+public:
 	MidiExportDialog (PublicEditor& editor, boost::shared_ptr<ARDOUR::MidiRegion>);
 	~MidiExportDialog ();
 
@@ -36,7 +37,7 @@ class MidiExportDialog : public ArdourDialog {
 
 	std::string get_path() const;
 
-  private:
+private:
 	Gtk::FileChooserWidget file_chooser;
 };
 
diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h
index 283a0da8bc..1bf56f6459 100644
--- a/gtk2_ardour/midi_list_editor.h
+++ b/gtk2_ardour/midi_list_editor.h
@@ -43,15 +43,16 @@ namespace ARDOUR {
 
 class MidiListEditor : public ArdourWindow
 {
-  public:
+public:
 	typedef Evoral::Note<Evoral::Beats> NoteType;
 
 	MidiListEditor(ARDOUR::Session*, boost::shared_ptr<ARDOUR::MidiRegion>,
-		       boost::shared_ptr<ARDOUR::MidiTrack>);
+	               boost::shared_ptr<ARDOUR::MidiTrack>);
 	~MidiListEditor();
 
-  private:
-	struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord {
+private:
+	struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		MidiListModelColumns() {
 			add (channel);
 			add (note);
@@ -70,7 +71,8 @@ class MidiListEditor : public ArdourWindow
 		Gtk::TreeModelColumn<boost::shared_ptr<NoteType> > _note;
 	};
 
-	struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord {
+	struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		NoteLengthColumns() {
 			add (ticks);
 			add (name);
diff --git a/gtk2_ardour/midi_scroomer.h b/gtk2_ardour/midi_scroomer.h
index b27c66dbe9..2b4ebe6c64 100644
--- a/gtk2_ardour/midi_scroomer.h
+++ b/gtk2_ardour/midi_scroomer.h
@@ -23,8 +23,9 @@
 #include <gtkmm2ext/scroomer.h>
 #include <gdkmm/pixbuf.h>
 
-class MidiScroomer : public Gtkmm2ext::Scroomer {
-  public:
+class MidiScroomer : public Gtkmm2ext::Scroomer
+{
+public:
 	MidiScroomer(Gtk::Adjustment&);
 	~MidiScroomer();
 
diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index 78f0008157..f4328ab093 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -55,7 +55,7 @@ class Selection;
 
 class MidiStreamView : public StreamView
 {
-  public:
+public:
 	MidiStreamView (MidiTimeAxisView&);
 	~MidiStreamView ();
 
@@ -78,23 +78,26 @@ class MidiStreamView : public StreamView
 	void update_note_range(uint8_t note_num);
 
 	void set_layer_display (LayerDisplay);
-//	bool can_change_layer_display() const { return false; }  //revert this change for now.  Although stacked view is weirdly implemented wrt the "scroomer", it is still necessary to be able to manage layered regions.
+	//bool can_change_layer_display() const { return false; } // revert this change for now.  Although stacked view is weirdly implemented wrt the "scroomer", it is still necessary to be able to manage layered regions.
 	void redisplay_track ();
 
-	inline double contents_height() const
-	{ return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+	inline double contents_height() const {
+		return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2);
+	}
 
-	inline double note_to_y(uint8_t note) const
-		{ return contents_height()
-			- (note + 1 - lowest_note()) * note_height() + 1; }
+	inline double note_to_y(uint8_t note) const {
+		return contents_height() - (note + 1 - lowest_note()) * note_height() + 1;
+	}
 
 	uint8_t y_to_note(double y) const;
 
-	inline double note_height() const
-		{ return contents_height() / (double)contents_note_range(); }
+	inline double note_height() const {
+		return contents_height() / (double)contents_note_range();
+	}
 
-	inline uint8_t contents_note_range() const
-		{ return highest_note() - lowest_note() + 1; }
+	inline uint8_t contents_note_range() const {
+		return highest_note() - lowest_note() + 1;
+	}
 
 	sigc::signal<void> NoteRangeChanged;
 
@@ -107,16 +110,16 @@ class MidiStreamView : public StreamView
 	void suspend_updates ();
 	void resume_updates ();
 
-  protected:
+protected:
 	void setup_rec_box ();
 	void update_rec_box ();
 
-  private:
+private:
 
 	RegionView* add_region_view_internal (
-		boost::shared_ptr<ARDOUR::Region>,
-		bool wait_for_waves,
-		bool recording = false);
+			boost::shared_ptr<ARDOUR::Region>,
+			bool wait_for_waves,
+			bool recording = false);
 
 	void display_region(MidiRegionView* region_view, bool load_model);
 	void display_track (boost::shared_ptr<ARDOUR::Track> tr);
diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index e0e3f01dc9..657f410c5d 100644
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -45,11 +45,11 @@ namespace ARDOUR {
 
 class MidiTracer : public ArdourWindow
 {
-  public:
+public:
 	MidiTracer ();
 	~MidiTracer();
 
-  private:
+private:
 	Gtk::TextView text;
 	Gtk::ScrolledWindow scroller;
 	Gtk::Adjustment line_count_adjustment;
diff --git a/gtk2_ardour/midi_velocity_dialog.h b/gtk2_ardour/midi_velocity_dialog.h
index 7161e0bd5c..4ad27552fc 100644
--- a/gtk2_ardour/midi_velocity_dialog.h
+++ b/gtk2_ardour/midi_velocity_dialog.h
@@ -29,11 +29,11 @@
 
 class MidiVelocityDialog : public ArdourDialog
 {
-  public:
+public:
 	MidiVelocityDialog (uint8_t current_velocity = 0);
 	uint8_t velocity() const;
 
-  private:
+private:
 	Gtk::Adjustment adjustment;
 	Gtk::SpinButton spinner;
 	Gtk::Label      label;
diff --git a/gtk2_ardour/missing_plugin_dialog.h b/gtk2_ardour/missing_plugin_dialog.h
index 87d4954575..7aaa917a8e 100644
--- a/gtk2_ardour/missing_plugin_dialog.h
+++ b/gtk2_ardour/missing_plugin_dialog.h
@@ -29,7 +29,7 @@ namespace ARDOUR {
 
 class MissingPluginDialog : public ArdourDialog
 {
-  public:
+public:
 	MissingPluginDialog (ARDOUR::Session *, std::list<std::string> const &);
 };
 
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index a8e80d8afa..f6a81cdf86 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -78,7 +78,7 @@ class ArdourWindow;
 
 class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
 {
-  public:
+public:
 	MixerStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true);
 	MixerStrip (Mixer_UI&, ARDOUR::Session*, bool in_mixer = true);
 	~MixerStrip ();
@@ -144,14 +144,14 @@ class MixerStrip : public AxisView, public RouteUI, public Gtk::EventBox
 
 	static MixerStrip* entered_mixer_strip() { return _entered_mixer_strip; }
 
-  protected:
+protected:
 	friend class Mixer_UI;
 	void set_packed (bool yn);
 	bool packed () { return _packed; }
 
 	void set_stuff_from_route ();
 
-  private:
+private:
 	Mixer_UI& _mixer;
 
 	void init ();
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index 7dad355943..27c8f0bce6 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -79,7 +79,7 @@ protected:
 
 class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public AxisViewProvider
 {
-  public:
+public:
 	static Mixer_UI* instance();
 	~Mixer_UI();
 
@@ -127,10 +127,10 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 	void load_bindings ();
 	Gtkmm2ext::Bindings*  bindings;
 
-  protected:
+protected:
 	void set_axis_targets_for_operation ();
 
-  private:
+private:
 	Mixer_UI ();
 	static Mixer_UI*     _instance;
 	Gtk::VBox            _content;
@@ -343,8 +343,8 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 	static const int32_t default_height = 765;
 
 	/** true if we are rebuilding the route group list, or clearing
-	    it during a session teardown.
-	*/
+	 * it during a session teardown.
+	 */
 	bool _in_group_rebuild_or_clear;
 	bool _route_deletion_in_progress;
 
diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index 61f4480c2f..037ce528dc 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -41,7 +41,7 @@ namespace Gtkmm2ext {
 
 class MonitorSection : public RouteUI, public Gtk::EventBox
 {
-  public:
+public:
 	MonitorSection (ARDOUR::Session*);
 	~MonitorSection ();
 
@@ -53,7 +53,7 @@ class MonitorSection : public RouteUI, public Gtk::EventBox
 
 	PluginSelector* plugin_selector() { return _plugin_selector; }
 
-	private:
+private:
 	Gtk::HBox hpacker;
 	Gtk::VBox vpacker;
 	Gtkmm2ext::TearOff* _tearoff;
diff --git a/gtk2_ardour/monitor_selector.h b/gtk2_ardour/monitor_selector.h
index 8e572e958c..7f830164e2 100644
--- a/gtk2_ardour/monitor_selector.h
+++ b/gtk2_ardour/monitor_selector.h
@@ -25,7 +25,7 @@
 
 class MonitorSelector : public PortMatrix
 {
-  public:
+public:
 	MonitorSelector (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr<ARDOUR::IO>);
 
 	void set_state (ARDOUR::BundleChannel c[2], bool);
@@ -55,8 +55,7 @@ class MonitorSelector : public PortMatrix
 	bool can_remove_channels (boost::shared_ptr<ARDOUR::Bundle>) const { return false; }
 	bool can_rename_channels (boost::shared_ptr<ARDOUR::Bundle>) const { return false; }
 
-  private:
-
+private:
 	void io_changed ();
 	void io_changed_proxy ();
 
@@ -70,16 +69,16 @@ class MonitorSelector : public PortMatrix
 
 class MonitorSelectorWindow : public ArdourWindow
 {
-  public:
+public:
 	MonitorSelectorWindow (ARDOUR::Session *, boost::shared_ptr<ARDOUR::IO>, bool can_cancel = false);
 
 	MonitorSelector& selector() { return _selector; }
 
-  protected:
+protected:
 	void on_map ();
 	void on_show ();
 
-  private:
+private:
 	MonitorSelector _selector;
 
 	void io_name_changed (void *src);
diff --git a/gtk2_ardour/mono_panner.h b/gtk2_ardour/mono_panner.h
index 7ceab6a865..4a0c2a4c59 100644
--- a/gtk2_ardour/mono_panner.h
+++ b/gtk2_ardour/mono_panner.h
@@ -38,7 +38,7 @@ namespace PBD {
 
 class MonoPanner : public PannerInterface
 {
-  public:
+public:
 	MonoPanner (boost::shared_ptr<ARDOUR::PannerShell>);
 	~MonoPanner ();
 
@@ -47,7 +47,7 @@ class MonoPanner : public PannerInterface
 	sigc::signal<void> StartGesture;
 	sigc::signal<void> StopGesture;
 
-  protected:
+protected:
 	bool on_expose_event (GdkEventExpose*);
 	bool on_button_press_event (GdkEventButton*);
 	bool on_button_release_event (GdkEventButton*);
@@ -55,7 +55,7 @@ class MonoPanner : public PannerInterface
 	bool on_scroll_event (GdkEventScroll*);
 	bool on_key_press_event (GdkEventKey*);
 
-  private:
+private:
 	PannerEditor* editor ();
 	boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
 
diff --git a/gtk2_ardour/nag.h b/gtk2_ardour/nag.h
index 961a7fafe5..fc53444d33 100644
--- a/gtk2_ardour/nag.h
+++ b/gtk2_ardour/nag.h
@@ -28,13 +28,13 @@
 
 class NagScreen : public ArdourDialog
 {
-  public:
+public:
 	~NagScreen();
 
 	static NagScreen* maybe_nag (std::string context);
 	void nag ();
 
-  private:
+private:
 	NagScreen (std::string context, bool maybe_subscriber);
 
 	Gtk::Label message;
diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 54c53ff6d2..b7be36ada8 100644
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -52,7 +52,7 @@ namespace ArdourCanvas {
  */
 class NoteBase : public sigc::trackable
 {
-  public:
+public:
 	typedef Evoral::Note<Evoral::Beats> NoteType;
 
 	NoteBase (MidiRegionView& region, bool, const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>());
@@ -106,11 +106,9 @@ class NoteBase : public sigc::trackable
 		if (selected) {
 			return _selected_mod_col;
 		} else if (vel < 64) {
-			return UINT_INTERPOLATE(_min_col, _mid_col,
-				(vel / (double)63.0));
+			return UINT_INTERPOLATE(_min_col, _mid_col, (vel / (double)63.0));
 		} else {
-			return UINT_INTERPOLATE(_mid_col, _max_col,
-				((vel-64) / (double)63.0));
+			return UINT_INTERPOLATE(_mid_col, _max_col, ((vel - 64) / (double)63.0));
 		}
 	}
 
diff --git a/gtk2_ardour/nsm.h b/gtk2_ardour/nsm.h
index 8dec072f00..779a1cc970 100644
--- a/gtk2_ardour/nsm.h
+++ b/gtk2_ardour/nsm.h
@@ -23,17 +23,18 @@
 
 class NSM_Client:public NSM::Client
 {
-  public:
+public:
 
 	NSM_Client();
 	~NSM_Client() { }
 
-  protected:
+protected:
 
-	int command_open(const char *name,
-	                 const char *display_name,
-	                 const char *client_id,
-	                 char **out_msg);
-	int command_save(char **out_msg);
+	int command_open (const char *name,
+	                  const char *display_name,
+	                  const char *client_id,
+	                  char **out_msg);
+
+	int command_save (char **out_msg);
 };
 
diff --git a/gtk2_ardour/nsmclient.h b/gtk2_ardour/nsmclient.h
index eea313d1f4..1fddd25b08 100644
--- a/gtk2_ardour/nsmclient.h
+++ b/gtk2_ardour/nsmclient.h
@@ -23,90 +23,88 @@
 
 namespace NSM
 {
+class Client
+{
+private:
 
-	class Client
-	{
-
-	  private:
-
-		const char *nsm_url;
+	const char *nsm_url;
 
-		lo_server _server;
-		lo_server_thread _st;
-		lo_address nsm_addr;
+	lo_server _server;
+	lo_server_thread _st;
+	lo_address nsm_addr;
 
-		bool nsm_is_active;
-		char *_nsm_client_id;
-		char *_session_manager_name;
-		char *_nsm_client_path;
+	bool nsm_is_active;
+	char *_nsm_client_id;
+	char *_session_manager_name;
+	char *_nsm_client_path;
 
-	  public:
+public:
 
-		enum
-		{
-			ERR_OK               = 0,
-			ERR_GENERAL          = -1,
-			ERR_INCOMPATIBLE_API = -2,
-			ERR_BLACKLISTED      = -3,
-			ERR_LAUNCH_FAILED    = -4,
-			ERR_NO_SUCH_FILE     = -5,
-			ERR_NO_SESSION_OPEN  = -6,
-			ERR_UNSAVED_CHANGES  = -7,
-			ERR_NOT_NOW          = -8
-		};
+	enum
+	{
+		ERR_OK               = 0,
+		ERR_GENERAL          = -1,
+		ERR_INCOMPATIBLE_API = -2,
+		ERR_BLACKLISTED      = -3,
+		ERR_LAUNCH_FAILED    = -4,
+		ERR_NO_SUCH_FILE     = -5,
+		ERR_NO_SESSION_OPEN  = -6,
+		ERR_UNSAVED_CHANGES  = -7,
+		ERR_NOT_NOW          = -8
+	};
 
-		Client ( );
-		virtual ~Client ( );
+	Client ();
+	virtual ~Client ();
 
-		bool is_active ( void ) { return nsm_is_active; }
+	bool is_active (void) { return nsm_is_active; }
 
-		const char *session_manager_name ( void ) { return _session_manager_name; }
-		const char *client_id ( void ) { return _nsm_client_id; }
-		const char *client_path ( void ) { return _nsm_client_path; }
+	const char *session_manager_name (void) { return _session_manager_name; }
+	const char *client_id (void) { return _nsm_client_id; }
+	const char *client_path (void) { return _nsm_client_path; }
 
-		/* Client->Server methods */
-		void is_dirty ( void );
-		void is_clean ( void );
-		void progress ( float f );
-		void message( int priority, const char *msg );
-		void announce ( const char *appliction_name, const char *capabilities, const char *process_name );
+	/* Client->Server methods */
+	void is_dirty (void);
+	void is_clean (void);
+	void progress (float f);
+	void message (int priority, const char *msg);
+	void announce (const char *appliction_name, const char *capabilities, const char *process_name);
 
-		void broadcast ( lo_message msg );
+	void broadcast (lo_message msg);
 
-		/* init without threading */
-		int init ( const char *nsm_url );
-		/* init with threading */
-		int init_thread ( const char *nsm_url );
+	/* init without threading */
+	int init (const char *nsm_url);
+	/* init with threading */
+	int init_thread (const char *nsm_url);
 
-		/* call this periodically to check for new messages */
-		void check ( int timeout = 0 );
+	/* call this periodically to check for new messages */
+	void check (int timeout = 0);
 
-		/* or call these to start and stop a thread (must do your own locking in handler!) */
-		void start ( void );
-		void stop ( void );
+	/* or call these to start and stop a thread (must do your own locking in handler!) */
+	void start (void);
+	void stop (void);
 
-	  protected:
+protected:
 
-		/* Server->Client methods */
-		virtual int command_open ( const char *name, const char *display_name, const char *client_id, char **out_msg ) = 0;
-		virtual int command_save ( char **out_msg ) = 0;
+	/* Server->Client methods */
+	virtual int command_open (const char *name, const char *display_name, const char *client_id, char **out_msg) = 0;
+	virtual int command_save (char **out_msg) = 0;
 
-		virtual void command_active ( bool ) { }
+	virtual void command_active (bool) {}
 
-		virtual void command_session_is_loaded ( void ) { }
+	virtual void command_session_is_loaded (void) {}
 
-		/* invoked when an unrecognized message is received. Should return 0 if you handled it, -1 otherwise. */
-		virtual int command_broadcast ( const char *, lo_message ) { return -1; }
+	/* invoked when an unrecognized message is received. Should return 0 if you handled it, -1 otherwise. */
+	virtual int command_broadcast (const char *, lo_message) { return -1; }
 
-	  private:
+private:
 
-		/* osc handlers */
-		static int osc_open ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data );
-		static int osc_save ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data );
-		static int osc_announce_reply ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data );
-		static int osc_error ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data );
-		static int osc_session_is_loaded ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data );
-		static int osc_broadcast ( const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data );
+	/* osc handlers */
+	static int osc_open (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data);
+	static int osc_save (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data);
+	static int osc_announce_reply (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data);
+	static int osc_error (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data);
+	static int osc_session_is_loaded (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data);
+	static int osc_broadcast (const char *path, const char *types, lo_arg **argv, int argc, lo_message msg, void *user_data);
 
-	};
+};
 };
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 20a38cc0d9..fda57f47b1 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -60,7 +60,7 @@ namespace Gtk {
 
 class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	PannerUI (ARDOUR::Session*);
 	~PannerUI ();
 
@@ -84,7 +84,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	static void setup_slider_pix ();
 
-  private:
+private:
 	friend class MixerStrip;
 	friend class SendUI;
 
@@ -105,7 +105,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	Gtk::VBox           pan_bar_packer;
 	Gtk::VBox           pan_vbox;
-        Gtk::VBox           poswidth_box;
+	Gtk::VBox           poswidth_box;
 	Width              _width;
 
 	StereoPanner*  _stereo_panner;
diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h
index c792179776..5db71a447f 100644
--- a/gtk2_ardour/playlist_selector.h
+++ b/gtk2_ardour/playlist_selector.h
@@ -41,16 +41,16 @@ class RouteUI;
 
 class PlaylistSelector : public ArdourDialog
 {
-  public:
+public:
 	PlaylistSelector ();
 	~PlaylistSelector ();
 
 	void show_for (RouteUI*);
 
-  protected:
+protected:
 	bool on_unmap_event (GdkEventAny*);
 
-  private:
+private:
 	typedef std::map<PBD::ID,std::list<boost::shared_ptr<ARDOUR::Playlist> >*> TrackPlaylistMap;
 
 	Gtk::ScrolledWindow scroller;
@@ -64,13 +64,14 @@ class PlaylistSelector : public ArdourDialog
 	void close_button_click ();
 	void selection_changed ();
 
-	struct ModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    ModelColumns () {
-		    add (text);
-		    add (playlist);
-	    }
-	    Gtk::TreeModelColumn<std::string> text;
-	    Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Playlist> >   playlist;
+	struct ModelColumns : public Gtk::TreeModel::ColumnRecord
+	{
+		ModelColumns () {
+			add (text);
+			add (playlist);
+		}
+		Gtk::TreeModelColumn<std::string> text;
+		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Playlist> >   playlist;
 	};
 
 	ModelColumns columns;
diff --git a/gtk2_ardour/plugin_interest.h b/gtk2_ardour/plugin_interest.h
index 7661a84d33..82e4179a0e 100644
--- a/gtk2_ardour/plugin_interest.h
+++ b/gtk2_ardour/plugin_interest.h
@@ -25,8 +25,9 @@
 
 typedef std::vector<ARDOUR::PluginPtr> SelectedPlugins;
 
-class PluginInterestedObject {
-  public:
+class PluginInterestedObject
+{
+public:
 	PluginInterestedObject() {}
 	virtual ~PluginInterestedObject() {}
 
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 14780758b4..7ab332d3b4 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -40,7 +40,7 @@ namespace ARDOUR {
 
 class PluginSelector : public ArdourDialog
 {
-  public:
+public:
 	PluginSelector (ARDOUR::PluginManager&);
 	~PluginSelector ();
 
@@ -53,7 +53,7 @@ class PluginSelector : public ArdourDialog
 	Gtk::Menu* plugin_menu ();
 	void show_manager ();
 
-  private:
+private:
 	PluginInterestedObject* interested_object;
 
 	Gtk::ScrolledWindow scroller;   // Available plugins
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 042a2404a2..860772c8c4 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -83,7 +83,7 @@ class VSTPluginUI;
 
 class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	PlugUIBase (boost::shared_ptr<ARDOUR::PluginInsert>);
 	virtual ~PlugUIBase();
 
@@ -106,11 +106,11 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
 
 	virtual void forward_key_event (GdkEventKey*) {}
 	virtual void grab_focus () {}
-  virtual bool non_gtk_gui() const { return false; }
+	virtual bool non_gtk_gui() const { return false; }
 
 	sigc::signal<void,bool> KeyboardFocused;
 
-  protected:
+protected:
 	boost::shared_ptr<ARDOUR::PluginInsert> insert;
 	boost::shared_ptr<ARDOUR::Plugin> plugin;
 
@@ -185,7 +185,7 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
 
 class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 {
-  public:
+public:
 	GenericPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> plug, bool scrollable=false);
 	~GenericPluginUI ();
 
@@ -195,7 +195,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	bool start_updating(GdkEventAny*);
 	bool stop_updating(GdkEventAny*);
 
-  private:
+private:
 	Gtk::VBox main_contents;
 	Gtk::HBox settings_box;
 	Gtk::HBox hpacker;
@@ -301,7 +301,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 
 class PluginUIWindow : public ArdourWindow
 {
-  public:
+public:
 	PluginUIWindow (boost::shared_ptr<ARDOUR::PluginInsert> insert,
 	                bool scrollable=false,
 	                bool editor=true);
@@ -319,7 +319,7 @@ class PluginUIWindow : public ArdourWindow
 	void on_show ();
 	void on_hide ();
 
-  private:
+private:
 	std::string _title;
 	PlugUIBase* _pluginui;
 	PBD::ScopedConnection death_connection;
diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h
index d631f8ac05..3d9e87f710 100644
--- a/gtk2_ardour/port_group.h
+++ b/gtk2_ardour/port_group.h
@@ -99,7 +99,7 @@ private:
 /// A list of PortGroups
 class PortGroupList : public sigc::trackable
 {
-  public:
+public:
 	PortGroupList ();
 	~PortGroupList();
 
@@ -136,16 +136,14 @@ class PortGroupList : public sigc::trackable
 	/** A bundle in one of our groups has changed */
 	PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged;
 
-  private:
+private:
 	bool port_has_prefix (std::string const &, std::string const &) const;
 	std::string common_prefix (std::vector<std::string> const &) const;
 	std::string common_prefix_before (std::vector<std::string> const &, std::string const &) const;
 	void emit_changed ();
 	void emit_bundle_changed (ARDOUR::Bundle::Change);
 	boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, ARDOUR::DataType, bool, std::string const& bundle_name = std::string()) const;
-	void maybe_add_processor_to_list (
-		boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
-		);
+	void maybe_add_processor_to_list (boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &);
 
 	mutable PortGroup::BundleList _bundles;
 	List _groups;
diff --git a/gtk2_ardour/port_insert_ui.h b/gtk2_ardour/port_insert_ui.h
index d0f2e53e90..a04ef1fe40 100644
--- a/gtk2_ardour/port_insert_ui.h
+++ b/gtk2_ardour/port_insert_ui.h
@@ -30,13 +30,13 @@ namespace ARDOUR {
 
 class PortInsertUI : public Gtk::VBox
 {
-  public:
+public:
 	PortInsertUI (Gtk::Window*, ARDOUR::Session *, boost::shared_ptr<ARDOUR::PortInsert>);
 
 	void redisplay ();
 	void finished (IOSelector::Result);
 
-  private:
+private:
 	boost::shared_ptr<ARDOUR::PortInsert> _pi;
 
 	Gtk::Notebook notebook;
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index cd75c7c8a0..1074d10914 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -80,7 +80,7 @@ class ProcessorBox;
 
 class ProcessorWindowProxy : public WM::ProxyBase
 {
-  public:
+public:
 	ProcessorWindowProxy (std::string const &, ProcessorBox *, boost::weak_ptr<ARDOUR::Processor>);
 	~ProcessorWindowProxy();
 
@@ -97,7 +97,7 @@ class ProcessorWindowProxy : public WM::ProxyBase
 	int set_state (const XMLNode&, int);
 	XMLNode& get_state ();
 
-  private:
+private:
 	ProcessorBox* _processor_box;
 	boost::weak_ptr<ARDOUR::Processor> _processor;
 	bool is_custom;
@@ -401,7 +401,7 @@ private:
 
 class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	enum ProcessorOperation {
 		ProcessorsCut,
 		ProcessorsCopy,
@@ -414,7 +414,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	};
 
 	ProcessorBox (ARDOUR::Session*, boost::function<PluginSelector*()> get_plugin_selector,
-		      ProcessorSelection&, MixerStrip* parent, bool owner_is_mixer = false);
+	              ProcessorSelection&, MixerStrip* parent, bool owner_is_mixer = false);
 	~ProcessorBox ();
 
 	void set_route (boost::shared_ptr<ARDOUR::Route>);
@@ -457,7 +457,8 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 
 	typedef std::vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
 
-	static ProcSelection current_processor_selection () {
+	static ProcSelection current_processor_selection ()
+	{
 		ProcSelection ps;
 		if (_current_processor_box) {
 			_current_processor_box->get_selected_processors (ps);
@@ -469,7 +470,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	static bool show_all_processors;
 #endif
 
-  private:
+private:
 	/* prevent copy construction */
 	ProcessorBox (ProcessorBox const &);
 
diff --git a/gtk2_ardour/prompter.h b/gtk2_ardour/prompter.h
index 0af5fdee7b..cea78f6b22 100644
--- a/gtk2_ardour/prompter.h
+++ b/gtk2_ardour/prompter.h
@@ -24,7 +24,7 @@
 
 class ArdourPrompter : public Gtkmm2ext::Prompter
 {
-  public:
+public:
 	ArdourPrompter (bool modal = false);
 };
 
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index f0ed177500..b83a806b00 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -108,8 +108,9 @@ using ARDOUR::framecnt_t;
  * of PublicEditor need not be recompiled if private methods or member variables
  * change.
  */
-class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePtr, public AxisViewProvider {
-  public:
+class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePtr, public AxisViewProvider
+{
+public:
 	PublicEditor (Gtk::Widget& content);
 	virtual ~PublicEditor ();
 
@@ -151,7 +152,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePt
 	virtual void snap_to (ARDOUR::MusicFrame& first,
 	                      ARDOUR::RoundMode   direction = ARDOUR::RoundNearest,
 	                      bool                for_mark  = false,
-			      bool                ensure_snap = false) = 0;
+	                      bool                ensure_snap = false) = 0;
 
 	/** Undo some transactions.
 	 * @param n Number of transactions to undo.
@@ -181,8 +182,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePt
 	 */
 	virtual Editing::MouseMode current_mouse_mode () const = 0;
 
-	/** @return Whether the current mouse mode is an "internal" editing mode.
-	 */
+	/** @return Whether the current mouse mode is an "internal" editing mode. */
 	virtual bool internal_editing() const = 0;
 
 	/** Possibly start the audition of a region.  If @param r is 0, or not an AudioRegion
diff --git a/gtk2_ardour/quantize_dialog.h b/gtk2_ardour/quantize_dialog.h
index f162dd0993..902bc85cc7 100644
--- a/gtk2_ardour/quantize_dialog.h
+++ b/gtk2_ardour/quantize_dialog.h
@@ -40,7 +40,7 @@ class PublicEditor;
 
 class QuantizeDialog : public ArdourDialog
 {
-  public:
+public:
 	QuantizeDialog (PublicEditor&);
 	~QuantizeDialog ();
 
@@ -52,7 +52,7 @@ class QuantizeDialog : public ArdourDialog
 	float  threshold () const;
 	float  swing () const;
 
-  private:
+private:
 	PublicEditor& editor;
 
 	Gtk::ComboBoxText start_grid_combo;
diff --git a/gtk2_ardour/region_editor.h b/gtk2_ardour/region_editor.h
index 1889731fff..aa0098a4ba 100644
--- a/gtk2_ardour/region_editor.h
+++ b/gtk2_ardour/region_editor.h
@@ -51,17 +51,17 @@ class ClockGroup;
 
 class RegionEditor : public ArdourDialog
 {
-  public:
+public:
 	RegionEditor (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Region>);
 	virtual ~RegionEditor ();
 
-  protected:
+protected:
 	virtual void region_changed (const PBD::PropertyChange&);
 
 	Gtk::Table _table;
 	int _table_row;
 
-  private:
+private:
 	boost::shared_ptr<ARDOUR::Region> _region;
 
 	void connect_editor_events ();
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index f1f9ae88b5..e6789c222c 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -34,7 +34,7 @@ class AudioRegionView;
 
 class AudioRegionGainLine : public AutomationLine
 {
-  public:
+public:
 	AudioRegionGainLine (const std::string & name, AudioRegionView&, ArdourCanvas::Container& parent, boost::shared_ptr<ARDOUR::AutomationList>);
 
 	void start_drag_single (ControlPoint*, double, float);
@@ -49,5 +49,4 @@ private:
 	AudioRegionView& rv;
 };
 
-
 #endif /* __ardour_gtk_region_gain_line_h__ */
diff --git a/gtk2_ardour/region_layering_order_editor.h b/gtk2_ardour/region_layering_order_editor.h
index a1246dbc64..05ce273f1f 100644
--- a/gtk2_ardour/region_layering_order_editor.h
+++ b/gtk2_ardour/region_layering_order_editor.h
@@ -39,17 +39,17 @@ namespace ARDOUR {
 
 class RegionLayeringOrderEditor : public ArdourWindow
 {
-  public:
+public:
 	RegionLayeringOrderEditor (PublicEditor&);
 	virtual ~RegionLayeringOrderEditor ();
 
 	void set_context (const std::string &, ARDOUR::Session *, TimeAxisView *, boost::shared_ptr<ARDOUR::Playlist>, ARDOUR::framepos_t);
 	void maybe_present ();
 
-  protected:
+protected:
 	virtual bool on_key_press_event (GdkEventKey* event);
 
-  private:
+private:
 	framepos_t position;
 	bool in_row_change;
 	uint32_t regions_at_position;
diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h
index e3bf60ee96..433f92e336 100644
--- a/gtk2_ardour/region_selection.h
+++ b/gtk2_ardour/region_selection.h
@@ -36,7 +36,7 @@ class TimeAxisView;
  */
 class RegionSelection : public std::list<RegionView*>
 {
-  public:
+public:
 	RegionSelection();
 	RegionSelection (const RegionSelection&);
 
@@ -69,7 +69,7 @@ class RegionSelection : public std::list<RegionView*>
 
 	ARDOUR::RegionList regionlist () const;
 
-  private:
+private:
 	void remove_it (RegionView*);
 
 	void add_to_layer (RegionView *);
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 4e5354ea31..7cc4c6b964 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -48,13 +48,13 @@ namespace ArdourCanvas {
 
 class RegionView : public TimeAxisViewItem
 {
-  public:
+public:
 	RegionView (ArdourCanvas::Container* parent,
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
 	            double               samples_per_pixel,
 	            uint32_t             base_color,
-		    bool 		 automation = false);
+	            bool 		 automation = false);
 
 	RegionView (const RegionView& other);
 	RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
@@ -123,18 +123,18 @@ class RegionView : public TimeAxisViewItem
 
 	ARDOUR::MusicFrame snap_frame_to_frame (ARDOUR::frameoffset_t, bool ensure_snap = false) const;
 
-  protected:
+protected:
 
 	/** Allows derived types to specify their visibility requirements
 	 * to the TimeAxisViewItem parent class
 	 */
 	RegionView (ArdourCanvas::Container *,
-		    TimeAxisView&,
-		    boost::shared_ptr<ARDOUR::Region>,
-		    double samples_per_pixel,
-		    uint32_t basic_color,
-		    bool recording,
-		    TimeAxisViewItem::Visibility);
+	            TimeAxisView&,
+	            boost::shared_ptr<ARDOUR::Region>,
+	            double samples_per_pixel,
+	            uint32_t basic_color,
+	            bool recording,
+	            TimeAxisViewItem::Visibility);
 
 	bool canvas_group_event (GdkEvent*);
 
@@ -176,9 +176,9 @@ class RegionView : public TimeAxisViewItem
 	std::vector<GhostRegion*> ghosts;
 
 	/** a list of rectangles which are used in stacked display mode to colour
-	    different bits of regions according to whether or not they are the one
-	    that will be played at any given time.
-	*/
+	 * different bits of regions according to whether or not they are the one
+	 * that will be played at any given time.
+	 */
 	std::list<ArdourCanvas::Rectangle*> _coverage_frames;
 
 	/** a list of rectangles used to show silent segments
@@ -187,8 +187,7 @@ class RegionView : public TimeAxisViewItem
 	/** a list of rectangles used to show the current silence threshold
 	*/
 	std::list<ArdourCanvas::Rectangle*> _silent_threshold_frames;
-	/** a text item to display strip silence statistics
-	 */
+	/** a text item to display strip silence statistics */
 	ArdourCanvas::Text* _silence_text;
 };
 
diff --git a/gtk2_ardour/return_ui.h b/gtk2_ardour/return_ui.h
index 353985110d..f0e6b40138 100644
--- a/gtk2_ardour/return_ui.h
+++ b/gtk2_ardour/return_ui.h
@@ -33,7 +33,7 @@ class IOSelector;
 
 class ReturnUI : public Gtk::HBox
 {
-  public:
+public:
 	ReturnUI (Gtk::Window *,boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*);
 	~ReturnUI();
 
@@ -44,7 +44,7 @@ class ReturnUI : public Gtk::HBox
 
 	boost::shared_ptr<ARDOUR::Return>& retrn() { return _return; }
 
-  private:
+private:
 	boost::shared_ptr<ARDOUR::Return> _return;
 	GainMeter                         _gpm;
 	Gtk::VBox                         _vbox;
diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index d302226dd9..df0a9b3dfe 100644
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -40,11 +40,12 @@ namespace ARDOUR {
 class Editor;
 class RegionView;
 
-class RhythmFerret : public ArdourDialog {
-  public:
+class RhythmFerret : public ArdourDialog
+{
+public:
 	/* order of these enums must match the _analyse_mode_strings
-	   in rhythm_ferret.cc
-	*/
+	 * in rhythm_ferret.cc
+	 */
 	enum AnalysisMode {
 		PercussionOnset,
 		NoteOnset
@@ -61,10 +62,10 @@ class RhythmFerret : public ArdourDialog {
 	void set_session (ARDOUR::Session*);
 	void on_response (int);
 
-  protected:
+protected:
 	void on_hide ();
 
-  private:
+private:
 	Editor& editor;
 
 	Gtk::ComboBoxText operation_selector;
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index 2f04590c2b..fea6d02050 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -58,7 +58,7 @@ class IOSelector;
 
 class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	RouteParams_UI ();
 	~RouteParams_UI();
 
@@ -66,7 +66,7 @@ class RouteParams_UI : public ArdourWindow, public PBD::ScopedConnectionList
 	void session_going_away ();
 	PluginSelector* plugin_selector() { return _plugin_selector; }
 
-  private:
+private:
 	Gtk::VBox                list_vpacker;
 	Gtk::ScrolledWindow      route_select_scroller;
 
diff --git a/gtk2_ardour/route_processor_selection.h b/gtk2_ardour/route_processor_selection.h
index b0e7c36fbd..6c2b7c94ae 100644
--- a/gtk2_ardour/route_processor_selection.h
+++ b/gtk2_ardour/route_processor_selection.h
@@ -34,7 +34,7 @@ class AxisViewProvider;
 
 class RouteProcessorSelection : public ProcessorSelection
 {
-  public:
+public:
 	AxisViewSelection  axes;
 
 	RouteProcessorSelection (ARDOUR::SessionHandlePtr&, AxisViewProvider&);
@@ -53,7 +53,7 @@ class RouteProcessorSelection : public ProcessorSelection
 
 	void presentation_info_changed (PBD::PropertyChange const & what_changed);
 
-  private:
+private:
 	ARDOUR::SessionHandlePtr& shp;
 	AxisViewProvider& avp;
 	void removed (AxisView*);
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index a61703a18e..167ecf1307 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -62,14 +62,14 @@ class ControlSlaveUI;
 
 class RoutePinWindowProxy : public WM::ProxyBase
 {
-  public:
+public:
 	RoutePinWindowProxy (std::string const &, boost::shared_ptr<ARDOUR::Route>);
 	~RoutePinWindowProxy();
 
 	Gtk::Window* get (bool create = false);
 	ARDOUR::SessionHandlePtr* session_handle();
 
-  private:
+private:
 	boost::weak_ptr<ARDOUR::Route> _route;
 
 	void route_going_away ();
@@ -78,7 +78,7 @@ class RoutePinWindowProxy : public WM::ProxyBase
 
 class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandlePtr, public virtual PBD::ScopedConnectionList, public virtual sigc::trackable
 {
-  public:
+public:
 	RouteUI (ARDOUR::Session*);
 
 	virtual ~RouteUI();
@@ -268,7 +268,7 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
 	void comment_edited ();
 	bool ignore_comment_edit;
 
-   protected:
+protected:
 
 	ArdourWindow*  comment_window;
 	Gtk::TextView* comment_area;
@@ -299,18 +299,19 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
 
 	bool mark_hidden (bool yn);
 
-  private:
+private:
 	void parameter_changed (std::string const&);
 	void relabel_solo_button ();
 	void track_mode_changed ();
 
 	std::string route_state_id () const;
 
-  protected:
+protected:
 	struct SoloMuteRelease {
 		SoloMuteRelease (bool was_active)
 			: active (was_active)
-			, exclusive (false) {}
+			, exclusive (false)
+		{}
 
 		boost::shared_ptr<ARDOUR::RouteList> routes;
 		boost::shared_ptr<ARDOUR::RouteList> routes_on;
diff --git a/gtk2_ardour/ruler_dialog.h b/gtk2_ardour/ruler_dialog.h
index ed2e071d05..dd92433ca4 100644
--- a/gtk2_ardour/ruler_dialog.h
+++ b/gtk2_ardour/ruler_dialog.h
@@ -30,11 +30,11 @@ class Editor;
 
 class RulerDialog : public ArdourDialog
 {
-  public:
+public:
 	RulerDialog ();
 	~RulerDialog ();
 
-  private:
+private:
 	Gtk::CheckButton samples_button;
 	Gtk::CheckButton timecode_button;
 	Gtk::CheckButton minsec_button;
diff --git a/gtk2_ardour/search_path_option.h b/gtk2_ardour/search_path_option.h
index 8e2e4e5c23..6a7b018aff 100644
--- a/gtk2_ardour/search_path_option.h
+++ b/gtk2_ardour/search_path_option.h
@@ -31,10 +31,10 @@
 
 class SearchPathOption : public Option
 {
-  public:
+public:
 	SearchPathOption (const std::string& pathname, const std::string& label,
-			  const std::string& default_path,
-                          sigc::slot<std::string>, sigc::slot<bool, std::string>);
+			const std::string& default_path,
+			sigc::slot<std::string>, sigc::slot<bool, std::string>);
 	~SearchPathOption ();
 
 	void set_state_from_config ();
@@ -43,11 +43,12 @@ class SearchPathOption : public Option
 
 	Gtk::Widget& tip_widget() { return add_chooser; }
 
-  protected:
+protected:
 	sigc::slot<std::string> _get; ///< slot to get the configuration variable's value
 	sigc::slot<bool, std::string> _set;  ///< slot to set the configuration variable's value
 
-	struct PathEntry {
+	struct PathEntry
+	{
 		PathEntry (const std::string& path, bool removable=true);
 
 		Gtk::Entry entry;
diff --git a/gtk2_ardour/selectable.h b/gtk2_ardour/selectable.h
index 2ffac87929..05c213116d 100644
--- a/gtk2_ardour/selectable.h
+++ b/gtk2_ardour/selectable.h
@@ -24,7 +24,7 @@
 
 class Selectable : public virtual sigc::trackable
 {
-  public:
+public:
 	Selectable() {
 		_selected = false;
 	}
@@ -41,7 +41,7 @@ class Selectable : public virtual sigc::trackable
 		return _selected;
 	}
 
-  protected:
+protected:
 	bool _selected;
 };
 
diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h
index 66fddbd67b..7b0da04f82 100644
--- a/gtk2_ardour/selection.h
+++ b/gtk2_ardour/selection.h
@@ -65,7 +65,7 @@ namespace Evoral {
 
 class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	enum SelectionType {
 		Object = 0x1,
 		Range = 0x2
@@ -190,15 +190,15 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 
 	void replace (uint32_t time_index, framepos_t start, framepos_t end);
 
-/*
- * A note about items in an editing Selection:
- * At a high level, selections can include Tracks, Objects, or Time Ranges
- * Range and Object selections are mutually exclusive.
- * Selecting a Range will deselect all Objects, and vice versa.
- * This is done to avoid confusion over what will happen in an operation such as Delete
- * Tracks are somewhat orthogonal b/c editing operations don't apply to tracks.
- * The Track selection isn't affected when ranges or objects are added.
- */
+	/*
+	 * A note about items in an editing Selection:
+	 * At a high level, selections can include Tracks, Objects, or Time Ranges
+	 * Range and Object selections are mutually exclusive.
+	 * Selecting a Range will deselect all Objects, and vice versa.
+	 * This is done to avoid confusion over what will happen in an operation such as Delete
+	 * Tracks are somewhat orthogonal b/c editing operations don't apply to tracks.
+	 * The Track selection isn't affected when ranges or objects are added.
+	 */
 
 	void clear_all() { clear_time(); clear_tracks(); clear_objects(); }
 
@@ -227,7 +227,7 @@ class Selection : public sigc::trackable, public PBD::ScopedConnectionList
 
 	void core_selection_changed (PBD::PropertyChange const & pc);
 
-  private:
+private:
 	PublicEditor const * editor;
 	uint32_t next_time_id;
 	bool     manage_libardour_selection;
diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h
index 0443ffd648..d91906369b 100644
--- a/gtk2_ardour/session_dialog.h
+++ b/gtk2_ardour/session_dialog.h
@@ -45,10 +45,11 @@
 
 class EngineControl;
 
-class SessionDialog : public ArdourDialog {
-  public:
+class SessionDialog : public ArdourDialog
+{
+public:
 	SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path,
-		       const std::string& template_name, bool cancel_not_quit);
+	               const std::string& template_name, bool cancel_not_quit);
 	SessionDialog ();
 	~SessionDialog ();
 
@@ -81,7 +82,7 @@ class SessionDialog : public ArdourDialog {
 		_provided_session_path = session_path;
 	}
 
-  private:
+private:
 	bool new_only;
 	std::string _provided_session_name;
 	std::string _provided_session_path;
@@ -110,29 +111,31 @@ class SessionDialog : public ArdourDialog {
 
 	void setup_existing_session_page ();
 
-	struct RecentSessionsSorter {
-	    bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
-		    return ARDOUR::cmp_nocase(a.first, b.first) == -1;
-	    }
+	struct RecentSessionsSorter
+	{
+		bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
+			return ARDOUR::cmp_nocase(a.first, b.first) == -1;
+		}
 	};
 
 	struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    RecentSessionModelColumns() {
-		    add (visible_name);
-		    add (tip);
-		    add (fullpath);
-		    add (sample_rate);
-		    add (disk_format);
-		    add (time_modified);
-		    add (time_formatted);
-	    }
-	    Gtk::TreeModelColumn<std::string> visible_name;
-	    Gtk::TreeModelColumn<std::string> tip;
-	    Gtk::TreeModelColumn<std::string> fullpath;
-	    Gtk::TreeModelColumn<std::string> sample_rate;
-	    Gtk::TreeModelColumn<std::string> disk_format;
-	    Gtk::TreeModelColumn<int64_t>     time_modified;
-	    Gtk::TreeModelColumn<std::string> time_formatted;
+		RecentSessionModelColumns()
+		{
+			add (visible_name);
+			add (tip);
+			add (fullpath);
+			add (sample_rate);
+			add (disk_format);
+			add (time_modified);
+			add (time_formatted);
+		}
+		Gtk::TreeModelColumn<std::string> visible_name;
+		Gtk::TreeModelColumn<std::string> tip;
+		Gtk::TreeModelColumn<std::string> fullpath;
+		Gtk::TreeModelColumn<std::string> sample_rate;
+		Gtk::TreeModelColumn<std::string> disk_format;
+		Gtk::TreeModelColumn<int64_t>     time_modified;
+		Gtk::TreeModelColumn<std::string> time_formatted;
 	};
 
 	RecentSessionModelColumns    recent_session_columns;
diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index b31751115f..29ae53524b 100644
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -39,19 +39,19 @@ namespace ARDOUR {
 
 class SessionImportDialog : public ArdourDialog
 {
-  private:
+private:
 	typedef boost::shared_ptr<ARDOUR::ElementImportHandler> HandlerPtr;
 	typedef std::list<HandlerPtr> HandlerList;
 
 	typedef boost::shared_ptr<ARDOUR::ElementImporter> ElementPtr;
 	typedef std::list<ElementPtr> ElementList;
 
-  public:
+public:
 	SessionImportDialog (ARDOUR::Session* target);
 
 	virtual Gtk::FileChooserAction browse_action() const { return Gtk::FILE_CHOOSER_ACTION_OPEN; }
 
-  private:
+private:
 
 	void load_session (const std::string& filename);
 	void fill_list ();
@@ -77,12 +77,12 @@ class SessionImportDialog : public ArdourDialog
 	struct SessionBrowserColumns : public Gtk::TreeModel::ColumnRecord
 	{
 	public:
-	  Gtk::TreeModelColumn<std::string>    name;
-	  Gtk::TreeModelColumn<bool>           queued;
-	  Gtk::TreeModelColumn<ElementPtr>     element;
-	  Gtk::TreeModelColumn<std::string>    info;
+		Gtk::TreeModelColumn<std::string>    name;
+		Gtk::TreeModelColumn<bool>           queued;
+		Gtk::TreeModelColumn<ElementPtr>     element;
+		Gtk::TreeModelColumn<std::string>    info;
 
-	  SessionBrowserColumns() { add (name); add (queued); add (element); add (info); }
+		SessionBrowserColumns() { add (name); add (queued); add (element); add (info); }
 	};
 
 	SessionBrowserColumns         sb_cols;
diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index a1d1015b1a..e1d02337b4 100644
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/gtk2_ardour/session_metadata_dialog.h
@@ -38,8 +38,9 @@ class MetadataField;
 typedef boost::shared_ptr<MetadataField> MetadataPtr;
 
 /// Wraps a metadata field to be used in a GUI
-class MetadataField {
-  public:
+class MetadataField
+{
+public:
 	MetadataField (std::string const & field_name);
 	virtual ~MetadataField();
 	virtual MetadataPtr copy () = 0;
@@ -56,17 +57,18 @@ class MetadataField {
 	virtual Gtk::Widget & value_widget () = 0;
 	/// Get widget for editing value
 	virtual Gtk::Widget & edit_widget () = 0;
-  protected:
+protected:
 	std::string _name;
 	std::string _value;
 };
 
 /// MetadataField that contains text
-class TextMetadataField : public MetadataField {
-  private:
+class TextMetadataField : public MetadataField
+{
+private:
 	typedef std::string (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (std::string const &);
-  public:
+public:
 	TextMetadataField (Getter getter, Setter setter, std::string const & field_name, guint width = 50);
 	MetadataPtr copy ();
 
@@ -76,7 +78,7 @@ class TextMetadataField : public MetadataField {
 	Gtk::Widget & name_widget ();
 	Gtk::Widget & value_widget ();
 	Gtk::Widget & edit_widget ();
-  private:
+private:
 	void update_value ();
 
 	Getter getter;
@@ -90,11 +92,12 @@ class TextMetadataField : public MetadataField {
 };
 
 /// MetadataField that accepts only numbers
-class NumberMetadataField : public MetadataField {
-  private:
+class NumberMetadataField : public MetadataField
+{
+private:
 	typedef uint32_t (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (uint32_t);
-  public:
+public:
 	NumberMetadataField (Getter getter, Setter setter, std::string const & field_name, guint numbers, guint width = 50);
 	MetadataPtr copy ();
 
@@ -104,7 +107,7 @@ class NumberMetadataField : public MetadataField {
 	Gtk::Widget & name_widget ();
 	Gtk::Widget & value_widget ();
 	Gtk::Widget & edit_widget ();
-  private:
+private:
 	void update_value ();
 	std::string uint_to_str (uint32_t i) const;
 	uint32_t str_to_uint (std::string const & str) const;
@@ -121,11 +124,12 @@ class NumberMetadataField : public MetadataField {
 };
 
 /// MetadataField that accepts EAN-13 data only
-class EAN13MetadataField : public MetadataField {
-  private:
+class EAN13MetadataField : public MetadataField
+{
+private:
 	typedef std::string (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (std::string const &);
-  public:
+public:
 	EAN13MetadataField (Getter getter, Setter setter, std::string const & field_name, guint width = 13);
 	MetadataPtr copy ();
 
@@ -138,7 +142,7 @@ class EAN13MetadataField : public MetadataField {
 
 	Gtk::Label* status_label;
 	void update_status ();
-  private:
+private:
 	void update_value ();
 	std::string numeric_string (std::string const & str) const;
 
@@ -153,8 +157,9 @@ class EAN13MetadataField : public MetadataField {
 };
 
 /// Interface for MetadataFields
-class SessionMetadataSet : public ARDOUR::SessionHandlePtr {
-  public:
+class SessionMetadataSet : public ARDOUR::SessionHandlePtr
+{
+public:
 	SessionMetadataSet (std::string const & name);
 	virtual ~SessionMetadataSet () {};
 
@@ -168,15 +173,16 @@ class SessionMetadataSet : public ARDOUR::SessionHandlePtr {
 	virtual Gtk::Widget & get_widget () = 0;
 	virtual Gtk::Widget & get_tab_widget () = 0;
 
-  protected:
+protected:
 	typedef std::list<MetadataPtr> DataList;
 	DataList list;
 	std::string name;
 };
 
 /// Contains MetadataFields for editing
-class SessionMetadataSetEditable : public SessionMetadataSet {
-  public:
+class SessionMetadataSetEditable : public SessionMetadataSet
+{
+public:
 	SessionMetadataSetEditable (std::string const & name);
 
 	Gtk::Widget & get_widget () { return vbox; }
@@ -187,15 +193,16 @@ class SessionMetadataSetEditable : public SessionMetadataSet {
 	/// Saves from MetadataFields into data
 	void save_data ();
 
-  private:
+private:
 	Gtk::VBox vbox;
 	Gtk::Table table;
 	Gtk::Label tab_widget;
 };
 
 /// Contains MetadataFields for importing
-class SessionMetadataSetImportable : public SessionMetadataSet {
-  public:
+class SessionMetadataSetImportable : public SessionMetadataSet
+{
+public:
 	SessionMetadataSetImportable (std::string const & name);
 
 	Gtk::Widget & get_widget () { return tree_view; }
@@ -207,13 +214,13 @@ class SessionMetadataSetImportable : public SessionMetadataSet {
 	/// Saves from importable data (see load_data) to session_data
 	void save_data ();
 
-  private:
+private:
 	DataList & session_list; // References MetadataSet::list
 	DataList import_list;
 
 	struct Columns : public Gtk::TreeModel::ColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<std::string>     field;
 		Gtk::TreeModelColumn<std::string>     values;
 		Gtk::TreeModelColumn<bool>        import;
@@ -241,10 +248,10 @@ class SessionMetadataSetImportable : public SessionMetadataSet {
 template <typename DataSet>
 class SessionMetadataDialog : public ArdourDialog
 {
-  public:
+public:
 	SessionMetadataDialog (std::string const & name);
 
-  protected:
+protected:
 	void init_data ( bool skip_user = false );
 	void load_extra_data (ARDOUR::SessionMetadata const & data);
 	void save_data ();
@@ -267,7 +274,7 @@ class SessionMetadataDialog : public ArdourDialog
 
 	Gtk::Notebook     notebook;
 
-  private:
+private:
 	void init_user_data ();
 	void init_track_data ();
 	void init_album_data ();
@@ -282,12 +289,13 @@ class SessionMetadataDialog : public ArdourDialog
 	Gtk::Button *     cancel_button;
 };
 
-class SessionMetadataEditor : public SessionMetadataDialog<SessionMetadataSetEditable> {
-  public:
+class SessionMetadataEditor : public SessionMetadataDialog<SessionMetadataSetEditable>
+{
+public:
 	SessionMetadataEditor ();
 	~SessionMetadataEditor ();
 	void run ();
-  private:
+private:
 	void init_gui ();
 };
 
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index d7eb80ecca..6fa69f21a2 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -61,7 +61,7 @@ class Mootcher;
 
 class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList
 {
-  public:
+public:
 	SoundFileBox (bool persistent);
 	virtual ~SoundFileBox () {};
 
@@ -74,7 +74,7 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public P
 	void set_src_quality(ARDOUR::SrcQuality q) { _src_quality = q; }
 	void set_import_position(Editing::ImportPosition p) { _import_position = p; }
 
-  protected:
+protected:
 	std::string path;
 
 	ARDOUR::SoundFileInfo sf_info;
@@ -131,10 +131,10 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr, public P
 
 class SoundFileBrowser : public ArdourWindow
 {
-  private:
+private:
 	class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<std::string> pathname;
 
 		FoundTagColumns() { add(pathname); }
@@ -142,7 +142,7 @@ class SoundFileBrowser : public ArdourWindow
 
 	class FreesoundColumns : public Gtk::TreeModel::ColumnRecord
 	{
-	  public:
+	public:
 		Gtk::TreeModelColumn<std::string> id;
 		Gtk::TreeModelColumn<std::string> uri;
 		Gtk::TreeModelColumn<std::string> filename;
@@ -174,7 +174,8 @@ class SoundFileBrowser : public ArdourWindow
 	Gtk::Button freesound_similar_btn;
 
 	void handle_freesound_results(std::string theString);
-  public:
+
+public:
 	SoundFileBrowser (std::string title, ARDOUR::Session* _s, bool persistent);
 	virtual ~SoundFileBrowser ();
 
@@ -204,7 +205,7 @@ class SoundFileBrowser : public ArdourWindow
 	void freesound_search();
 	void refresh_display(std::string ID, std::string file);
 
-  protected:
+protected:
 	bool resetting_ourselves;
 	int matches;
 	int _status;
@@ -263,24 +264,25 @@ class SoundFileBrowser : public ArdourWindow
 
 class SoundFileChooser : public SoundFileBrowser
 {
-  public:
+public:
 	SoundFileChooser (std::string title, ARDOUR::Session* _s = 0);
 	virtual ~SoundFileChooser () {};
 
 	std::string get_filename ();
 
-  protected:
+protected:
 	void on_hide();
 };
 
 class SoundFileOmega : public SoundFileBrowser
 {
-
-  public:
-	SoundFileOmega (std::string title, ARDOUR::Session* _s,
-			uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
-			bool persistent,
-			Editing::ImportMode mode_hint = Editing::ImportAsTrack);
+public:
+	SoundFileOmega (std::string title,
+	                ARDOUR::Session* _s,
+	                uint32_t selected_audio_tracks,
+	                uint32_t selected_midi_tracks,
+	                bool persistent,
+	                Editing::ImportMode mode_hint = Editing::ImportAsTrack);
 
 	void reset (uint32_t selected_audio_tracks, uint32_t selected_midi_tracks);
 
@@ -302,10 +304,10 @@ class SoundFileOmega : public SoundFileBrowser
 	Editing::ImportDisposition get_channel_disposition() const;
 	ARDOUR::SrcQuality get_src_quality() const;
 
-  protected:
+protected:
 	void on_hide();
 
-  private:
+private:
 	uint32_t selected_audio_track_cnt;
 	uint32_t selected_midi_track_cnt;
 
@@ -318,7 +320,7 @@ class SoundFileOmega : public SoundFileBrowser
 	Gtk::VBox block_four;
 
 	bool check_info (const std::vector<std::string>& paths,
-			 bool& same_size, bool& src_needed, bool& multichannel);
+	                 bool& same_size, bool& src_needed, bool& multichannel);
 
 	static bool check_link_status (const ARDOUR::Session*, const std::vector<std::string>& paths);
 
diff --git a/gtk2_ardour/soundcloud_export_selector.h b/gtk2_ardour/soundcloud_export_selector.h
index 62623f6168..1c095c9b50 100644
--- a/gtk2_ardour/soundcloud_export_selector.h
+++ b/gtk2_ardour/soundcloud_export_selector.h
@@ -17,7 +17,7 @@
 
 class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
-  public:
+public:
 	SoundcloudExportSelector ();
 	int do_progress_callback (double ultotal, double ulnow, const std::string &filename);
 	std::string username () { return soundcloud_username_entry.get_text (); }
@@ -27,7 +27,7 @@ class SoundcloudExportSelector : public Gtk::VBox, public ARDOUR::SessionHandleP
 	bool downloadable () { return soundcloud_download_checkbox.get_active (); }
 	void cancel () { soundcloud_cancel = true; }
 
-  private:
+private:
 	Gtk::Table  sc_table;
 	Gtk::Label soundcloud_username_label;
 	Gtk::Entry soundcloud_username_entry;
diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 48c4cc93b0..5960e5ed33 100644
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -44,8 +44,9 @@
 
 class EngineControl;
 
-class ArdourStartup : public Gtk::Assistant {
-  public:
+class ArdourStartup : public Gtk::Assistant
+{
+public:
 	ArdourStartup ();
 	~ArdourStartup ();
 
@@ -55,7 +56,7 @@ class ArdourStartup : public Gtk::Assistant {
 		return  _response;
 	}
 
-  private:
+private:
 	gint _response;
 	bool config_modified;
 	bool new_user;
diff --git a/gtk2_ardour/stereo_panner.h b/gtk2_ardour/stereo_panner.h
index 282d85d12f..aea2ca19ed 100644
--- a/gtk2_ardour/stereo_panner.h
+++ b/gtk2_ardour/stereo_panner.h
@@ -38,7 +38,7 @@ namespace ARDOUR {
 
 class StereoPanner : public PannerInterface
 {
-  public:
+public:
 	StereoPanner (boost::shared_ptr<ARDOUR::PannerShell>);
 	~StereoPanner ();
 
@@ -50,7 +50,7 @@ class StereoPanner : public PannerInterface
 	sigc::signal<void> StartWidthGesture;
 	sigc::signal<void> StopWidthGesture;
 
-  protected:
+protected:
 	bool on_expose_event (GdkEventExpose*);
 	bool on_button_press_event (GdkEventButton*);
 	bool on_button_release_event (GdkEventButton*);
@@ -58,7 +58,7 @@ class StereoPanner : public PannerInterface
 	bool on_scroll_event (GdkEventScroll*);
 	bool on_key_press_event (GdkEventKey*);
 
-  private:
+private:
 	PannerEditor* editor ();
 	boost::shared_ptr<ARDOUR::PannerShell> _panner_shell;
 
diff --git a/gtk2_ardour/stripable_treemodel.h b/gtk2_ardour/stripable_treemodel.h
index a91ddc026d..8f1d941158 100644
--- a/gtk2_ardour/stripable_treemodel.h
+++ b/gtk2_ardour/stripable_treemodel.h
@@ -37,15 +37,15 @@ class StripableSorter;
 
 class StripableTreeModel : public Gtk::TreeModel, public Glib::Object
 {
-  protected:
+protected:
 	StripableTreeModel (AxisViewProvider&);
 	virtual ~StripableTreeModel();
 
-  public:
+public:
 	static Glib::RefPtr<StripableTreeModel> create (AxisViewProvider&);
 	void set_session (ARDOUR::Session&);
 
-  protected:
+protected:
 	Gtk::TreeModelFlags get_flags_vfunc() const;
 	int   get_n_columns_vfunc() const;
 	GType get_column_type_vfunc(int index) const;
@@ -62,15 +62,15 @@ class StripableTreeModel : public Gtk::TreeModel, public Glib::Object
 	bool  get_iter_vfunc(const Path& path, iterator& iter) const;
 	bool  iter_is_valid(const iterator& iter) const;
 
-  public:
+public:
 	typedef Gtk::TreeModelColumn<std::string> StringColumn;
 	typedef Gtk::TreeModelColumn<bool>        BoolColumn;
 	typedef Gtk::TreeModelColumn<uint32_t>    UnsignedColumn;
 	typedef Gtk::TreeModelColumn<AxisView*> AVColumn;
 	typedef Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Stripable> > StripableColumn;
 
-	struct Columns : public Gtk::TreeModel::ColumnRecord {
-
+	struct Columns : public Gtk::TreeModel::ColumnRecord
+	{
 		Columns () {
 			add (text);
 			add (visible);
@@ -111,7 +111,7 @@ class StripableTreeModel : public Gtk::TreeModel, public Glib::Object
 
 	Columns columns;
 
-  private:
+private:
 	ARDOUR::Session* _session;
 	AxisViewProvider& axis_view_provider;
 
@@ -119,7 +119,8 @@ class StripableTreeModel : public Gtk::TreeModel, public Glib::Object
 
 	void text_value (boost::shared_ptr<ARDOUR::Stripable> stripable, Glib::ValueBase& value) const;
 
-	struct Glue {
+	struct Glue
+	{
 		Glue (boost::shared_ptr<ARDOUR::Stripable>);
 
 		boost::weak_ptr<ARDOUR::Stripable> stripable;
diff --git a/gtk2_ardour/tape_region_view.h b/gtk2_ardour/tape_region_view.h
index 6361683362..26add7574c 100644
--- a/gtk2_ardour/tape_region_view.h
+++ b/gtk2_ardour/tape_region_view.h
@@ -26,15 +26,15 @@
 
 class TapeAudioRegionView : public AudioRegionView
 {
-  public:
+public:
 	TapeAudioRegionView (ArdourCanvas::Container *,
-			     RouteTimeAxisView&,
-			     boost::shared_ptr<ARDOUR::AudioRegion>,
-			     double initial_samples_per_pixel,
-			     uint32_t base_color);
+	                     RouteTimeAxisView&,
+	                     boost::shared_ptr<ARDOUR::AudioRegion>,
+	                     double initial_samples_per_pixel,
+	                     uint32_t base_color);
 	~TapeAudioRegionView ();
 
-  protected:
+protected:
 	void init (bool wait_for_waves);
 
 	void update (uint32_t n);
diff --git a/gtk2_ardour/tempo_curve.h b/gtk2_ardour/tempo_curve.h
index 73cce4b168..621048726b 100644
--- a/gtk2_ardour/tempo_curve.h
+++ b/gtk2_ardour/tempo_curve.h
@@ -20,7 +20,7 @@ class PublicEditor;
 
 class TempoCurve : public sigc::trackable
 {
-  public:
+public:
 	TempoCurve (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, ARDOUR::TempoSection& temp, framepos_t frame, bool handle_events);
 	~TempoCurve ();
 
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 7e665663da..49cd615d6a 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -46,7 +46,7 @@ using ARDOUR::framecnt_t;
 
 class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 {
-   public:
+public:
 	virtual ~TimeAxisViewItem();
 
 	virtual bool set_position(framepos_t, void*, double* delta = 0);
@@ -106,8 +106,8 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	static const double GRAB_HANDLE_WIDTH;
 
 	/* these are not constant, but vary with the pixel size
-	   of the font used to display the item name.
-	*/
+	 * of the font used to display the item name.
+	 */
 	static int    NAME_HEIGHT;
 	static double NAME_Y_OFFSET;
 	static double NAME_HIGHLIGHT_SIZE;
@@ -152,9 +152,9 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 		FullWidthNameHighlight = 0x80
 	};
 
-  protected:
+protected:
 	TimeAxisViewItem (const std::string &, ArdourCanvas::Item&, TimeAxisView&, double, uint32_t fill_color,
-			  framepos_t, framecnt_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
+	                  framepos_t, framecnt_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
 
 	TimeAxisViewItem (const TimeAxisViewItem&);
 
diff --git a/gtk2_ardour/time_fx_dialog.h b/gtk2_ardour/time_fx_dialog.h
index 1825414c32..30ff116f26 100644
--- a/gtk2_ardour/time_fx_dialog.h
+++ b/gtk2_ardour/time_fx_dialog.h
@@ -38,7 +38,7 @@ class AudioClock;
 
 class TimeFXDialog : public ArdourDialog, public ProgressReporter
 {
-  public:
+public:
 	/* We need a position so that BBT mode in the clock can function */
 	TimeFXDialog (Editor& e, bool for_pitch, ARDOUR::framecnt_t old_length, ARDOUR::framecnt_t new_length, ARDOUR::framepos_t position);
 
@@ -78,7 +78,7 @@ class TimeFXDialog : public ArdourDialog, public ProgressReporter
 		Gtk::Dialog::on_response (response_id);
 	}
 
-  private:
+private:
 	ARDOUR::framecnt_t      original_length;
 	Gtk::Adjustment pitch_octave_adjustment;
 	Gtk::Adjustment pitch_semitone_adjustment;
diff --git a/gtk2_ardour/transcode_video_dialog.h b/gtk2_ardour/transcode_video_dialog.h
index db3aba9739..c20ad40362 100644
--- a/gtk2_ardour/transcode_video_dialog.h
+++ b/gtk2_ardour/transcode_video_dialog.h
@@ -41,7 +41,7 @@ enum VtlTranscodeOption {
  */
 class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 {
-  public:
+public:
 	TranscodeVideoDialog (ARDOUR::Session*, std::string);
 	~TranscodeVideoDialog ();
 
@@ -54,7 +54,7 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL
 		Gtk::Dialog::on_response (response_id);
 	}
 
-  private:
+private:
 	void on_show ();
 	void open_browse_dialog ();
 	void abort_clicked ();
@@ -66,7 +66,7 @@ class TranscodeVideoDialog : public ArdourDialog , public PBD::ScopedConnectionL
 	void update_bitrate ();
 	void launch_audioonly ();
 	void launch_transcode ();
-  void launch_extract ();
+	void launch_extract ();
 	void dialog_progress_mode ();
 	bool aborted;
 	bool pending_audio_extract;
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 09d4f15e47..d5801f5545 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -44,7 +44,7 @@ private:
 	UIConfiguration();
 	~UIConfiguration();
 
-    public:
+public:
 	static UIConfiguration& instance();
 
 	static std::string color_file_suffix;
@@ -106,8 +106,7 @@ private:
 	 */
 	int pre_gui_init ();
 
-	/** called after the GUI toolkit has been initialized.
-	 */
+	/** called after the GUI toolkit has been initialized. */
 	UIConfiguration* post_gui_init ();
 
 #undef UI_CONFIG_VARIABLE
@@ -122,7 +121,7 @@ private:
 #include "canvas_vars.h"
 #undef CANVAS_FONT_VARIABLE
 
-  private:
+private:
 	/* declare variables */
 
 #undef  UI_CONFIG_VARIABLE
diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h
index 0694b15e23..232962d2cd 100644
--- a/gtk2_ardour/vca_master_strip.h
+++ b/gtk2_ardour/vca_master_strip.h
@@ -40,7 +40,7 @@ class FloatingTextEntry;
 
 class VCAMasterStrip : public AxisView, public Gtk::EventBox
 {
-      public:
+public:
 	VCAMasterStrip (ARDOUR::Session*, boost::shared_ptr<ARDOUR::VCA>);
 	~VCAMasterStrip ();
 
@@ -57,7 +57,7 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
 	bool marked_for_display () const;
 	bool set_marked_for_display (bool);
 
-     private:
+private:
 	boost::shared_ptr<ARDOUR::VCA> _vca;
 	GainMeter    gain_meter;
 
diff --git a/gtk2_ardour/vca_time_axis.h b/gtk2_ardour/vca_time_axis.h
index 128c3c478a..f2d2e31ccb 100644
--- a/gtk2_ardour/vca_time_axis.h
+++ b/gtk2_ardour/vca_time_axis.h
@@ -35,7 +35,7 @@ namespace ARDOUR {
 
 class VCATimeAxisView : public StripableTimeAxisView
 {
-  public:
+public:
 	VCATimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
 	virtual ~VCATimeAxisView ();
 
@@ -55,7 +55,7 @@ class VCATimeAxisView : public StripableTimeAxisView
 	bool marked_for_display () const;
 	bool set_marked_for_display (bool);
 
- protected:
+protected:
 	boost::shared_ptr<ARDOUR::VCA> _vca;
 	ArdourButton  solo_button;
 	ArdourButton  mute_button;
diff --git a/gtk2_ardour/video_server_dialog.h b/gtk2_ardour/video_server_dialog.h
index 12635d9dca..d9a73ef340 100644
--- a/gtk2_ardour/video_server_dialog.h
+++ b/gtk2_ardour/video_server_dialog.h
@@ -33,7 +33,7 @@
  */
 class VideoServerDialog : public ArdourDialog
 {
-  public:
+public:
 	VideoServerDialog (ARDOUR::Session*);
 	~VideoServerDialog ();
 
@@ -44,7 +44,7 @@ class VideoServerDialog : public ArdourDialog
 	int get_cachesize () { return cachesize_spinner.get_value_as_int();}
 	bool show_again () { return showagain_checkbox.get_active();}
 
-  private:
+private:
 	void on_show ();
 	void open_path_dialog ();
 	void open_docroot_dialog ();