summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/BlockImpl.hpp2
-rw-r--r--src/server/Broadcaster.hpp4
-rw-r--r--src/server/Buffer.hpp2
-rw-r--r--src/server/CompiledGraph.hpp2
-rw-r--r--src/server/ControlBindings.cpp16
-rw-r--r--src/server/ControlBindings.hpp16
-rw-r--r--src/server/GraphImpl.hpp8
-rw-r--r--src/server/LV2Block.hpp2
-rw-r--r--src/server/PortImpl.hpp4
-rw-r--r--src/server/RunContext.hpp2
-rw-r--r--src/server/events/CreateBlock.hpp2
11 files changed, 30 insertions, 30 deletions
diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp
index 701e2188..7a8d2b8c 100644
--- a/src/server/BlockImpl.hpp
+++ b/src/server/BlockImpl.hpp
@@ -64,7 +64,7 @@ public:
BlockImpl(PluginImpl* plugin,
const Raul::Symbol& symbol,
- bool poly,
+ bool polyphonic,
GraphImpl* parent,
SampleRate rate);
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index ded10896..b51c744c 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -85,8 +85,8 @@ public:
Broadcaster& broadcaster;
};
- void send_plugins(const BlockFactory::Plugins& plugin_list);
- void send_plugins_to(Interface*, const BlockFactory::Plugins& plugin_list);
+ void send_plugins(const BlockFactory::Plugins& plugins);
+ void send_plugins_to(Interface*, const BlockFactory::Plugins& plugins);
void message(const Message& msg) override {
std::lock_guard<std::mutex> lock(_clients_mutex);
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index ed296e8b..f4e147ea 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -48,7 +48,7 @@ public:
void* buf = NULL);
void clear();
- void resize(uint32_t size);
+ void resize(uint32_t capacity);
void copy(const RunContext& context, const Buffer* src);
void prepare_write(RunContext& context);
diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp
index 1a88e71f..6b802611 100644
--- a/src/server/CompiledGraph.hpp
+++ b/src/server/CompiledGraph.hpp
@@ -59,7 +59,7 @@ private:
void compile_graph(GraphImpl* graph);
- void compile_block(BlockImpl* block,
+ void compile_block(BlockImpl* n,
Task& task,
size_t max_depth,
BlockSet& k);
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 424e451e..565f56b3 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -142,16 +142,16 @@ ControlBindings::set_port_binding(RunContext& context,
}
void
-ControlBindings::port_value_changed(RunContext& context,
+ControlBindings::port_value_changed(RunContext& ctx,
PortImpl* port,
Key key,
const Atom& value_atom)
{
- Ingen::World* world = context.engine().world();
+ Ingen::World* world = ctx.engine().world();
const Ingen::URIs& uris = world->uris();
if (!!key) {
int16_t value = port_value_to_control(
- context, port, key.type, value_atom);
+ ctx, port, key.type, value_atom);
uint16_t size = 0;
uint8_t buf[4];
switch (key.type) {
@@ -186,7 +186,7 @@ ControlBindings::port_value_changed(RunContext& context,
break;
}
if (size > 0) {
- _feedback->append_event(context.nframes() - 1, size, (LV2_URID)uris.midi_MidiEvent, buf);
+ _feedback->append_event(ctx.nframes() - 1, size, (LV2_URID)uris.midi_MidiEvent, buf);
}
}
}
@@ -382,10 +382,10 @@ ControlBindings::remove(RunContext& ctx, const std::vector<Binding*>& bindings)
}
void
-ControlBindings::pre_process(RunContext& context, Buffer* buffer)
+ControlBindings::pre_process(RunContext& ctx, Buffer* buffer)
{
uint16_t value = 0;
- Ingen::World* world = context.engine().world();
+ Ingen::World* world = ctx.engine().world();
const Ingen::URIs& uris = world->uris();
_feedback->clear();
@@ -400,7 +400,7 @@ ControlBindings::pre_process(RunContext& context, Buffer* buffer)
const Key key = midi_event_key(ev->body.size, buf, value);
if (_learn_binding && !!key) {
- finish_learn(context, key); // Learn new binding
+ finish_learn(ctx, key); // Learn new binding
}
// Set all controls bound to this key
@@ -408,7 +408,7 @@ ControlBindings::pre_process(RunContext& context, Buffer* buffer)
for (Bindings::const_iterator i = _bindings->lower_bound(k);
i != _bindings->end() && i->key == key;
++i) {
- set_port_value(context, i->port, key.type, value);
+ set_port_value(ctx, i->port, key.type, value);
}
}
}
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 832e36d1..20241fc0 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -99,10 +99,10 @@ public:
void port_value_changed(RunContext& ctx,
PortImpl* port,
Key key,
- const Atom& value);
+ const Atom& value_atom);
- void pre_process(RunContext& ctx, Buffer* control_in);
- void post_process(RunContext& ctx, Buffer* control_out);
+ void pre_process(RunContext& ctx, Buffer* buffer);
+ void post_process(RunContext& ctx, Buffer* buffer);
/** Get all bindings for `path` or children of `path`. */
void get_all(const Raul::Path& path, std::vector<Binding*>& bindings);
@@ -117,22 +117,22 @@ private:
Key midi_event_key(uint16_t size, const uint8_t* buf, uint16_t& value);
- void set_port_value(RunContext& ctx,
+ void set_port_value(RunContext& context,
PortImpl* port,
Type type,
int16_t value);
- bool finish_learn(RunContext& ctx, Key key);
+ bool finish_learn(RunContext& context, Key key);
- float control_to_port_value(RunContext& ctx,
+ float control_to_port_value(RunContext& context,
const PortImpl* port,
Type type,
int16_t value) const;
- int16_t port_value_to_control(RunContext& ctx,
+ int16_t port_value_to_control(RunContext& context,
PortImpl* port,
Type type,
- const Atom& value) const;
+ const Atom& value_atom) const;
Engine& _engine;
std::atomic<Binding*> _learn_binding;
diff --git a/src/server/GraphImpl.hpp b/src/server/GraphImpl.hpp
index 352c0957..3f11a84a 100644
--- a/src/server/GraphImpl.hpp
+++ b/src/server/GraphImpl.hpp
@@ -55,7 +55,7 @@ public:
uint32_t poly,
GraphImpl* parent,
SampleRate srate,
- uint32_t local_poly);
+ uint32_t internal_poly);
virtual ~GraphImpl();
@@ -155,14 +155,14 @@ public:
/** Add an arc to this graph.
* Pre-processing thread only.
*/
- void add_arc(SPtr<ArcImpl> arc);
+ void add_arc(SPtr<ArcImpl> a);
/** Remove an arc from this graph.
* Pre-processing thread only.
*/
- SPtr<ArcImpl> remove_arc(const PortImpl* tail, const PortImpl* head);
+ SPtr<ArcImpl> remove_arc(const PortImpl* tail, const PortImpl* dst_port);
- bool has_arc(const PortImpl* tail, const PortImpl* head) const;
+ bool has_arc(const PortImpl* tail, const PortImpl* dst_port) const;
/** Set a new compiled graph to run, and return the old one. */
void set_compiled_graph(MPtr<CompiledGraph>&& cg);
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index 2ccde602..cce0626a 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -72,7 +72,7 @@ public:
void apply_state(Worker* worker, const LilvState* state);
- boost::optional<Resource> save_preset(const Raul::URI& bundle,
+ boost::optional<Resource> save_preset(const Raul::URI& uri,
const Properties& props);
void set_port_buffer(uint32_t voice,
diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp
index b3b757ff..46d4b606 100644
--- a/src/server/PortImpl.hpp
+++ b/src/server/PortImpl.hpp
@@ -141,7 +141,7 @@ public:
return _prepared_voices->at(voice).buffer;
}
- void update_set_state(const RunContext& context, uint32_t voice);
+ void update_set_state(const RunContext& context, uint32_t v);
void set_voice_value(const RunContext& context,
uint32_t voice,
@@ -170,7 +170,7 @@ public:
virtual void post_process(RunContext& context);
/** Clear/silence all buffers */
- virtual void clear_buffers(const RunContext& context);
+ virtual void clear_buffers(const RunContext& ctx);
/** Claim and apply buffers in the real-time thread. */
virtual bool setup_buffers(RunContext& ctx, BufferFactory& bufs, uint32_t poly);
diff --git a/src/server/RunContext.hpp b/src/server/RunContext.hpp
index 87fb0fed..8df9915b 100644
--- a/src/server/RunContext.hpp
+++ b/src/server/RunContext.hpp
@@ -65,7 +65,7 @@ public:
* This is used to subdivide process cycles, the sub-context is
* lightweight and only serves to pass different time attributes.
*/
- RunContext(const RunContext& parent);
+ RunContext(const RunContext& copy);
/** Return true iff the given port should broadcast its value.
*
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index a9ff39ee..0a29e68c 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -42,7 +42,7 @@ public:
SPtr<Interface> client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& block_path,
+ const Raul::Path& path,
Properties& properties);
bool pre_process(PreProcessContext& ctx);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-29 15:44:39 +0000