projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the horrible mess that was anything related to sources and paths.
[ardour.git]
/
libs
/
ardour
/
ardour
/
auditioner.h
diff --git
a/libs/ardour/ardour/auditioner.h
b/libs/ardour/ardour/auditioner.h
index b79620eaa2b0004f3eae0c645367a473c61f0581..06d521ea219ba03a57f5ea0d5898db7617c000ef 100644
(file)
--- 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.
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>
*/
#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>
#include <ardour/ardour.h>
#include <ardour/audio_track.h>
@@
-42,25
+39,25
@@
class Auditioner : public AudioTrack
Auditioner (Session&);
~Auditioner ();
Auditioner (Session&);
~Auditioner ();
- void audition_region (
AudioRegion&
);
+ void audition_region (
boost::shared_ptr<Region>
);
ARDOUR::AudioPlaylist& prepare_playlist ();
void audition_current_playlist ();
ARDOUR::AudioPlaylist& prepare_playlist ();
void audition_current_playlist ();
- int play_audition (
jack_
nframes_t nframes);
+ int play_audition (nframes_t nframes);
void cancel_audition () {
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:
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 gin
t _active;
+
Glib::Mutex
lock;
+ nframes_t length;
void drop_ports ();
static void *_drop_ports (void *);
void drop_ports ();
static void *_drop_ports (void *);