From f3546d49dbd2d673138387a87bc523c26dcece68 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 11 Sep 2016 15:21:25 +0200 Subject: Remove last vestiges of multiple run contexts --- src/server/BlockImpl.hpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/server/BlockImpl.hpp') diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 1924d5fe..47eaa6eb 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -27,10 +27,10 @@ #include "raul/Array.hpp" #include "BufferRef.hpp" -#include "Context.hpp" #include "NodeImpl.hpp" #include "PluginImpl.hpp" #include "PortType.hpp" +#include "RunContext.hpp" #include "types.hpp" namespace Raul { @@ -42,12 +42,11 @@ namespace Server { class Buffer; class BufferFactory; -class Context; class Engine; class GraphImpl; class PluginImpl; class PortImpl; -class ProcessContext; +class RunContext; class Worker; /** A Block in a Graph (which is also a Block). @@ -115,16 +114,16 @@ public: virtual void learn() {} /** Do whatever needs doing in the process thread before process() is called */ - virtual void pre_process(ProcessContext& context); + virtual void pre_process(RunContext& context); /** Run block for an entire process cycle (calls run()). */ - virtual void process(ProcessContext& context); + virtual void process(RunContext& context); /** Run block for a portion of process cycle (called from process()). */ - virtual void run(ProcessContext& context) = 0; + virtual void run(RunContext& context) = 0; /** Do whatever needs doing in the process thread after process() is called */ - virtual void post_process(ProcessContext& context); + virtual void post_process(RunContext& context); /** Set the buffer of a port to a given buffer (e.g. connect plugin to buffer) */ virtual void set_port_buffer(uint32_t voice, @@ -154,7 +153,7 @@ public: virtual bool prepare_poly(BufferFactory& bufs, uint32_t poly); virtual bool apply_poly( - ProcessContext& context, Raul::Maid& maid, uint32_t poly); + RunContext& context, Raul::Maid& maid, uint32_t poly); /** Information about the Plugin this Block is an instance of. * Not the best name - not all blocks come from plugins (ie Graph) @@ -168,7 +167,7 @@ public: virtual void plugin(PluginImpl* pi) { _plugin = pi; } - virtual void set_buffer_size(Context& context, + virtual void set_buffer_size(RunContext& context, BufferFactory& bufs, LV2_URID type, uint32_t size); @@ -176,7 +175,6 @@ public: /** The Graph this Block belongs to. */ inline GraphImpl* parent_graph() const { return (GraphImpl*)_parent; } - Context::ID context() const { return _context; } uint32_t num_ports() const { return _ports ? _ports->size() : 0; } virtual uint32_t polyphony() const { return _polyphony; } @@ -189,7 +187,6 @@ protected: PluginImpl* _plugin; Raul::Array* _ports; ///< Access in audio thread only - Context::ID _context; ///< Context this block runs in uint32_t _polyphony; std::set _providers; ///< Blocks connected to this one's input ports std::set _dependants; ///< Blocks this one's output ports are connected to -- cgit v1.2.1