summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/auditioner.h
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour/auditioner.h')
-rw-r--r--libs/ardour/ardour/auditioner.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index b79620eaa2..d5d4063dda 100644
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -22,10 +22,8 @@
#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>
@@ -50,16 +48,16 @@ class Auditioner : public AudioTrack
int play_audition (jack_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;
+ gint _active;
+ Glib::Mutex lock;
jack_nframes_t length;
void drop_ports ();