aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/machina
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/machina')
-rw-r--r--src/engine/machina/Controller.hpp2
-rw-r--r--src/engine/machina/Driver.hpp10
-rw-r--r--src/engine/machina/Machine.hpp14
-rw-r--r--src/engine/machina/Updates.hpp16
-rw-r--r--src/engine/machina/types.hpp2
5 files changed, 21 insertions, 23 deletions
diff --git a/src/engine/machina/Controller.hpp b/src/engine/machina/Controller.hpp
index eb04c59..d5a7928 100644
--- a/src/engine/machina/Controller.hpp
+++ b/src/engine/machina/Controller.hpp
@@ -81,7 +81,7 @@ private:
SPtr<Engine> _engine;
Client::ClientModel& _client_model;
- SPtr<UpdateBuffer> _updates;
+ SPtr<Raul::RingBuffer> _updates;
};
}
diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp
index ea0bf8f..1ef0a7f 100644
--- a/src/engine/machina/Driver.hpp
+++ b/src/engine/machina/Driver.hpp
@@ -45,9 +45,9 @@ public:
_machine = machine;
}
- SPtr<UpdateBuffer> update_sink() { return _updates; }
+ SPtr<Raul::RingBuffer> update_sink() { return _updates; }
- void set_update_sink(SPtr<UpdateBuffer> b) {
+ void set_update_sink(SPtr<Raul::RingBuffer> b) {
_updates = b;
}
@@ -65,9 +65,9 @@ public:
virtual void finish_record() {}
protected:
- Raul::Forge& _forge;
- SPtr<Machine> _machine;
- SPtr<UpdateBuffer> _updates;
+ Raul::Forge& _forge;
+ SPtr<Machine> _machine;
+ SPtr<Raul::RingBuffer> _updates;
};
} // namespace Machina
diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp
index 1a8f267..d65cec4 100644
--- a/src/engine/machina/Machine.hpp
+++ b/src/engine/machina/Machine.hpp
@@ -67,7 +67,7 @@ public:
// Audio context
void reset(MIDISink* sink, Raul::TimeStamp time);
- uint32_t run(Context& context, SPtr<UpdateBuffer> updates);
+ uint32_t run(Context& context, SPtr<Raul::RingBuffer> updates);
// Any context
inline Raul::TimeStamp time() const { return _time; }
@@ -86,13 +86,13 @@ private:
// Audio context
SPtr<Node> earliest_node() const;
- bool enter_node(Context& context,
- SPtr<Node> node,
- SPtr<UpdateBuffer> updates);
+ bool enter_node(Context& context,
+ SPtr<Node> node,
+ SPtr<Raul::RingBuffer> updates);
- void exit_node(Context& context,
- SPtr<Node> node,
- SPtr<UpdateBuffer> updates);
+ void exit_node(Context& context,
+ SPtr<Node> node,
+ SPtr<Raul::RingBuffer> updates);
static const size_t MAX_ACTIVE_NODES = 128;
diff --git a/src/engine/machina/Updates.hpp b/src/engine/machina/Updates.hpp
index cf29886..5f6a324 100644
--- a/src/engine/machina/Updates.hpp
+++ b/src/engine/machina/Updates.hpp
@@ -31,16 +31,16 @@ enum UpdateType {
};
void
-write_set(SPtr<UpdateBuffer> buf,
- uint64_t subject,
- URIInt key,
- const Raul::Atom& value);
+write_set(SPtr<Raul::RingBuffer> buf,
+ uint64_t subject,
+ URIInt key,
+ const Raul::Atom& value);
uint32_t
-read_set(SPtr<UpdateBuffer> buf,
- uint64_t* subject,
- URIInt* key,
- Raul::Atom* value);
+read_set(SPtr<Raul::RingBuffer> buf,
+ uint64_t* subject,
+ URIInt* key,
+ Raul::Atom* value);
} // namespace Machina
diff --git a/src/engine/machina/types.hpp b/src/engine/machina/types.hpp
index d71e144..23d5f1c 100644
--- a/src/engine/machina/types.hpp
+++ b/src/engine/machina/types.hpp
@@ -26,8 +26,6 @@ namespace Machina {
typedef unsigned char byte;
-typedef Raul::RingBuffer UpdateBuffer;
-
typedef uint32_t URIInt;
template <class T>