1 files changed, 43 insertions, 50 deletions

diff --git a/src/server/JackDriver.hpp b/src/server/JackDriver.hpp
index d4ea03d0..4c8e779e 100644
--- a/src/server/JackDriver.hpp
+++ b/src/server/JackDriver.hpp
@@ -18,47 +18,35 @@
 #define INGEN_ENGINE_JACKAUDIODRIVER_HPP
 
 #include "Driver.hpp"
-#include "EnginePort.hpp" // IWYU pragma: keep
+#include "EnginePort.hpp"
 #include "types.hpp"
 
-#include "ingen/URI.hpp"
-#include "ingen/memory.hpp" // IWYU pragma: keep
-#include "lv2/atom/forge.h"
-#include "raul/Semaphore.hpp"
+#include <ingen/URI.hpp>
+#include <ingen/memory.hpp>
+#include <lv2/atom/forge.h>
+#include <raul/Semaphore.hpp>
 
+#include <boost/intrusive/options.hpp>
 #include <boost/intrusive/slist.hpp>
-#include <jack/jack.h>
-#include <jack/thread.h>
+#include <jack/transport.h> // IWYU pragma: keep
 #include <jack/types.h>
 
+#include <jack/thread.h>
+
 #include <atomic>
-#include <cstddef>
 #include <cstdint>
 #include <exception>
 #include <memory>
 #include <string>
 
-namespace raul {
-class Path;
-} // namespace raul
-
-namespace boost {
-namespace intrusive {
-
-template <bool Enabled> struct cache_last;
-
-} // namespace intrusive
-} // namespace boost
-
 namespace ingen {
 
 class Atom;
 
 namespace server {
 
-class Buffer;
-class DuplexPort;
 class Engine;
+class FrameTimer;
 class RunContext;
 
 /** The Jack Driver.
@@ -96,8 +84,8 @@ public:
 
 	/** Transport state for this frame.
 	 * Intended to only be called from the audio thread. */
-	inline const jack_position_t* position()        { return &_position; }
-	inline jack_transport_state_t transport_state() { return _transport_state; }
+	const jack_position_t* position()        { return &_position; }
+	jack_transport_state_t transport_state() { return _transport_state; }
 
 	void append_time_events(RunContext& ctx, Buffer& buffer) override;
 
@@ -107,14 +95,13 @@ public:
 
 	jack_client_t* jack_client()  const          { return _client; }
 	SampleCount    block_length() const override { return _block_length; }
-	size_t         seq_size()     const override { return _seq_size; }
+	uint32_t       seq_size()     const override { return _seq_size; }
 	SampleCount    sample_rate()  const override { return _sample_rate; }
 
-	SampleCount frame_time() const override {
-		return _client ? jack_frame_time(_client) : 0;
-	}
+	SampleCount frame_time() const override;
 
-	class PortRegistrationFailedException : public std::exception {};
+	class PortRegistrationFailedException : public std::exception
+	{};
 
 private:
 	friend class JackPort;
@@ -122,16 +109,21 @@ private:
 	static void thread_init_cb(void* jack_driver);
 
 	// Static JACK callbacks which call the non-static callbacks (methods)
-	inline static void shutdown_cb(void* const jack_driver) {
-		return static_cast<JackDriver*>(jack_driver)->_shutdown_cb();
+
+	static void shutdown_cb(void* const jack_driver) {
+		static_cast<JackDriver*>(jack_driver)->_shutdown_cb();
 	}
-	inline static int process_cb(jack_nframes_t nframes, void* const jack_driver) {
+
+	static int process_cb(jack_nframes_t nframes, void* const jack_driver) {
 		return static_cast<JackDriver*>(jack_driver)->_process_cb(nframes);
 	}
-	inline static int block_length_cb(jack_nframes_t nframes, void* const jack_driver) {
+
+	static int block_length_cb(jack_nframes_t nframes, void* const jack_driver) {
 		return static_cast<JackDriver*>(jack_driver)->_block_length_cb(nframes);
 	}
 
+	// Internal methods for processing
+
 	void pre_process_port(RunContext& ctx, EnginePort* port);
 	void post_process_port(RunContext& ctx, EnginePort* port) const;
 
@@ -150,23 +142,24 @@ protected:
 
 	using AudioBufPtr = std::unique_ptr<float, FreeDeleter<float>>;
 
-	Engine&                _engine;
-	Ports                  _ports;
-	AudioBufPtr            _fallback_buffer;
-	LV2_Atom_Forge         _forge;
-	raul::Semaphore        _sem;
-	std::atomic<bool>      _flag;
-	jack_client_t*         _client;
-	jack_nframes_t         _block_length;
-	size_t                 _seq_size;
-	jack_nframes_t         _sample_rate;
-	uint32_t               _midi_event_type;
-	bool                   _is_activated;
-	jack_position_t        _position;
-	jack_transport_state_t _transport_state;
-	double                 _old_bpm;
-	jack_nframes_t         _old_frame;
-	bool                   _old_rolling;
+	Engine&                     _engine;
+	Ports                       _ports;
+	AudioBufPtr                 _fallback_buffer;
+	LV2_Atom_Forge              _forge;
+	raul::Semaphore             _sem{0};
+	std::unique_ptr<FrameTimer> _timer;
+	std::atomic<bool>           _flag{false};
+	jack_client_t*              _client{nullptr};
+	jack_nframes_t              _block_length{0};
+	uint32_t                    _seq_size{0};
+	jack_nframes_t              _sample_rate{0};
+	uint32_t                    _midi_event_type;
+	bool                        _is_activated{false};
+	jack_position_t             _position{};
+	jack_transport_state_t      _transport_state{};
+	double                      _old_bpm{120.0};
+	jack_nframes_t              _old_frame{0};
+	bool                        _old_rolling{false};
 };
 
 } // namespace server