Compile cleanly with clang.

To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC
environment variables, e.g.:

CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build


git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf

19 files changed, 54 insertions, 53 deletions

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 233b53475b..5e41c382bb 100644
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -35,7 +35,7 @@
 
 namespace ARDOUR {
 	class AudioRegion;
-	class PeakData;
+	struct PeakData;
 };
 
 class AudioTimeAxisView;
diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h
index cb3175798e..5ef83b7adc 100644
--- a/gtk2_ardour/audio_streamview.h
+++ b/gtk2_ardour/audio_streamview.h
@@ -35,10 +35,10 @@ namespace Gdk {
 }
 
 namespace ARDOUR {
-	class Route;
-	class PeakData;
 	class AudioRegion;
+	class Route;
 	class Source;
+	struct PeakData;
 }
 
 class PublicEditor;
diff --git a/gtk2_ardour/automation_selection.h b/gtk2_ardour/automation_selection.h
index f22d4831e2..6f30c588e2 100644
--- a/gtk2_ardour/automation_selection.h
+++ b/gtk2_ardour/automation_selection.h
@@ -26,6 +26,6 @@ namespace ARDOUR {
 	class AutomationList;
 }
 
-struct AutomationSelection : std::list<boost::shared_ptr<ARDOUR::AutomationList> > {};
+class AutomationSelection : public std::list<boost::shared_ptr<ARDOUR::AutomationList> > {};
 
 #endif /* __ardour_gtk_automation_selection_h__ */
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 2c891524b8..17f8c09a7b 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -63,7 +63,7 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
 	std::string gui_property (const std::string& property_name) const;
 	
 	template<typename T> void set_gui_property (const std::string& property_name, const T& value) {
-		gui_object_state().set<T> (state_id(), property_name, value);
+		gui_object_state().set_property<T> (state_id(), property_name, value);
 	}
 
 	bool marked_for_display () const;
diff --git a/gtk2_ardour/editor_cursors.h b/gtk2_ardour/editor_cursors.h
index b5c228a54a..2e2c654bd1 100644
--- a/gtk2_ardour/editor_cursors.h
+++ b/gtk2_ardour/editor_cursors.h
@@ -21,12 +21,13 @@
 
 class Editor;
 
-struct EditorCursor {
-	Editor&               editor;
-	ArdourCanvas::Points  points;
-	ArdourCanvas::Line    canvas_item;
+class EditorCursor {
+public:
+	Editor&              editor;
+	ArdourCanvas::Points points;
+	ArdourCanvas::Line   canvas_item;
 	framepos_t           current_frame;
-	double		  length;
+	double               length;
 
 	EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
 	~EditorCursor ();
@@ -35,5 +36,5 @@ struct EditorCursor {
 	void set_length (double units);
 	void set_y_axis (double position);
 
-        PBD::Signal1<void, framepos_t> PositionChanged;
+	PBD::Signal1<void, framepos_t> PositionChanged;
 };
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index 2f81e06efc..1579a178a8 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -242,8 +242,9 @@ private:
 class RegionDrag;
 
 /** Container for details about a region being dragged */
-struct DraggingView
+class DraggingView
 {
+public:
 	DraggingView (RegionView *, RegionDrag *);
 
 	RegionView* view; ///< the view
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 5a06c69648..ab4f7afe3c 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -303,7 +303,6 @@ EditorRegions::add_region (boost::shared_ptr<Region> region)
 
 		TreeModel::iterator iter = _model->get_iter ("0");
 		TreeModel::Row parent;
-		TreeModel::Row child;
 
 		if (!iter) {
 			parent = *(_model->append());
@@ -550,7 +549,7 @@ EditorRegions::selection_changed ()
 
 		for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-			if (iter = _model->get_iter (*i)) {
+			if ((iter = _model->get_iter (*i))) {
 				boost::shared_ptr<Region> region = (*iter)[_columns.region];
 
 				// they could have clicked on a row that is just a placeholder, like "Hidden"
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index 814e0388be..e0f6d51216 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -393,7 +393,7 @@ ExportFormatDialog::init_format_table ()
 
 		boost::shared_ptr<HasSampleFormat> hsf;
 
-		if (hsf = boost::dynamic_pointer_cast<HasSampleFormat> (*it)) {
+		if ((hsf = boost::dynamic_pointer_cast<HasSampleFormat> (*it))) {
 			hsf->SampleFormatSelectChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_selection, this, _1, _2), gui_context());
 			hsf->SampleFormatCompatibleChanged.connect (*this, invalidator (*this), boost::bind (&ExportFormatDialog::change_sample_format_compatibility, this, _1, _2), gui_context());
 
@@ -832,13 +832,13 @@ ExportFormatDialog::change_encoding_options (ExportFormatPtr ptr)
 	boost::shared_ptr<ARDOUR::ExportFormatFLAC> flac_ptr;
 	boost::shared_ptr<ARDOUR::ExportFormatBWF> bwf_ptr;
 
-	if (linear_ptr = boost::dynamic_pointer_cast<ExportFormatLinear> (ptr)) {
+	if ((linear_ptr = boost::dynamic_pointer_cast<ExportFormatLinear> (ptr))) {
 		show_linear_enconding_options (linear_ptr);
-	} else if (ogg_ptr = boost::dynamic_pointer_cast<ExportFormatOggVorbis> (ptr)) {
+	} else if ((ogg_ptr = boost::dynamic_pointer_cast<ExportFormatOggVorbis> (ptr))) {
 		show_ogg_enconding_options (ogg_ptr);
-	} else if (flac_ptr = boost::dynamic_pointer_cast<ExportFormatFLAC> (ptr)) {
+	} else if ((flac_ptr = boost::dynamic_pointer_cast<ExportFormatFLAC> (ptr))) {
 		show_flac_enconding_options (flac_ptr);
-	} else if (bwf_ptr = boost::dynamic_pointer_cast<ExportFormatBWF> (ptr)) {
+	} else if ((bwf_ptr = boost::dynamic_pointer_cast<ExportFormatBWF> (ptr))) {
 		show_bwf_enconding_options (bwf_ptr);
 	} else {
 		std::cout << "Unrecognized format!" << std::endl;
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 5dbeeffd09..9ce3b15046 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -545,7 +545,7 @@ GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color)
 
 	char buf[64];
 	snprintf (buf, sizeof (buf), "%d:%d:%d", color.get_red(), color.get_green(), color.get_blue());
-	gui_state.set (group_gui_id (group), "color", buf);
+	gui_state.set_property (group_gui_id (group), "color", buf);
 	
 	/* the group color change notification */
 	
diff --git a/gtk2_ardour/gui_object.h b/gtk2_ardour/gui_object.h
index dd56f4b34c..469d311485 100644
--- a/gtk2_ardour/gui_object.h
+++ b/gtk2_ardour/gui_object.h
@@ -43,7 +43,7 @@ public:
 
 	std::string get_string (const std::string& id, const std::string& prop_name, bool* empty = 0);
 
-	template<typename T> void set (const std::string& id, const std::string& prop_name, const T& val) {
+	template<typename T> void set_property (const std::string& id, const std::string& prop_name, const T& val) {
 		XMLNode* child = get_or_add_node (id);
 		std::stringstream s;
 		s << val;
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index 66a8e8b6df..20fc0ed433 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -282,7 +282,7 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
 
 				previous_selection.push_back (*i);
 
-				if (iter = model->get_iter (*i)) {
+				if ((iter = model->get_iter (*i))) {
 					
 					note = (*iter)[columns._note];		
 					
@@ -445,7 +445,6 @@ MidiListEditor::key_release (GdkEventKey* ev)
 	TreeModel::Path path;
 	TreeViewColumn* col;
 	TreeModel::iterator iter;
-	TreeModel::Row row;
 	MidiModel::NoteDiffCommand* cmd;
 	boost::shared_ptr<MidiModel> m (region->midi_source(0)->model());
 	boost::shared_ptr<NoteType> note;
@@ -702,7 +701,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
 		TreeView::Selection::ListHandle_Path rows = view.get_selection()->get_selected_rows ();
 		
 		for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
-			if (iter = model->get_iter (*i)) {
+			if ((iter = model->get_iter (*i))) {
 
 				note = (*iter)[columns._note];		
 				
@@ -809,7 +808,7 @@ MidiListEditor::selection_changed ()
 	NotePlayer* player = new NotePlayer (track);
 
 	for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
-		if (iter = model->get_iter (*i)) {
+		if ((iter = model->get_iter (*i))) {
 			note = (*iter)[columns._note];		
 			player->add (note);
 		}
diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h
index aceb59e69f..d216752eda 100644
--- a/gtk2_ardour/midi_streamview.h
+++ b/gtk2_ardour/midi_streamview.h
@@ -34,12 +34,12 @@ namespace Gdk {
 }
 
 namespace ARDOUR {
-	class Route;
 	class Crossfade;
-	class PeakData;
+	class MidiModel;
 	class MidiRegion;
+	class Route;
 	class Source;
-	class MidiModel;
+	struct PeakData;
 }
 
 class PublicEditor;
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 16ac8780b8..542ab7b21f 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1171,7 +1171,7 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 	}
 
 	if (each_io_has_one_connection) {
-		if ((total_connection_count == ardour_connection_count)) {
+		if (total_connection_count == ardour_connection_count) {
 			// all connections are to the same track in ardour
 			// "ardour:Master/" -> "Master"
 			string::size_type slash = ardour_track_name.find("/");
diff --git a/gtk2_ardour/point_selection.h b/gtk2_ardour/point_selection.h
index 5ed5ae1573..608a499229 100644
--- a/gtk2_ardour/point_selection.h
+++ b/gtk2_ardour/point_selection.h
@@ -24,7 +24,7 @@
 
 class ControlPoint;
 
-struct PointSelection : public std::list<ControlPoint *>
+class PointSelection : public std::list<ControlPoint *>
 {
 };
 
diff --git a/gtk2_ardour/port_matrix_types.h b/gtk2_ardour/port_matrix_types.h
index 15c40713b0..dafbc858b6 100644
--- a/gtk2_ardour/port_matrix_types.h
+++ b/gtk2_ardour/port_matrix_types.h
@@ -22,8 +22,9 @@
 
 #include "ardour/bundle.h"
 
-struct PortMatrixNode
+class PortMatrixNode
 {
+public:
 	PortMatrixNode () {}
 	PortMatrixNode (ARDOUR::BundleChannel r, ARDOUR::BundleChannel c) : row (r), column (c) {}
 
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index ce625e1889..57e3c8dede 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -62,31 +62,31 @@ namespace Gtkmm2ext {
         class TearOff;
 }
 
-class Editor;
-class TimeAxisViewItem;
-class TimeAxisView;
-class PluginUIWindow;
-class PluginSelector;
-class PlaylistSelector;
-class XMLNode;
-class Selection;
+class AudioRegionView;
 class AutomationLine;
+class AutomationTimeAxisView;
 class ControlPoint;
-class SelectionRect;
-class RouteTimeAxisView;
-class RegionView;
-class AudioRegionView;
-class TempoMarker;
-class MeterMarker;
+class DragManager;
+class Editor;
+class ImageFrameTimeAxis;
+class ImageFrameView;
 class Marker;
-class AutomationTimeAxisView;
 class MarkerTimeAxis;
-class ImageFrameView;
-class ImageFrameTimeAxis;
 class MarkerView;
-class DragManager;
+class MeterMarker;
 class MouseCursors;
+class PlaylistSelector;
+class PluginSelector;
+class PluginUIWindow;
+class RegionView;
+class RouteTimeAxisView;
+class Selection;
+class TempoMarker;
+class TimeAxisView;
+class TimeAxisViewItem;
 class VerboseCursor;
+class XMLNode;
+struct SelectionRect;
 
 using ARDOUR::framepos_t;
 using ARDOUR::framecnt_t;
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index bd8d390962..6fdd10d9cc 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1347,7 +1347,7 @@ RouteUI::set_color (const Gdk::Color & c)
 	   the time axis view and the mixer strip
 	*/
 	
-	gui_object_state().set<string> (route_state_id(), X_("color"), buf);
+	gui_object_state().set_property<string> (route_state_id(), X_("color"), buf);
 	_route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
 }
 
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index f49bc87259..0d15a5d7d7 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -34,12 +34,12 @@ namespace Gdk {
 }
 
 namespace ARDOUR {
-	class Route;
 	class Crossfade;
-	class PeakData;
 	class Region;
+	class Route;
 	class Source;
 	class Track;
+	struct PeakData;
 }
 
 struct RecBoxInfo {
diff --git a/gtk2_ardour/volume_controller.cc b/gtk2_ardour/volume_controller.cc
index c72a31036a..27fd705978 100644
--- a/gtk2_ardour/volume_controller.cc
+++ b/gtk2_ardour/volume_controller.cc
@@ -101,7 +101,7 @@ VolumeController::dB_printer (char buf[32], const boost::shared_ptr<PBD::Control
 			}
 		}
 	} else {
-		snprintf (buf, sizeof (buf), "--");
+		snprintf (buf, 32, "--");
 	}
 }