X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbutler.h;h=44ce7848990f534b3a7261a5997d1415a9a737c7;hb=11da4a83e499db74e75d5b59973b0e52b0c1277a;hp=e3760a8c530d50d2b03ada693b5e8395d0b5a60a;hpb=84e92060fd0593adcd47c39b358048715ece9c7a;p=ardour.git

diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h
index e3760a8c53..44ce784899 100644
--- a/libs/ardour/ardour/butler.h
+++ b/libs/ardour/ardour/butler.h
@@ -20,13 +20,19 @@
 #ifndef __ardour_butler_h__
 #define __ardour_butler_h__
 
-#include <glibmm/thread.h>
+#include <pthread.h>
 
+#include <glibmm/threads.h>
+
+#include "pbd/crossthread.h"
 #include "pbd/ringbuffer.h"
 #include "pbd/pool.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/session_handle.h"
 
+
+
 namespace ARDOUR {
 
 /**
@@ -36,12 +42,12 @@ namespace ARDOUR {
  *  are empty they are deleted.
  */
 
-class Butler : public SessionHandleRef
+class LIBARDOUR_API Butler : public SessionHandleRef
 {
   public:
 	Butler (Session& session);
 	~Butler();
-	
+
 	int  start_thread();
 	void terminate_thread();
 	void schedule_transport_work();
@@ -51,18 +57,19 @@ class Butler : public SessionHandleRef
 	bool transport_work_requested() const;
 	void drop_references ();
 
-	float read_data_rate() const; ///< in usec
-	float write_data_rate() const;
+        void map_parameters ();
 
-	uint32_t audio_diskstream_buffer_size() const { return audio_dstream_buffer_size; }
+	framecnt_t audio_diskstream_capture_buffer_size() const { return audio_dstream_capture_buffer_size; }
+	framecnt_t audio_diskstream_playback_buffer_size() const { return audio_dstream_playback_buffer_size; }
 	uint32_t midi_diskstream_buffer_size()  const { return midi_dstream_buffer_size; }
 
+	bool flush_tracks_to_disk_after_locate (boost::shared_ptr<RouteList>, uint32_t& errors);
+
 	static void* _thread_work(void *arg);
 	void*         thread_work();
 
 	struct Request {
 		enum Type {
-			Wake,
 			Run,
 			Pause,
 			Quit
@@ -70,17 +77,29 @@ class Butler : public SessionHandleRef
 	};
 
 	pthread_t    thread;
-	Glib::Mutex  request_lock;
-	Glib::Cond   paused;
+	bool         have_thread;
+	Glib::Threads::Mutex  request_lock;
+        Glib::Threads::Cond   paused;
 	bool         should_run;
 	mutable gint should_do_transport_work;
-	int          request_pipe[2];
-	uint32_t     audio_dstream_buffer_size;
+	framecnt_t   audio_dstream_capture_buffer_size;
+	framecnt_t   audio_dstream_playback_buffer_size;
 	uint32_t     midi_dstream_buffer_size;
 	RingBuffer<CrossThreadPool*> pool_trash;
 
 private:
 	void empty_pool_trash ();
+	void config_changed (std::string);
+
+	bool flush_tracks_to_disk_normal (boost::shared_ptr<RouteList>, uint32_t& errors);
+
+	/**
+	 * Add request to butler thread request queue
+	 */
+	void queue_request (Request::Type r);
+
+	CrossThreadChannel _xthread;
+
 };
 
 } // namespace ARDOUR