would you look at that! all those changes just to make the auditioner work again ....

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

1 files changed, 5 insertions, 3 deletions

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index aa525b68c9..f779fa8457 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -39,6 +39,8 @@ class Auditioner : public AudioTrack
 	Auditioner (Session&);
 	~Auditioner ();
 
+        int init ();
+
 	void audition_region (boost::shared_ptr<Region>);
 
 	ARDOUR::AudioPlaylist& prepare_playlist ();
@@ -47,15 +49,15 @@ class Auditioner : public AudioTrack
 	int  play_audition (nframes_t nframes);
 
 	void cancel_audition () {
-		g_atomic_int_set (&_active, 0);
+		g_atomic_int_set (&_auditioning, 0);
 	}
 
-	bool active() const { return g_atomic_int_get (&_active); }
+	bool auditioning() const { return g_atomic_int_get (&_auditioning); }
 
   private:
 	boost::shared_ptr<AudioRegion> the_region;
 	nframes_t current_frame;
-	mutable gint _active;
+	mutable gint _auditioning;
 	Glib::Mutex lock;
 	nframes_t length;