5 files changed, 14 insertions, 15 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h
index d1dd92dd3d..9fbc188562 100644
--- a/libs/ardour/ardour/audio_unit.h
+++ b/libs/ardour/ardour/audio_unit.h
@@ -65,7 +65,7 @@ class AUPlugin : public ARDOUR::Plugin
 	AUPlugin (const AUPlugin& other);
 	virtual ~AUPlugin ();
 
-        std::string unique_id () const;
+	std::string unique_id () const;
 	const char * label () const;
 	const char * name () const { return _info->name.c_str(); }
 	const char * maker () const { return _info->creator.c_str(); }
@@ -81,10 +81,10 @@ class AUPlugin : public ARDOUR::Plugin
 	void deactivate ();
 	void set_block_size (nframes_t nframes);
 
-	int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset);
+	int connect_and_run (std::vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset);
 	std::set<uint32_t> automatable() const;
-	string describe_parameter (uint32_t);
-	string state_node_name () const { return "audiounit"; }
+	std::string describe_parameter (uint32_t);
+	std::string state_node_name () const { return "audiounit"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;
 
 	bool parameter_is_audio (uint32_t) const;
@@ -95,16 +95,16 @@ class AUPlugin : public ARDOUR::Plugin
 	XMLNode& get_state();
 	int set_state(const XMLNode& node);
 
-	bool save_preset (string name);
-	bool load_preset (const string preset_label);
+	bool save_preset (std::string name);
+	bool load_preset (const std::string preset_label);
 	std::vector<std::string> get_presets ();
 	std::string current_preset() const;
 
 	bool has_editor () const;
 
 	int32_t can_do (int32_t in, int32_t& out);
-	uint32_t output_streams() const;
-	uint32_t input_streams() const;
+	ChanCount output_streams() const;
+	ChanCount input_streams() const;
 	int32_t configure_io (int32_t in, int32_t out);
 
 	boost::shared_ptr<CAAudioUnit> get_au () { return unit; }
@@ -120,8 +120,8 @@ class AUPlugin : public ARDOUR::Plugin
 	boost::shared_ptr<CAAudioUnit> unit;
 
 	bool initialized;
-	int32_t input_channels;
-	int32_t output_channels;
+	ChanCount input_channels;
+	ChanCount output_channels;
 	std::vector<std::pair<int,int> > io_configs;
 	AudioBufferList* buffers;
 
@@ -144,7 +144,7 @@ class AUPlugin : public ARDOUR::Plugin
 	uint32_t current_maxbuf;
 	nframes_t current_offset;
 	nframes_t cb_offset;
-	vector<Sample*>* current_buffers;
+	std::vector<Sample*>* current_buffers;
 	nframes_t frames_processed;
 
 	std::vector<AUParameterDescriptor> descriptors;
diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index c8de8304c2..f25f1b0154 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -31,7 +31,7 @@ namespace ARDOUR {
 class CoreAudioSource : public AudioFileSource {
   public:
 	CoreAudioSource (ARDOUR::Session&, const XMLNode&);
-	CoreAudioSource (ARDOUR::Session&, const string& path, bool, int chn, Flag);
+	CoreAudioSource (ARDOUR::Session&, const string& path, int chn, Flag);
 	~CoreAudioSource ();
 
 	float sample_rate() const;
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index e0b956c0f9..dbaba25a06 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -41,7 +41,7 @@ class Metering {
 
   private:
 	/* this object is not meant to be instantiated */
-	virtual void foo() = 0;
+	Metering();
 
 	static Glib::StaticMutex    m_meter_signal_lock;
 };
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 4a5fc69be5..c9b2ba11a3 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -33,8 +33,6 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <sndfile.h>
-
 #include <glibmm/thread.h>
 
 #include "pbd/error.h"
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 62a52155c4..b01722e306 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -171,6 +171,7 @@ class Slave {
 /// We need this wrapper for testability, it's just too hard to mock up a session class
 class ISlaveSessionProxy {
   public:
+	virtual ~ISlaveSessionProxy() {}
 	virtual TempoMap& tempo_map()                 const   { return *((TempoMap *) 0); }
 	virtual nframes_t   frame_rate()                const   { return 0; }
 	virtual nframes64_t audible_frame ()            const   { return 0; }