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 b79620eaa2b0004f3eae0c645367a473c61f0581..5ce3ddaddf423bf66a37e095cb0bd6cde9ff1c60 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
@@ -15,20 +15,17 @@
     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/threads.h>
 
-#include <ardour/ardour.h>
-#include <ardour/audio_track.h>
+#include "ardour/ardour.h"
+#include "ardour/audio_track.h"
 
 namespace ARDOUR {
 
@@ -42,31 +39,39 @@ class Auditioner : public AudioTrack
        Auditioner (Session&);
        ~Auditioner ();
 
-       void audition_region (AudioRegion&);
+       int init ();
+        int connect ();
+
+       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 (framecnt_t nframes);
+
+       MonitorState monitoring_state () const;
 
-       void cancel_audition () { 
-               atomic_set (&_active, 0);
+       void cancel_audition () {
+               g_atomic_int_set (&_auditioning, 0);
        }
 
-       bool active() const { return atomic_read (&_active); }
+       bool auditioning() const { return g_atomic_int_get (&_auditioning); }
+       bool needs_monitor() const { return via_monitor; }
+
+       virtual ChanCount input_streams () const;
 
   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;
+       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 *);
        void actually_drop_ports ();
        void output_changed (IOChange, void*);
-};     
+};
 
 }; /* namespace ARDOUR */