X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbutler.h;h=061c94d910a754690163cad2d0932584d1ecfcc5;hb=7629120cda89dd4ec1b03ba4ddcc6f5dd1b0ca5a;hp=fc8e4c18c38939fe7a6294510973649cf4941926;hpb=2b9dc7b380bb4e40171067f42b4010970869a57d;p=ardour.git

diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h
index fc8e4c18c3..061c94d910 100644
--- a/libs/ardour/ardour/butler.h
+++ b/libs/ardour/ardour/butler.h
@@ -41,7 +41,7 @@ class Butler : public SessionHandleRef
   public:
 	Butler (Session& session);
 	~Butler();
-	
+
 	int  start_thread();
 	void terminate_thread();
 	void schedule_transport_work();
@@ -51,11 +51,8 @@ class Butler : public SessionHandleRef
 	bool transport_work_requested() const;
 	void drop_references ();
 
-	float read_data_rate() const; ///< in usec
-	float write_data_rate() const;
-
-	nframes_t audio_diskstream_capture_buffer_size() const { return audio_dstream_capture_buffer_size; }
-	nframes_t audio_diskstream_playback_buffer_size() const { return audio_dstream_playback_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; }
 
 	static void* _thread_work(void *arg);
@@ -63,7 +60,6 @@ class Butler : public SessionHandleRef
 
 	struct Request {
 		enum Type {
-			Wake,
 			Run,
 			Pause,
 			Quit
@@ -76,13 +72,14 @@ class Butler : public SessionHandleRef
 	bool         should_run;
 	mutable gint should_do_transport_work;
 	int          request_pipe[2];
-	nframes_t    audio_dstream_capture_buffer_size;
-	nframes_t    audio_dstream_playback_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);
 };
 
 } // namespace ARDOUR