projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update recorded MIDI regions as notes arrive. Fixes one cause of infinite note-lengt...
[ardour.git]
/
libs
/
ardour
/
ardour
/
auditioner.h
diff --git
a/libs/ardour/ardour/auditioner.h
b/libs/ardour/ardour/auditioner.h
index e6091cfba0dd7852c11b93a59c1a40a84c287ee4..e7d3347cb66b342e68478cf0f6dd5816f6fd7fd0 100644
(file)
--- a/
libs/ardour/ardour/auditioner.h
+++ b/
libs/ardour/ardour/auditioner.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2001 Paul Davis
+ Copyright (C) 2001 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,7
+15,6
@@
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__
*/
#ifndef __ardour_auditioner_h__
@@
-25,8
+24,8
@@
#include <glibmm/thread.h>
#include <glibmm/thread.h>
-#include
<ardour/ardour.h>
-#include
<ardour/audio_track.h>
+#include
"ardour/ardour.h"
+#include
"ardour/audio_track.h"
namespace ARDOUR {
namespace ARDOUR {
@@
-40,6
+39,8
@@
class Auditioner : public AudioTrack
Auditioner (Session&);
~Auditioner ();
Auditioner (Session&);
~Auditioner ();
+ int init ();
+
void audition_region (boost::shared_ptr<Region>);
ARDOUR::AudioPlaylist& prepare_playlist ();
void audition_region (boost::shared_ptr<Region>);
ARDOUR::AudioPlaylist& prepare_playlist ();
@@
-47,24
+48,26
@@
class Auditioner : public AudioTrack
int play_audition (nframes_t nframes);
int play_audition (nframes_t nframes);
- void cancel_audition () {
- g_atomic_int_set (&_a
ctive
, 0);
+ void cancel_audition () {
+ g_atomic_int_set (&_a
uditioning
, 0);
}
}
- bool active() const { return g_atomic_int_get (&_active); }
+ bool auditioning() const { return g_atomic_int_get (&_auditioning); }
+ bool needs_monitor() const { return via_monitor; }
private:
boost::shared_ptr<AudioRegion> the_region;
nframes_t current_frame;
private:
boost::shared_ptr<AudioRegion> the_region;
nframes_t current_frame;
- mutable gint _a
ctive
;
+ mutable gint _a
uditioning
;
Glib::Mutex lock;
nframes_t length;
Glib::Mutex lock;
nframes_t length;
+ bool via_monitor;
void drop_ports ();
static void *_drop_ports (void *);
void actually_drop_ports ();
void output_changed (IOChange, void*);
void drop_ports ();
static void *_drop_ports (void *);
void actually_drop_ports ();
void output_changed (IOChange, void*);
-};
+};
}; /* namespace ARDOUR */
}; /* namespace ARDOUR */