X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fauditioner.h;h=97ed164494cf0cc29dd0e747a26933ef62857466;hb=a473d630eb165272992e90f8d854b1d66ec0be63;hp=06d521ea219ba03a57f5ea0d5898db7617c000ef;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git

diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h
index 06d521ea21..97ed164494 100644
--- 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
@@ -24,8 +24,8 @@
 
 #include <glibmm/thread.h>
 
-#include <ardour/ardour.h>
-#include <ardour/audio_track.h>
+#include "ardour/ardour.h"
+#include "ardour/audio_track.h"
 
 namespace ARDOUR {
 
@@ -39,31 +39,37 @@ class Auditioner : public AudioTrack
 	Auditioner (Session&);
 	~Auditioner ();
 
+	int init ();
+
 	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);
 
-	void cancel_audition () { 
-		g_atomic_int_set (&_active, 0);
+	void cancel_audition () {
+		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;
+	framepos_t current_frame;
+	mutable gint _auditioning;
 	Glib::Mutex lock;
-	nframes_t length;
+	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 */