3 files changed, 11 insertions, 1 deletions
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 1af7be1b..3d76a032 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -64,6 +64,8 @@ Engine::Engine(Ingen::World* world)
 	, _root_graph(NULL)
 	, _worker(new Worker(world->log(), event_queue_size()))
 	, _process_context(*this)
+	, _rand_engine(0)
+	, _uniform_dist(0.0f, 1.0f)
 	, _quit_flag(false)
 	, _direct_driver(true)
 {
diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp
index e7327ef4..851b3127 100644
--- a/src/server/Engine.hpp
+++ b/src/server/Engine.hpp
@@ -17,6 +17,8 @@
 #ifndef INGEN_ENGINE_ENGINE_HPP
 #define INGEN_ENGINE_ENGINE_HPP
 
+#include <random>
+
 #include <boost/utility.hpp>
 
 #include "ingen/EngineBase.hpp"
@@ -76,6 +78,9 @@ public:
 	                             SPtr<Interface>  client);
 	virtual bool unregister_client(const Raul::URI& uri);
 
+	/** Return a random [0..1] float with uniform distribution */
+	float frand() { return _uniform_dist(_rand_engine); }
+
 	void set_driver(SPtr<Driver> driver);
 
 	SampleCount event_time();
@@ -128,6 +133,9 @@ private:
 
 	ProcessContext _process_context;
 
+	std::mt19937                          _rand_engine;
+	std::uniform_real_distribution<float> _uniform_dist;
+
 	bool _quit_flag;
 	bool _direct_driver;
 };
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 950c8739..0e71de96 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -147,7 +147,7 @@ PortImpl::activate(BufferFactory& bufs)
 	*/
 	const double   srate  = bufs.engine().driver()->sample_rate();
 	const uint32_t period = srate / monitor_rate;
-	_frames_since_monitor = rand() % period;
+	_frames_since_monitor = bufs.engine().frand() * period;
 	_last_monitor_value   = 0.0f;
 }