Remove dead code.

17 files changed, 5 insertions, 54 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
  ---------------------------------------------------------------------------*/
diff --git a/libs/canvas/canvas/curve.h b/libs/canvas/canvas/curve.h
index d27291e353..fad1119b39 100644
--- a/libs/canvas/canvas/curve.h
+++ b/libs/canvas/canvas/curve.h
@@ -54,7 +54,6 @@ class LIBCANVAS_API Curve : public PolyItem, public InterpolatedCurve
     Points samples;
     Points::size_type n_samples;
     uint32_t points_per_segment;
-    InterpolatedCurve::SplineType curve_type;
     CurveFill curve_fill;
 
     void interpolate ();
diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h
index 64d70a5751..3e6f820963 100644
--- a/libs/canvas/canvas/image.h
+++ b/libs/canvas/canvas/image.h
@@ -97,7 +97,6 @@ private:
     Cairo::Format            _format;
     int                      _width;
     int                      _height;
-    int                      _data;
     mutable boost::shared_ptr<Data>  _current;
     boost::shared_ptr<Data>  _pending;
     mutable bool             _need_render;
diff --git a/libs/canvas/curve.cc b/libs/canvas/curve.cc
index ba6ac68df6..78d47f07e9 100644
--- a/libs/canvas/curve.cc
+++ b/libs/canvas/curve.cc
@@ -31,7 +31,6 @@ Curve::Curve (Canvas* c)
 	: PolyItem (c)
 	, n_samples (0)
 	, points_per_segment (16)
-	, curve_type (CatmullRomCentripetal)
 	, curve_fill (None)
 {
 }
@@ -40,7 +39,6 @@ Curve::Curve (Item* parent)
 	: PolyItem (parent)
 	, n_samples (0)
 	, points_per_segment (16)
-	, curve_type (CatmullRomCentripetal)
 	, curve_fill (None)
 {
 }
diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc
index a8e4a3f286..b5538a834a 100644
--- a/libs/canvas/wave_view.cc
+++ b/libs/canvas/wave_view.cc
@@ -177,12 +177,6 @@ WaveView::set_samples_per_pixel (double samples_per_pixel)
 }
 
 static inline double
-image_to_window (double wave_origin, double image_start)
-{
-	return wave_origin + image_start;
-}
-
-static inline double
 window_to_image (double wave_origin, double image_start)
 {
 	return image_start - wave_origin;
diff --git a/libs/gtkmm2ext/gtkmm2ext/selector.h b/libs/gtkmm2ext/gtkmm2ext/selector.h
index e1a0c1a530..d768ace8bb 100644
--- a/libs/gtkmm2ext/gtkmm2ext/selector.h
+++ b/libs/gtkmm2ext/gtkmm2ext/selector.h
@@ -96,8 +96,6 @@ public:
 	void *refill_arg;
 	gint selected_row;
 	gint selected_column;
-	gint chosen_row;
-	gint chosen_column;
 
 	void refill ();
 	void chosen ();
diff --git a/libs/pbd/pbd/pool.h b/libs/pbd/pbd/pool.h
index 165a3aac4b..a28325cebf 100644
--- a/libs/pbd/pbd/pool.h
+++ b/libs/pbd/pbd/pool.h
@@ -129,8 +129,6 @@ class LIBPBD_API PerThreadPool
   private:
         Glib::Threads::Private<CrossThreadPool> _key;
 	std::string _name;
-	unsigned long _item_size;
-	unsigned long _nitems;
 
 	/** mutex to protect either changes to the _trash variable, or writes to the RingBuffer */
         Glib::Threads::Mutex _trash_mutex;
diff --git a/libs/pbd/pbd/system_exec.h b/libs/pbd/pbd/system_exec.h
index ce6e5a9c4f..b554bdca94 100644
--- a/libs/pbd/pbd/system_exec.h
+++ b/libs/pbd/pbd/system_exec.h
@@ -221,7 +221,6 @@ class LIBPBD_API SystemExec
 		void init ();
 		pthread_mutex_t write_lock;
 
-		int fdin; ///< file-descriptor for writing to child's STDIN. This variable is identical to pin[1] but also used as status check if the stdin pipe is open: <0 means closed.
 		int pok[2];
 		int pin[2];
 		int pout[2];
diff --git a/libs/pbd/pbd/uuid.h b/libs/pbd/pbd/uuid.h
index 77e84c5f09..39817ade1a 100644
--- a/libs/pbd/pbd/uuid.h
+++ b/libs/pbd/pbd/uuid.h
@@ -41,14 +41,6 @@ class LIBPBD_API UUID : public boost::uuids::uuid {
             : boost::uuids::uuid(u)
     {}
 
-    operator boost::uuids::uuid() {
-            return static_cast<boost::uuids::uuid&>(*this);
-    }
-
-    operator boost::uuids::uuid() const {
-            return static_cast<boost::uuids::uuid const&>(*this);
-    }
-
     UUID& operator= (std::string const & str);
     std::string to_s () const;
 
diff --git a/libs/surfaces/generic_midi/midiaction.h b/libs/surfaces/generic_midi/midiaction.h
index e2a29143ad..5686af32be 100644
--- a/libs/surfaces/generic_midi/midiaction.h
+++ b/libs/surfaces/generic_midi/midiaction.h
@@ -55,7 +55,6 @@ class MIDIAction : public MIDIInvokable
 	int set_state (const XMLNode&, int version);
 
   private:
-        Gtk::Action* _action;
 	void execute ();
 };
 
diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc
index e5b8a28ab7..1ebc877ef9 100644
--- a/libs/surfaces/mackie/controls.cc
+++ b/libs/surfaces/mackie/controls.cc
@@ -118,7 +118,7 @@ void
 Control::stop_touch (double when, bool mark)
 {
 	if (normal_ac) {
-		return normal_ac->stop_touch (when, mark);
+		return normal_ac->stop_touch (mark, when);
 	}
 }