From 6b6cb56b2ceab509569bfca247f108f2be5e25c0 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 23 Feb 2013 19:55:13 +0000 Subject: Move Atom implementation out of Raul so it can depend on LV2. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5076 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/Context.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/server/Context.cpp') diff --git a/src/server/Context.cpp b/src/server/Context.cpp index 2ac2ddc2..90e3e184 100644 --- a/src/server/Context.cpp +++ b/src/server/Context.cpp @@ -29,19 +29,19 @@ namespace Server { struct Notification { - inline Notification(PortImpl* p = 0, - FrameTime f = 0, - LV2_URID k = 0, - uint32_t s = 0, - Raul::Atom::TypeID t = 0) + inline Notification(PortImpl* p = 0, + FrameTime f = 0, + LV2_URID k = 0, + uint32_t s = 0, + LV2_URID t = 0) : port(p), time(f), key(k), size(s), type(t) {} - PortImpl* port; - FrameTime time; - LV2_URID key; - uint32_t size; - Raul::Atom::TypeID type; + PortImpl* port; + FrameTime time; + LV2_URID key; + uint32_t size; + LV2_URID type; }; Context::Context(Engine& engine, ID id) @@ -61,12 +61,12 @@ Context::must_notify(const PortImpl* port) const } bool -Context::notify(LV2_URID key, - FrameTime time, - PortImpl* port, - uint32_t size, - Raul::Atom::TypeID type, - const void* body) +Context::notify(LV2_URID key, + FrameTime time, + PortImpl* port, + uint32_t size, + LV2_URID type, + const void* body) { const Notification n(port, time, key, size, type); if (_event_sink.write_space() < sizeof(n) + size) { @@ -94,7 +94,7 @@ Context::emit_notifications(FrameTime end) return; } if (_event_sink.read(sizeof(note), ¬e) == sizeof(note)) { - Raul::Atom value = _engine.world()->forge().alloc( + Atom value = _engine.world()->forge().alloc( note.size, note.type, NULL); if (_event_sink.read(note.size, value.get_body()) == note.size) { i += note.size; -- cgit v1.2.1