AU: install latency listener

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

diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h
index 061c94d910a754690163cad2d0932584d1ecfcc5..44ce7848990f534b3a7261a5997d1415a9a737c7 100644 (file)
--- 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,7 +42,7 @@ namespace ARDOUR {
  *  are empty they are deleted.
  */
 
-class Butler : public SessionHandleRef
+class LIBARDOUR_API Butler : public SessionHandleRef
 {
   public:
        Butler (Session& session);
@@ -51,10 +57,14 @@ class Butler : public SessionHandleRef
        bool transport_work_requested() const;
        void drop_references ();
 
+        void map_parameters ();
+
        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();
 
@@ -67,11 +77,11 @@ 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];
        framecnt_t   audio_dstream_capture_buffer_size;
        framecnt_t   audio_dstream_playback_buffer_size;
        uint32_t     midi_dstream_buffer_size;
@@ -80,6 +90,16 @@ class Butler : public SessionHandleRef
 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