summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ingen/AtomForge.hpp12
-rw-r--r--include/ingen/Forge.hpp4
-rw-r--r--include/ingen/URIs.hpp4
-rw-r--r--include/ingen/client/PluginModel.hpp4
-rw-r--r--src/AtomReader.cpp18
-rw-r--r--src/Parser.cpp5
-rw-r--r--src/Resource.cpp4
-rw-r--r--src/URIs.cpp10
-rw-r--r--src/World.cpp6
-rw-r--r--src/client/ClientStore.cpp6
-rw-r--r--src/client/PluginModel.cpp26
-rw-r--r--src/gui/GraphBox.cpp4
-rw-r--r--src/gui/GraphTreeWindow.cpp3
-rw-r--r--src/gui/GraphTreeWindow.hpp4
-rw-r--r--src/gui/NodeModule.cpp1
-rw-r--r--src/server/Buffer.cpp4
-rw-r--r--src/server/Buffer.hpp4
-rw-r--r--src/server/CompiledGraph.cpp13
-rw-r--r--src/server/Engine.cpp4
-rw-r--r--src/server/LV2Block.cpp10
-rw-r--r--src/server/UndoStack.cpp18
-rw-r--r--src/server/UndoStack.hpp2
-rw-r--r--src/server/events/Delta.cpp9
-rw-r--r--src/server/mix.cpp8
-rw-r--r--wscript3
25 files changed, 90 insertions, 96 deletions
diff --git a/include/ingen/AtomForge.hpp b/include/ingen/AtomForge.hpp
index b1cec69d..24e42186 100644
--- a/include/ingen/AtomForge.hpp
+++ b/include/ingen/AtomForge.hpp
@@ -73,7 +73,7 @@ private:
using SratomPtr = UPtr<Sratom, SratomDeleter>;
/// Append some data and return a reference to its start
- intptr_t append(const void* buf, uint32_t len) {
+ intptr_t append(const void* data, uint32_t len) {
// Record offset of the start of this write (+1 to avoid null)
const intptr_t ref = _size + 1;
@@ -85,7 +85,7 @@ private:
}
// Append new data
- memcpy(reinterpret_cast<uint8_t*>(_buf.get()) + _size, buf, len);
+ memcpy(reinterpret_cast<uint8_t*>(_buf.get()) + _size, data, len);
_size += len;
return ref;
}
@@ -103,13 +103,13 @@ private:
}
static LV2_Atom_Forge_Ref
- c_append(void* handle, const void* buf, uint32_t len) {
- return static_cast<AtomForge*>(handle)->append(buf, len);
+ c_append(void* self, const void* data, uint32_t len) {
+ return static_cast<AtomForge*>(self)->append(data, len);
}
static LV2_Atom*
- c_deref(void* handle, LV2_Atom_Forge_Ref ref) {
- return static_cast<AtomForge*>(handle)->deref(ref);
+ c_deref(void* self, LV2_Atom_Forge_Ref ref) {
+ return static_cast<AtomForge*>(self)->deref(ref);
}
size_t _size; ///< Current atom size
diff --git a/include/ingen/Forge.hpp b/include/ingen/Forge.hpp
index 10b4e622..54f5d3a9 100644
--- a/include/ingen/Forge.hpp
+++ b/include/ingen/Forge.hpp
@@ -55,8 +55,8 @@ public:
Atom make_urid(const ingen::URI& u);
- static Atom alloc(uint32_t size, uint32_t type, const void* val) {
- return Atom(size, type, val);
+ static Atom alloc(uint32_t s, uint32_t t, const void* v) {
+ return Atom(s, t, v);
}
Atom alloc(const char* v) {
diff --git a/include/ingen/URIs.hpp b/include/ingen/URIs.hpp
index 9d4b2818..baa376e9 100644
--- a/include/ingen/URIs.hpp
+++ b/include/ingen/URIs.hpp
@@ -39,10 +39,10 @@ class URIMap;
*/
class INGEN_API URIs : public Raul::Noncopyable {
public:
- URIs(ingen::Forge& forge, URIMap* map, LilvWorld* lworld);
+ URIs(ingen::Forge& ingen_forge, URIMap* map, LilvWorld* lworld);
struct Quark : public URI {
- Quark(ingen::Forge& forge,
+ Quark(ingen::Forge& ingen_forge,
URIMap* map,
LilvWorld* lworld,
const char* str);
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index dbefaf95..8afcd38f 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -65,10 +65,10 @@ public:
Raul::Symbol default_block_symbol() const;
std::string human_name() const;
- std::string port_human_name(uint32_t i) const;
+ std::string port_human_name(uint32_t index) const;
using ScalePoints = std::map<float, std::string>;
- ScalePoints port_scale_points(uint32_t i) const;
+ ScalePoints port_scale_points(uint32_t index) const;
using Presets = std::map<URI, std::string>;
const Presets& presets() const { return _presets; }
diff --git a/src/AtomReader.cpp b/src/AtomReader.cpp
index a7f0386e..77b4740d 100644
--- a/src/AtomReader.cpp
+++ b/src/AtomReader.cpp
@@ -324,6 +324,11 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return false;
}
+ if (!subject_uri) {
+ _log.warn("Copy message has non-path subject\n");
+ return false;
+ }
+
const LV2_Atom* dest = nullptr;
lv2_atom_object_get(obj, _uris.patch_destination.urid(), &dest, 0);
if (!dest) {
@@ -331,11 +336,6 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
return false;
}
- boost::optional<URI> subject_uri(atom_to_uri(subject));
- if (!subject_uri) {
- _log.warn("Copy message has non-path subject\n");
- return false;
- }
boost::optional<URI> dest_uri(atom_to_uri(dest));
if (!dest_uri) {
@@ -371,20 +371,18 @@ AtomReader::write(const LV2_Atom* msg, int32_t default_id)
_iface(Move{seq, *subject_path, *dest_path});
} else if (obj->body.otype == _uris.patch_Response) {
- const LV2_Atom* seq = nullptr;
const LV2_Atom* body = nullptr;
lv2_atom_object_get(obj,
- _uris.patch_sequenceNumber.urid(), &seq,
- _uris.patch_body.urid(), &body,
+ _uris.patch_body.urid(), &body,
0);
- if (!seq || seq->type != _uris.atom_Int) {
+ if (!number || number->type != _uris.atom_Int) {
_log.warn("Response message has no sequence number\n");
return false;
} else if (!body || body->type != _uris.atom_Int) {
_log.warn("Response message body is not integer\n");
return false;
}
- _iface(Response{reinterpret_cast<const LV2_Atom_Int*>(seq)->body,
+ _iface(Response{reinterpret_cast<const LV2_Atom_Int*>(number)->body,
static_cast<ingen::Status>(
reinterpret_cast<const LV2_Atom_Int*>(body)->body),
subject_uri ? subject_uri->c_str() : ""});
diff --git a/src/Parser.cpp b/src/Parser.cpp
index ec188e35..1b86285a 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -534,15 +534,14 @@ parse(ingen::World& world,
using Subjects = std::map< Sord::Node, std::set<Sord::Node> >;
Subjects subjects;
for (Sord::Iter i = model.find(subject, rdf_type, nil); !i.end(); ++i) {
- const Sord::Node& subject = i.get_subject();
const Sord::Node& rdf_class = i.get_object();
assert(rdf_class.is_uri());
- auto s = subjects.find(subject);
+ const auto s = subjects.find(i.get_subject());
if (s == subjects.end()) {
std::set<Sord::Node> types;
types.insert(rdf_class);
- subjects.emplace(subject, types);
+ subjects.emplace(i.get_subject(), types);
} else {
s->second.insert(rdf_class);
}
diff --git a/src/Resource.cpp b/src/Resource.cpp
index afd9182a..0bd4b95f 100644
--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -58,9 +58,9 @@ Resource::set_property(const URI& uri, const Atom& value, Resource::Graph ctx)
auto next = i;
++next;
if (i->second.context() == ctx) {
- const auto value = i->second;
+ const auto old_value = i->second;
_properties.erase(i);
- on_property_removed(uri, value);
+ on_property_removed(uri, old_value);
}
i = next;
}
diff --git a/src/URIs.cpp b/src/URIs.cpp
index f0252e73..a2ad6819 100644
--- a/src/URIs.cpp
+++ b/src/URIs.cpp
@@ -36,13 +36,13 @@
namespace ingen {
-URIs::Quark::Quark(Forge& forge,
+URIs::Quark::Quark(Forge& ingen_forge,
URIMap*,
LilvWorld* lworld,
const char* str)
: URI(str)
- , _urid_atom(forge.make_urid(URI(str)))
- , _uri_atom(forge.alloc_uri(str))
+ , _urid_atom(ingen_forge.make_urid(URI(str)))
+ , _uri_atom(ingen_forge.alloc_uri(str))
, _lilv_node(lilv_new_uri(lworld, str))
{}
@@ -61,8 +61,8 @@ URIs::Quark::~Quark()
#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define NS_RDFS "http://www.w3.org/2000/01/rdf-schema#"
-URIs::URIs(Forge& forge, URIMap* map, LilvWorld* lworld)
- : forge(forge)
+URIs::URIs(Forge& ingen_forge, URIMap* map, LilvWorld* lworld)
+ : forge(ingen_forge)
, atom_AtomPort (forge, map, lworld, LV2_ATOM__AtomPort)
, atom_Bool (forge, map, lworld, LV2_ATOM__Bool)
, atom_Chunk (forge, map, lworld, LV2_ATOM__Chunk)
diff --git a/src/World.cpp b/src/World.cpp
index b9d1ba1f..5552230f 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -86,7 +86,7 @@ class World::Impl {
public:
Impl(LV2_URID_Map* map,
LV2_URID_Unmap* unmap,
- LV2_Log_Log* lv2_log)
+ LV2_Log_Log* log_feature)
: argc(nullptr)
, argv(nullptr)
, lv2_features(nullptr)
@@ -95,9 +95,8 @@ public:
, uri_map(log, map, unmap)
, forge(uri_map)
, uris(forge, &uri_map, lilv_world.get())
- , lv2_log()
, conf(forge)
- , log(lv2_log, uris)
+ , log(log_feature, uris)
{
lv2_features = new LV2Features();
lv2_features->add_feature(uri_map.urid_map_feature());
@@ -188,7 +187,6 @@ public:
URIMap uri_map;
Forge forge;
URIs uris;
- LV2_Log_Log* lv2_log;
Configuration conf;
Log log;
SPtr<Interface> interface;
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 74b307a5..1320de27 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -313,10 +313,10 @@ ClientStore::operator()(const Put& msg)
SPtr<PluginModel> plug;
if (p->second.is_valid() && (p->second.type() == _uris.forge.URI ||
p->second.type() == _uris.forge.URID)) {
- const URI uri(_uris.forge.str(p->second, false));
- if (!(plug = _plugin(uri))) {
+ const URI plugin_uri(_uris.forge.str(p->second, false));
+ if (!(plug = _plugin(plugin_uri))) {
plug = std::make_shared<PluginModel>(uris(),
- uri,
+ plugin_uri,
Atom(),
Properties());
add_plugin(plug);
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 92a1b295..f72d8a3a 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -123,22 +123,22 @@ PluginModel::get_property(const URI& key) const
LilvNodes* values = lilv_plugin_get_value(_lilv_plugin, lv2_pred);
lilv_node_free(lv2_pred);
LILV_FOREACH(nodes, i, values) {
- const LilvNode* val = lilv_nodes_get(values, i);
- if (lilv_node_is_uri(val)) {
+ const LilvNode* value = lilv_nodes_get(values, i);
+ if (lilv_node_is_uri(value)) {
ret = set_property(
- key, _uris.forge.make_urid(URI(lilv_node_as_uri(val))));
+ key, _uris.forge.make_urid(URI(lilv_node_as_uri(value))));
break;
- } else if (lilv_node_is_string(val)) {
+ } else if (lilv_node_is_string(value)) {
ret = set_property(
- key, _uris.forge.alloc(lilv_node_as_string(val)));
+ key, _uris.forge.alloc(lilv_node_as_string(value)));
break;
- } else if (lilv_node_is_float(val)) {
+ } else if (lilv_node_is_float(value)) {
ret = set_property(
- key, _uris.forge.make(lilv_node_as_float(val)));
+ key, _uris.forge.make(lilv_node_as_float(value)));
break;
- } else if (lilv_node_is_int(val)) {
+ } else if (lilv_node_is_int(value)) {
ret = set_property(
- key, _uris.forge.make(lilv_node_as_int(val)));
+ key, _uris.forge.make(lilv_node_as_int(value)));
break;
}
}
@@ -199,10 +199,10 @@ PluginModel::human_name() const
}
string
-PluginModel::port_human_name(uint32_t i) const
+PluginModel::port_human_name(const uint32_t index) const
{
if (_lilv_plugin) {
- const LilvPort* port = lilv_plugin_get_port_by_index(_lilv_plugin, i);
+ const LilvPort* port = lilv_plugin_get_port_by_index(_lilv_plugin, index);
LilvNode* name = lilv_port_get_name(_lilv_plugin, port);
string ret(lilv_node_as_string(name));
lilv_node_free(name);
@@ -212,12 +212,12 @@ PluginModel::port_human_name(uint32_t i) const
}
PluginModel::ScalePoints
-PluginModel::port_scale_points(uint32_t i) const
+PluginModel::port_scale_points(const uint32_t index) const
{
// TODO: Non-float scale points
ScalePoints points;
if (_lilv_plugin) {
- const LilvPort* port = lilv_plugin_get_port_by_index(_lilv_plugin, i);
+ const LilvPort* port = lilv_plugin_get_port_by_index(_lilv_plugin, index);
LilvScalePoints* sp = lilv_port_get_scale_points(_lilv_plugin, port);
LILV_FOREACH(scale_points, i, sp) {
const LilvScalePoint* p = lilv_scale_points_get(sp, i);
diff --git a/src/gui/GraphBox.cpp b/src/gui/GraphBox.cpp
index 42a4bc23..e245fb0a 100644
--- a/src/gui/GraphBox.cpp
+++ b/src/gui/GraphBox.cpp
@@ -588,8 +588,8 @@ GraphBox::event_save_as()
filename += ".ingen";
basename += ".ingen";
} else if (filename.substr(filename.length() - 4) == ".ttl") {
- const Glib::ustring dir = Glib::path_get_dirname(filename);
- if (dir.substr(dir.length() - 6) != ".ingen") {
+ const Glib::ustring dirname = Glib::path_get_dirname(filename);
+ if (dirname.substr(dirname.length() - 6) != ".ingen") {
error("<b>File does not appear to be in an Ingen bundle.");
}
} else if (filename.substr(filename.length() - 6) != ".ingen") {
diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp
index ff4e5f70..f4b1a0df 100644
--- a/src/gui/GraphTreeWindow.cpp
+++ b/src/gui/GraphTreeWindow.cpp
@@ -36,7 +36,6 @@ GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml)
: Window(cobject)
, _graphs_treeview(nullptr)
- , _app(nullptr)
, _enable_signal(true)
{
xml->get_widget_derived("graphs_treeview", _graphs_treeview);
@@ -70,7 +69,7 @@ GraphTreeWindow::GraphTreeWindow(BaseObjectType* cobject,
void
GraphTreeWindow::init(App& app, ClientStore& store)
{
- _app = &app;
+ init_window(app);
store.signal_new_object().connect(
sigc::mem_fun(this, &GraphTreeWindow::new_object));
}
diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp
index 1e748be7..2c988817 100644
--- a/src/gui/GraphTreeWindow.hpp
+++ b/src/gui/GraphTreeWindow.hpp
@@ -84,7 +84,6 @@ protected:
Gtk::TreeModelColumn<SPtr<client::GraphModel> > graph_model_col;
};
- App* _app;
GraphTreeModelColumns _graph_tree_columns;
Glib::RefPtr<Gtk::TreeStore> _graph_treestore;
Glib::RefPtr<Gtk::TreeSelection> _graph_tree_selection;
@@ -115,8 +114,7 @@ public:
private:
GraphTreeWindow* _window;
-
-}; // struct GraphTreeView
+};
} // namespace gui
} // namespace ingen
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index f333d3d2..c5015a39 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -504,7 +504,6 @@ NodeModule::on_selected(gboolean selected)
}
if (selected && win->documentation_is_visible()) {
- GraphWindow* win = app().window_factory()->parent_graph_window(block());
std::string doc;
bool html = false;
#ifdef HAVE_WEBKIT
diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index 084e8e72..4e62abd4 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -100,12 +100,12 @@ Buffer::recycle()
}
void
-Buffer::set_type(GetFn get, LV2_URID type, LV2_URID value_type)
+Buffer::set_type(GetFn get_func, LV2_URID type, LV2_URID value_type)
{
_type = type;
_value_type = value_type;
if (type == _factory.uris().atom_Sequence && value_type) {
- _value_buffer = (_factory.*get)(value_type, 0, 0);
+ _value_buffer = (_factory.*get_func)(value_type, 0, 0);
}
}
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index e22e89e6..7593900e 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -73,11 +73,11 @@ public:
/** Set the buffer type and optional value type for this buffer.
*
- * @param get Called to get auxiliary buffers if necessary.
+ * @param get_func Called to get auxiliary buffers if necessary.
* @param type Type of buffer.
* @param value_type Type of values in buffer if applicable (for sequences).
*/
- void set_type(GetFn get, LV2_URID type, LV2_URID value_type);
+ void set_type(GetFn get_func, LV2_URID type, LV2_URID value_type);
inline bool is_audio() const {
return _type == _factory.uris().atom_Sound;
diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp
index dbd8b062..ba4cc11e 100644
--- a/src/server/CompiledGraph.cpp
+++ b/src/server/CompiledGraph.cpp
@@ -39,13 +39,16 @@ namespace server {
/** Graph contains ambiguous feedback with no delay nodes. */
class FeedbackException : public std::exception {
public:
- explicit FeedbackException(const BlockImpl* node,
- const BlockImpl* root = nullptr)
- : node(node), root(root)
+ explicit FeedbackException(const BlockImpl* n)
+ : node(n)
{}
- const BlockImpl* node;
- const BlockImpl* root;
+ FeedbackException(const BlockImpl* n, const BlockImpl* r)
+ : node(n), root(r)
+ {}
+
+ const BlockImpl* node = nullptr;
+ const BlockImpl* root = nullptr;
};
static bool
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index 087be26c..cfe9757a 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -155,8 +155,8 @@ Engine::~Engine()
// Delete run contexts
_quit_flag = true;
_tasks_available.notify_all();
- for (const auto& ctx : _run_contexts) {
- ctx->join();
+ for (const auto& thread_ctx : _run_contexts) {
+ thread_ctx->join();
}
const SPtr<Store> store = this->store();
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index 090ae8af..0bdcacc2 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -406,10 +406,10 @@ LV2Block::instantiate(BufferFactory& bufs, const LilvState* state)
for (int p = 0; preds[p]; ++p) {
LilvNodes* values = lilv_port_get_value(plug, id, preds[p]);
LILV_FOREACH(nodes, v, values) {
- const LilvNode* val = lilv_nodes_get(values, v);
- if (lilv_node_is_uri(val)) {
+ const LilvNode* value = lilv_nodes_get(values, v);
+ if (lilv_node_is_uri(value)) {
port->add_property(URI(lilv_node_as_uri(preds[p])),
- forge.make_urid(URI(lilv_node_as_uri(val))));
+ forge.make_urid(URI(lilv_node_as_uri(value))));
}
}
lilv_nodes_free(values);
@@ -713,13 +713,13 @@ LV2Block::save_preset(const URI& uri,
lilv_state_save(lworld, lmap, lunmap, state, nullptr,
dirname.c_str(), basename.c_str());
- const URI uri(lilv_node_as_uri(lilv_state_get_uri(state)));
+ const URI state_uri(lilv_node_as_uri(lilv_state_get_uri(state)));
const std::string label(lilv_state_get_label(state)
? lilv_state_get_label(state)
: basename);
lilv_state_free(state);
- Resource preset(_uris, uri);
+ Resource preset(_uris, state_uri);
preset.set_property(_uris.rdf_type, _uris.pset_Preset);
preset.set_property(_uris.rdfs_label, world.forge().alloc(label));
preset.set_property(_uris.lv2_appliesTo,
diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp
index 7aea1ba5..82527d12 100644
--- a/src/server/UndoStack.cpp
+++ b/src/server/UndoStack.cpp
@@ -118,7 +118,7 @@ UndoStack::pop()
}
struct BlankIDs {
- explicit BlankIDs(char c='b') : c(c) {}
+ explicit BlankIDs(char prefix='b') : c(prefix) {}
SerdNode get() {
snprintf(buf, sizeof(buf), "%c%u", c, n++);
@@ -131,12 +131,16 @@ struct BlankIDs {
};
struct ListContext {
- explicit ListContext(BlankIDs& ids, unsigned flags, const SerdNode* s, const SerdNode* p)
- : ids(ids)
- , s(*s)
- , p(*p)
- , flags(flags | SERD_LIST_O_BEGIN)
- {}
+ explicit ListContext(BlankIDs& blank_ids,
+ unsigned statement_flags,
+ const SerdNode* subject,
+ const SerdNode* predicate)
+ : ids(blank_ids)
+ , s(*subject)
+ , p(*predicate)
+ , flags(statement_flags | SERD_LIST_O_BEGIN)
+ {
+ }
SerdNode start_node(SerdWriter* writer) {
const SerdNode node = ids.get();
diff --git a/src/server/UndoStack.hpp b/src/server/UndoStack.hpp
index 22d48379..74cb6cfe 100644
--- a/src/server/UndoStack.hpp
+++ b/src/server/UndoStack.hpp
@@ -41,7 +41,7 @@ namespace server {
class INGEN_API UndoStack : public AtomSink {
public:
struct Entry {
- Entry(time_t time=0) : time(time) {}
+ Entry(time_t t=0) : time(t) {}
Entry(const Entry& copy)
: time(copy.time)
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 28919a50..87f855ee 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -423,9 +423,8 @@ Delta::pre_process(PreProcessContext& ctx)
} else if (value.type() != uris.forge.Bool) {
_status = Status::BAD_VALUE_TYPE;
} else {
- op = SpecialType::POLYPHONIC;
+ op = SpecialType::POLYPHONIC;
obj->set_property(key, value, value.context());
- auto* block = dynamic_cast<BlockImpl*>(obj);
if (block) {
block->set_polyphonic(value.get<int32_t>());
}
@@ -446,9 +445,9 @@ Delta::pre_process(PreProcessContext& ctx)
lilv_world_load_bundle(lworld, bundle);
const auto new_plugins = _engine.block_factory()->refresh();
- for (const auto& p : new_plugins) {
- if (p->bundle_uri() == lilv_node_as_string(bundle)) {
- _update.put_plugin(p.get());
+ for (const auto& plugin : new_plugins) {
+ if (plugin->bundle_uri() == lilv_node_as_string(bundle)) {
+ _update.put_plugin(plugin.get());
}
}
lilv_node_free(bundle);
diff --git a/src/server/mix.cpp b/src/server/mix.cpp
index 6bd36ab1..aa9d5a1d 100644
--- a/src/server/mix.cpp
+++ b/src/server/mix.cpp
@@ -58,12 +58,12 @@ mix(const RunContext& ctx,
for (uint32_t i = 1; i < num_srcs; ++i) {
const Sample* __restrict const in = srcs[i]->samples();
if (srcs[i]->is_control()) { // control => audio
- for (SampleCount i = 0; i < end; ++i) {
- out[i] += in[0];
+ for (SampleCount j = 0; j < end; ++j) {
+ out[j] += in[0];
}
} else if (srcs[i]->is_audio()) { // audio => audio
- for (SampleCount i = 0; i < end; ++i) {
- out[i] += in[i];
+ for (SampleCount j = 0; j < end; ++j) {
+ out[j] += in[j];
}
} else if (srcs[i]->is_sequence()) { // sequence => audio
dst->render_sequence(ctx, srcs[i], true);
diff --git a/wscript b/wscript
index 9c7181d7..3ac2db63 100644
--- a/wscript
+++ b/wscript
@@ -76,9 +76,7 @@ def configure(conf):
'-Wno-implicit-int-conversion',
'-Wno-padded',
'-Wno-reserved-id-macro',
- '-Wno-shadow',
'-Wno-shadow-field',
- '-Wno-shadow-field-in-constructor',
'-Wno-shorten-64-to-32',
'-Wno-sign-conversion',
'-Wno-switch-enum',
@@ -103,7 +101,6 @@ def configure(conf):
'-Wno-multiple-inheritance',
'-Wno-padded',
'-Wno-pedantic',
- '-Wno-shadow',
'-Wno-sign-conversion',
'-Wno-stack-protector',
'-Wno-suggest-attribute=format',
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 23:24:19 +0000