allow auditioning via the monitor section to work.

[ardour.git] / libs / ardour / ardour / auditioner.h

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index aa525b68c9dee35b9d6de3ac9814c2d709cf1a29..5ce3ddaddf423bf66a37e095cb0bd6cde9ff1c60 100644 (file)
--- a/libs/ardour/ardour/auditioner.h
+++ b/libs/ardour/ardour/auditioner.h
@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "ardour/ardour.h"
 #include "ardour/audio_track.h"
@@ -39,25 +39,33 @@ class Auditioner : public AudioTrack
        Auditioner (Session&);
        ~Auditioner ();
 
+       int init ();
+        int connect ();
+
        void audition_region (boost::shared_ptr<Region>);
 
        ARDOUR::AudioPlaylist& prepare_playlist ();
-       void audition_current_playlist ();
 
-       int  play_audition (nframes_t nframes);
+       int play_audition (framecnt_t nframes);
+
+       MonitorState monitoring_state () const;
 
        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); }
+       bool needs_monitor() const { return via_monitor; }
+
+       virtual ChanCount input_streams () const;
 
   private:
        boost::shared_ptr<AudioRegion> the_region;
-       nframes_t current_frame;
-       mutable gint _active;
-       Glib::Mutex lock;
-       nframes_t length;
+       framepos_t current_frame;
+       mutable gint _auditioning;
+       Glib::Threads::Mutex lock;
+       framecnt_t length;
+       bool via_monitor;
 
        void drop_ports ();
        static void *_drop_ports (void *);