diff options
39 files changed, 111 insertions, 112 deletions
diff --git a/ingen/LV2Features.hpp b/ingen/LV2Features.hpp index f8006fc4..9995ff47 100644 --- a/ingen/LV2Features.hpp +++ b/ingen/LV2Features.hpp @@ -83,7 +83,7 @@ protected: bool is_supported(const std::string& uri) const; SPtr<FeatureArray> lv2_features(World* world, - Node* block) const; + Node* node) const; private: typedef std::vector< SPtr<Feature> > Features; diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp index aa047e51..8cfdb02a 100644 --- a/ingen/Resource.hpp +++ b/ingen/Resource.hpp @@ -142,17 +142,17 @@ public: * for one property may exist in `p` will all be set (unlike simply * calling set_property in a loop which would only set one value). */ - void set_properties(const Properties& p); + void set_properties(const Properties& props); /** Add several properties at once. */ - void add_properties(const Properties& p); + void add_properties(const Properties& props); /** Remove several properties at once. * * This removes all matching properties (both key and value), or all * properties with a matching key if the value in `p` is patch:wildcard. */ - void remove_properties(const Properties& p); + void remove_properties(const Properties& props); /** Hook called whenever a property is added. * diff --git a/ingen/Serialiser.hpp b/ingen/Serialiser.hpp index c7a71627..00466350 100644 --- a/ingen/Serialiser.hpp +++ b/ingen/Serialiser.hpp @@ -45,7 +45,7 @@ public: /** Write a graph and all its contents as a complete bundle. */ virtual void write_bundle(SPtr<const Node> graph, - const std::string& path); + const std::string& uri); /** Begin a serialization to a string. * diff --git a/ingen/Store.hpp b/ingen/Store.hpp index f439c523..485b7355 100644 --- a/ingen/Store.hpp +++ b/ingen/Store.hpp @@ -70,7 +70,7 @@ public: * * Note this invalidates `i`. */ - void rename(iterator i, const Raul::Path& new_path); + void rename(iterator top, const Raul::Path& new_path); unsigned child_name_offset(const Raul::Path& parent, const Raul::Symbol& symbol, diff --git a/ingen/URIMap.hpp b/ingen/URIMap.hpp index b07d4f50..6ad8c684 100644 --- a/ingen/URIMap.hpp +++ b/ingen/URIMap.hpp @@ -63,7 +63,7 @@ public: }; struct URIDMapFeature : public Feature { - URIDMapFeature(URIMap* map, LV2_URID_Map* urid_map, Log& log); + URIDMapFeature(URIMap* map, LV2_URID_Map* impl, Log& log); LV2_URID map(const char* uri); static LV2_URID default_map(LV2_URID_Map_Handle h, const char* uri); LV2_URID_Map urid_map; @@ -71,9 +71,9 @@ public: }; struct URIDUnmapFeature : public Feature { - URIDUnmapFeature(URIMap* map, LV2_URID_Unmap* urid_unmap); + URIDUnmapFeature(URIMap* map, LV2_URID_Unmap* impl); const char* unmap(const LV2_URID urid); - static const char* default_unmap(LV2_URID_Map_Handle h, LV2_URID uri); + static const char* default_unmap(LV2_URID_Map_Handle h, LV2_URID urid); LV2_URID_Unmap urid_unmap; }; diff --git a/ingen/World.hpp b/ingen/World.hpp index 30f71a61..21d6c33b 100644 --- a/ingen/World.hpp +++ b/ingen/World.hpp @@ -111,7 +111,7 @@ public: const std::string& filename); virtual void set_engine(SPtr<EngineBase> e); - virtual void set_interface(SPtr<Interface> e); + virtual void set_interface(SPtr<Interface> i); virtual void set_store(SPtr<Store> s); virtual SPtr<EngineBase> engine(); diff --git a/ingen/client/BlockModel.hpp b/ingen/client/BlockModel.hpp index e689414c..22613eca 100644 --- a/ingen/client/BlockModel.hpp +++ b/ingen/client/BlockModel.hpp @@ -96,7 +96,7 @@ protected: void add_child(SPtr<ObjectModel> c); bool remove_child(SPtr<ObjectModel> c); void add_port(SPtr<PortModel> pm); - void remove_port(SPtr<PortModel> pm); + void remove_port(SPtr<PortModel> port); void remove_port(const Raul::Path& port_path); void set(SPtr<ObjectModel> model); diff --git a/ingen/client/ClientStore.hpp b/ingen/client/ClientStore.hpp index 45662afb..8850f401 100644 --- a/ingen/client/ClientStore.hpp +++ b/ingen/client/ClientStore.hpp @@ -105,7 +105,7 @@ private: void add_object(SPtr<ObjectModel> object); SPtr<ObjectModel> remove_object(const Raul::Path& path); - void add_plugin(SPtr<PluginModel> plugin); + void add_plugin(SPtr<PluginModel> pm); SPtr<GraphModel> connection_graph(const Raul::Path& tail_path, const Raul::Path& head_path); diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp index 52c5ed2c..ef072d87 100644 --- a/ingen/client/GraphModel.hpp +++ b/ingen/client/GraphModel.hpp @@ -60,7 +60,7 @@ private: void clear(); void add_child(SPtr<ObjectModel> c); - bool remove_child(SPtr<ObjectModel> c); + bool remove_child(SPtr<ObjectModel> o); void remove_arcs_on(SPtr<PortModel> p); void add_arc(SPtr<ArcModel> arc); diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp index a8210ac0..4250efc5 100644 --- a/ingen/client/ObjectModel.hpp +++ b/ingen/client/ObjectModel.hpp @@ -89,7 +89,7 @@ protected: virtual void add_child(SPtr<ObjectModel> c) {} virtual bool remove_child(SPtr<ObjectModel> c) { return true; } - virtual void set(SPtr<ObjectModel> model); + virtual void set(SPtr<ObjectModel> o); SPtr<ObjectModel> _parent; diff --git a/ingen/client/PluginModel.hpp b/ingen/client/PluginModel.hpp index d6b253f3..585ac7d7 100644 --- a/ingen/client/PluginModel.hpp +++ b/ingen/client/PluginModel.hpp @@ -65,7 +65,7 @@ public: Raul::Symbol default_block_symbol() const; std::string human_name() const; - std::string port_human_name(uint32_t index) const; + std::string port_human_name(uint32_t i) const; typedef std::map<float, std::string> ScalePoints; ScalePoints port_scale_points(uint32_t i) const; diff --git a/src/Parser.cpp b/src/Parser.cpp index 3df7194f..bf7dc82a 100644 --- a/src/Parser.cpp +++ b/src/Parser.cpp @@ -345,10 +345,10 @@ parse_graph(Ingen::World* world, Ingen::Interface* target, Sord::Model& model, const std::string& base_uri, - const Sord::Node& subject_node, + const Sord::Node& subject, Resource::Graph ctx, boost::optional<Raul::Path> parent, - boost::optional<Raul::Symbol> a_symbol, + boost::optional<Raul::Symbol> symbol, boost::optional<Properties> data) { const URIs& uris = world->uris(); @@ -356,23 +356,22 @@ parse_graph(Ingen::World* world, const Sord::URI ingen_block(*world->rdf_world(), uris.ingen_block); const Sord::URI lv2_port(*world->rdf_world(), LV2_CORE__port); - const Sord::Node& graph = subject_node; + const Sord::Node& graph = subject; const Sord::Node nil; - Raul::Symbol symbol("_"); - if (a_symbol) { - symbol = *a_symbol; - } - - string graph_path_str = relative_uri(base_uri, subject_node.to_string(), true); - if (parent && a_symbol) { - graph_path_str = parent->child(*a_symbol); + string graph_path_str = relative_uri(base_uri, subject.to_string(), true); + if (parent && symbol) { + graph_path_str = parent->child(*symbol); } else if (parent) { graph_path_str = *parent; } else { graph_path_str = "/"; } + if (!symbol) { + symbol = Raul::Symbol("_"); + } + if (!Raul::Path::is_valid(graph_path_str)) { world->log().error(fmt("Graph %1% has invalid path\n") % graph_path_str); @@ -381,7 +380,7 @@ parse_graph(Ingen::World* world, // Create graph Raul::Path graph_path(graph_path_str); - Properties props = get_properties(world, model, subject_node, ctx); + Properties props = get_properties(world, model, subject, ctx); target->put(path_to_uri(graph_path), props, ctx); // For each port on this graph @@ -420,7 +419,7 @@ parse_graph(Ingen::World* world, } // For each block in this graph - for (Sord::Iter n = model.find(subject_node, ingen_block, nil); !n.end(); ++n) { + for (Sord::Iter n = model.find(subject, ingen_block, nil); !n.end(); ++n) { Sord::Node node = n.get_object(); const Raul::Path block_path = graph_path.child( Raul::Symbol(get_basename(node.to_string()))); @@ -456,7 +455,7 @@ parse_graph(Ingen::World* world, } // Now that all ports and blocks exist, create arcs inside graph - parse_arcs(world, target, model, base_uri, subject_node, graph_path); + parse_arcs(world, target, model, base_uri, subject, graph_path); return graph_path; } diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index ad6e5edc..e0c504a2 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -69,16 +69,16 @@ struct Serialiser::Impl { void start_to_file(const Raul::Path& root, const std::string& filename); - std::set<const Resource*> serialise_graph(SPtr<const Node> p, - const Sord::Node& id); + std::set<const Resource*> serialise_graph(SPtr<const Node> graph, + const Sord::Node& graph_id); - void serialise_block(SPtr<const Node> n, + void serialise_block(SPtr<const Node> block, const Sord::Node& class_id, - const Sord::Node& id); + const Sord::Node& block_id); - void serialise_port(const Node* p, + void serialise_port(const Node* port, Resource::Graph context, - const Sord::Node& id); + const Sord::Node& port_id); void serialise_properties(Sord::Node id, const Properties& props); @@ -95,7 +95,7 @@ struct Serialiser::Impl { const std::set<const Resource*> plugins); void serialise_arc(const Sord::Node& parent, - SPtr<const Arc> a) + SPtr<const Arc> arc) throw (std::logic_error); std::string finish(); @@ -183,16 +183,16 @@ Serialiser::Impl::write_plugins(const std::string& bundle_path, void Serialiser::write_bundle(SPtr<const Node> graph, - const std::string& path) + const std::string& uri) { - me->write_bundle(graph, path); + me->write_bundle(graph, uri); } void Serialiser::Impl::write_bundle(SPtr<const Node> graph, - const std::string& a_path) + const std::string& uri) { - std::string path = Glib::filename_from_uri(a_path); + std::string path = Glib::filename_from_uri(uri); if (Glib::file_test(path, Glib::FILE_TEST_EXISTS) && !Glib::file_test(path, Glib::FILE_TEST_IS_DIR)) { path = Glib::path_get_dirname(path); diff --git a/src/URIMap.cpp b/src/URIMap.cpp index e0b5ab0d..b50fd4b7 100644 --- a/src/URIMap.cpp +++ b/src/URIMap.cpp @@ -34,9 +34,9 @@ URIMap::URIMap(Log& log, LV2_URID_Map* map, LV2_URID_Unmap* unmap) URIMap::URIDMapFeature::URIDMapFeature(URIMap* map, LV2_URID_Map* impl, - Log& alog) + Log& log) : Feature(LV2_URID__map, &urid_map) - , log(alog) + , log(log) { if (impl) { urid_map = *impl; @@ -47,7 +47,7 @@ URIMap::URIDMapFeature::URIDMapFeature(URIMap* map, } LV2_URID -URIMap::URIDMapFeature::default_map(LV2_URID_Map_Handle handle, +URIMap::URIDMapFeature::default_map(LV2_URID_Map_Handle h, const char* uri) { return static_cast<LV2_URID>(g_quark_from_string(uri)); @@ -76,7 +76,7 @@ URIMap::URIDUnmapFeature::URIDUnmapFeature(URIMap* map, } const char* -URIMap::URIDUnmapFeature::default_unmap(LV2_URID_Unmap_Handle handle, +URIMap::URIDUnmapFeature::default_unmap(LV2_URID_Unmap_Handle h, LV2_URID urid) { return g_quark_to_string(urid); diff --git a/src/URIs.cpp b/src/URIs.cpp index a46c18bc..3e56e4f4 100644 --- a/src/URIs.cpp +++ b/src/URIs.cpp @@ -39,11 +39,11 @@ namespace Ingen { URIs::Quark::Quark(Forge& forge, URIMap* map, LilvWorld* lworld, - const char* c_str) - : Raul::URI(c_str) - , urid(forge.make_urid(Raul::URI(c_str))) - , uri(forge.alloc_uri(c_str)) - , lnode(lilv_new_uri(lworld, c_str)) + const char* str) + : Raul::URI(str) + , urid(forge.make_urid(Raul::URI(str))) + , uri(forge.alloc_uri(str)) + , lnode(lilv_new_uri(lworld, str)) {} URIs::Quark::Quark(const Quark& copy) @@ -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& f, URIMap* map, LilvWorld* lworld) - : forge(f) +URIs::URIs(Forge& forge, URIMap* map, LilvWorld* lworld) + : forge(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/gui/App.hpp b/src/gui/App.hpp index e226751b..22451846 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -74,7 +74,7 @@ class INGEN_API App public: ~App(); - void error_message(const std::string& msg); + void error_message(const std::string& str); void attach(SPtr<Client::SigClientInterface> client); diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index 560bd82b..b3b7473e 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -58,7 +58,7 @@ public: private: enum class Mode { CONNECT_REMOTE, LAUNCH_REMOTE, INTERNAL }; - void message(const Message& message); + void message(const Message& msg); void error(const std::string& msg); diff --git a/src/gui/GraphBox.hpp b/src/gui/GraphBox.hpp index 20e0a764..ee054e17 100644 --- a/src/gui/GraphBox.hpp +++ b/src/gui/GraphBox.hpp @@ -86,7 +86,7 @@ public: SPtr<const Client::GraphModel> graph() const { return _graph; } SPtr<GraphView> view() const { return _view; } - void show_port_status(const Client::PortModel* model, + void show_port_status(const Client::PortModel* port, const Atom& value); void set_graph_from_path(const Raul::Path& path, SPtr<GraphView> view); diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp index c2212426..f283354e 100644 --- a/src/gui/GraphCanvas.hpp +++ b/src/gui/GraphCanvas.hpp @@ -58,18 +58,18 @@ public: App& app() { return _app; } void build(); - void show_human_names(bool show); - void show_port_names(bool show); + void show_human_names(bool b); + void show_port_names(bool b); bool show_port_names() const { return _show_port_names; } - void add_plugin(SPtr<Client::PluginModel> pm); + void add_plugin(SPtr<Client::PluginModel> p); void remove_plugin(const Raul::URI& uri); void add_block(SPtr<const Client::BlockModel> bm); void remove_block(SPtr<const Client::BlockModel> bm); void add_port(SPtr<const Client::PortModel> pm); void remove_port(SPtr<const Client::PortModel> pm); - void connection(SPtr<const Client::ArcModel> am); - void disconnection(SPtr<const Client::ArcModel> am); + void connection(SPtr<const Client::ArcModel> arc); + void disconnection(SPtr<const Client::ArcModel> arc); void get_new_module_location(double& x, double& y); @@ -85,7 +85,7 @@ public: private: enum class ControlType { NUMBER, BUTTON }; void generate_port_name( - const std::string& sym_base, std::string& sym, + const std::string& sym_base, std::string& symbol, const std::string& name_base, std::string& name); void menu_add_port(const std::string& sym_base, @@ -97,7 +97,7 @@ private: void menu_new_graph(); void menu_load_graph(); void menu_properties(); - void load_plugin(WPtr<Client::PluginModel> plugin); + void load_plugin(WPtr<Client::PluginModel> weak_plugin); void build_menus(); @@ -109,11 +109,11 @@ private: Ganv::Port* get_port_view(SPtr<Client::PortModel> port); - void connect(Ganv::Node* src, - Ganv::Node* dst); + void connect(Ganv::Node* tail, + Ganv::Node* head); - void disconnect(Ganv::Node* src, - Ganv::Node* dst); + void disconnect(Ganv::Node* tail, + Ganv::Node* head); App& _app; SPtr<const Client::GraphModel> _graph; diff --git a/src/gui/GraphPortModule.hpp b/src/gui/GraphPortModule.hpp index 9722e330..79229be6 100644 --- a/src/gui/GraphPortModule.hpp +++ b/src/gui/GraphPortModule.hpp @@ -52,7 +52,7 @@ public: App& app() const; - virtual void store_location(double x, double y); + virtual void store_location(double ax, double ay); void show_human_names(bool b); void set_name(const std::string& n); @@ -68,7 +68,7 @@ protected: void set_port(Port* port) { _port = port; } - void property_changed(const Raul::URI& predicate, const Atom& value); + void property_changed(const Raul::URI& key, const Atom& value); SPtr<const Client::PortModel> _model; Port* _port; diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index b48c7970..af767a2a 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -51,12 +51,12 @@ public: void graph_property_changed(const Raul::URI& key, const Atom& value, - SPtr<Client::GraphModel> gm); + SPtr<Client::GraphModel> graph); void graph_moved(SPtr<Client::GraphModel> graph); - void add_graph(SPtr<Client::GraphModel> gm); - void remove_graph(SPtr<Client::GraphModel> gm); + void add_graph(SPtr<Client::GraphModel> pm); + void remove_graph(SPtr<Client::GraphModel> pm); void show_graph_menu(GdkEventButton* ev); protected: diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index e38760a6..71ac76e2 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -114,7 +114,7 @@ private: void set_row(Gtk::TreeModel::Row& row, SPtr<const Client::PluginModel> plugin); - void new_plugin(SPtr<const Client::PluginModel> plugin); + void new_plugin(SPtr<const Client::PluginModel> pm); void plugin_property_changed(const Raul::URI& plugin, const Raul::URI& predicate, diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp index 193ef18d..fa9eae1d 100644 --- a/src/gui/MessagesWindow.hpp +++ b/src/gui/MessagesWindow.hpp @@ -49,7 +49,7 @@ public: int log(LV2_URID type, const char* fmt, va_list args); void flush(); - void post_error(const std::string& str); + void post_error(const std::string& msg); private: void clear_clicked(); diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 86103a03..f2381999 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -49,7 +49,7 @@ public: static NodeModule* create( GraphCanvas& canvas, SPtr<const Client::BlockModel> block, - bool human_names); + bool human); virtual ~NodeModule(); @@ -57,9 +57,9 @@ public: Port* port(SPtr<const Client::PortModel> model); - void delete_port_view(SPtr<const Client::PortModel> port); + void delete_port_view(SPtr<const Client::PortModel> model); - virtual void store_location(double x, double y); + virtual void store_location(double ax, double ay); void show_human_names(bool b); SPtr<const Client::BlockModel> block() const { return _block; } @@ -79,7 +79,7 @@ protected: bool on_selected(gboolean selected); void rename(); - void property_changed(const Raul::URI& predicate, const Atom& value); + void property_changed(const Raul::URI& key, const Atom& value); void new_port_view(SPtr<const Client::PortModel> port); diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp index 6819503a..c9a2c9f4 100644 --- a/src/gui/PropertiesWindow.hpp +++ b/src/gui/PropertiesWindow.hpp @@ -84,7 +84,7 @@ private: bool datatype_supported(const std::set<Raul::URI>& types, Raul::URI* widget_type); - bool class_supported(const std::set<Raul::URI>& type); + bool class_supported(const std::set<Raul::URI>& types); Gtk::Widget* create_value_widget(const Raul::URI& key, const char* type_uri, diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp index a64a8759..1b8df2fa 100644 --- a/src/gui/SubgraphModule.hpp +++ b/src/gui/SubgraphModule.hpp @@ -41,13 +41,13 @@ class SubgraphModule : public NodeModule { public: SubgraphModule(GraphCanvas& canvas, - SPtr<const Client::GraphModel> controller); + SPtr<const Client::GraphModel> graph); virtual ~SubgraphModule() {} - bool on_double_click(GdkEventButton* ev); + bool on_double_click(GdkEventButton* event); - void store_location(double x, double y); + void store_location(double ax, double ay); void browse_to_graph(); void menu_remove(); diff --git a/src/gui/URIEntry.hpp b/src/gui/URIEntry.hpp index d8f830d0..f49f5b0d 100644 --- a/src/gui/URIEntry.hpp +++ b/src/gui/URIEntry.hpp @@ -48,7 +48,7 @@ private: Gtk::Menu* build_subclass_menu(const LilvNode* klass); void add_leaf_menu_item(Gtk::Menu* menu, - const LilvNode* klass, + const LilvNode* node, const std::string& label); void add_class_menu_item(Gtk::Menu* menu, diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 6754dce4..ea8b909b 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -60,7 +60,7 @@ public: GraphWindow* parent_graph_window(SPtr<const Client::BlockModel> block); void present_graph( - SPtr<const Client::GraphModel> model, + SPtr<const Client::GraphModel> graph, GraphWindow* preferred = NULL, SPtr<GraphView> view = SPtr<GraphView>()); 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); |