fixes for libsndfile conversion issues, tape track waveform display and overloaded virtual functions

git-svn-id: svn://localhost/ardour2/trunk@624 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 8 deletions

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 38deece11a..12b7d32188 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -28,6 +28,7 @@
 
 #include <pbd/xml++.h>
 #include "prompter.h"
+#include "selectable.h"
 
 namespace ARDOUR {
 	class Session;
@@ -37,7 +38,7 @@ namespace ARDOUR {
  * AxisView defines the abstract base class for time-axis trackviews and routes.
  *
  */
-class AxisView : public virtual sigc::trackable
+class AxisView : public virtual Selectable
 {
   public:
 	/**
@@ -51,12 +52,6 @@ class AxisView : public virtual sigc::trackable
 
 	virtual string name() const = 0;
 
-	virtual void set_selected (bool yn) {
-		if (yn != _selected) {
-			_selected = yn;
-		}
-	}
-	
 	virtual bool marked_for_display() const { return _marked_for_display; }
 
 	virtual void set_marked_for_display (bool yn) {
@@ -65,7 +60,6 @@ class AxisView : public virtual sigc::trackable
 		}
 	}
 	
-	virtual bool selected() const { return _selected; }
 	sigc::signal<void> Hiding;
 	sigc::signal<void> GoingAway;