Remove dead code.

7 files changed, 4 insertions, 29 deletions

diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h
index 58789177e3..eddf6c67a2 100644
--- a/libs/ardour/ardour/audio_track_importer.h
+++ b/libs/ardour/ardour/audio_track_importer.h
@@ -40,9 +40,6 @@ class LIBARDOUR_API AudioTrackImportHandler : public ElementImportHandler
 	AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler);
 	virtual ~AudioTrackImportHandler () {}
 	virtual std::string get_info () const;
-
-  private:
-	AudioPlaylistImportHandler & pl_handler;
 };
 
 
diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h
index 1434a85f8e..09ba5f2aa2 100644
--- a/libs/ardour/ardour/quantize.h
+++ b/libs/ardour/ardour/quantize.h
@@ -27,11 +27,9 @@
 
 namespace ARDOUR {
 
-class Session;
-
 class LIBARDOUR_API Quantize : public MidiOperator {
 public:
-	Quantize (ARDOUR::Session&, bool snap_start, bool snap_end,
+	Quantize (bool snap_start, bool snap_end,
 			double start_grid, double end_grid,
 			float strength, float swing, float threshold);
 	~Quantize ();
@@ -42,7 +40,6 @@ public:
 	std::string name() const { return std::string ("quantize"); }
 
 private:
-	ARDOUR::Session& session;
 	bool   _snap_start;
 	bool   _snap_end;
 	double _start_grid;
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 6df10c3f9a..32fbf20c11 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -507,7 +507,6 @@ class LIBARDOUR_API Engine_Slave : public Slave
 
   private:
         AudioEngine& engine;
-	double speed;
 	bool _starting;
 };
 
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 99fb9f4d09..7f5e538f4a 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -105,8 +105,6 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	bool          _capture_end;
 	framepos_t     capture_start_frame;
 	framepos_t     file_pos; // unit is frames
-	framecnt_t     xfade_out_count;
-	framecnt_t     xfade_in_count;
 	Sample*        xfade_buf;
 
 	framecnt_t crossfade (Sample* data, framecnt_t cnt, int dir);
diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index b3ac93e010..cf9a25962c 100644
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -40,8 +40,7 @@ using namespace ARDOUR;
 /*** AudioTrackImportHandler ***/
 
 AudioTrackImportHandler::AudioTrackImportHandler (XMLTree const & source, Session & session, AudioPlaylistImportHandler & pl_handler) :
-  ElementImportHandler (source, session),
-  pl_handler (pl_handler)
+  ElementImportHandler (source, session)
 {
 	XMLNode const * root = source.root();
 	XMLNode const * routes;
diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index b543c5e67b..dc1976e9ff 100644
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -35,11 +35,10 @@ using namespace ARDOUR;
  * 0.25 = quantize to beats/4, etc.
  */
 
-Quantize::Quantize (Session& s, bool snap_start, bool snap_end,
+Quantize::Quantize (bool snap_start, bool snap_end,
 		    double start_grid, double end_grid,
 		    float strength, float swing, float threshold)
-	: session (s)
-	, _snap_start (snap_start)
+	: _snap_start (snap_start)
 	, _snap_end (snap_end)
 	, _start_grid(start_grid)
 	, _end_grid(end_grid)
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 3e7c2226cc..613233cacb 100644
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -34,20 +34,6 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/* XXX put this in the right place */
-
-static inline uint32_t next_power_of_two (uint32_t n)
-{
-	--n;
-	n |= n >> 16;
-	n |= n >> 8;
-	n |= n >> 4;
-	n |= n >> 2;
-	n |= n >> 1;
-	++n;
-	return n;
-}
-
 /*---------------------------------------------------------------------------
  BUTLER THREAD
  ---------------------------------------------------------------------------*/