X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fauditioner.h;h=06d521ea219ba03a57f5ea0d5898db7617c000ef;hb=022818b4a796f52c0a91eea42e65aec0bc7bed43;hp=b79620eaa2b0004f3eae0c645367a473c61f0581;hpb=8af0757b61990767f2a85e68f535a5af9976fd79;p=ardour.git

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index b79620eaa2..06d521ea21 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -15,17 +15,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_auditioner_h__
 #define __ardour_auditioner_h__
 
 #include <string>
-#include <pthread.h>
 
-#include <pbd/lockmonitor.h>
-#include <pbd/atomic.h>
+#include <glibmm/thread.h>
 
 #include <ardour/ardour.h>
 #include <ardour/audio_track.h>
@@ -42,25 +39,25 @@ class Auditioner : public AudioTrack
 	Auditioner (Session&);
 	~Auditioner ();
 
-	void audition_region (AudioRegion&);
+	void audition_region (boost::shared_ptr<Region>);
 
 	ARDOUR::AudioPlaylist& prepare_playlist ();
 	void audition_current_playlist ();
 
-	int  play_audition (jack_nframes_t nframes);
+	int  play_audition (nframes_t nframes);
 
 	void cancel_audition () { 
-		atomic_set (&_active, 0);
+		g_atomic_int_set (&_active, 0);
 	}
 
-	bool active() const { return atomic_read (&_active); }
+	bool active() const { return g_atomic_int_get (&_active); }
 
   private:
-	AudioRegion *the_region;
-	jack_nframes_t current_frame;
-	atomic_t _active;
-	PBD::Lock lock;
-	jack_nframes_t length;
+	boost::shared_ptr<AudioRegion> the_region;
+	nframes_t current_frame;
+	mutable gint _active;
+	Glib::Mutex lock;
+	nframes_t length;
 
 	void drop_ports ();
 	static void *_drop_ports (void *);