diff options
61 files changed, 297 insertions, 304 deletions
diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp index 2af4eb76..3137a679 100644 --- a/ingen/Interface.hpp +++ b/ingen/Interface.hpp @@ -57,7 +57,7 @@ public: virtual SPtr<Interface> respondee() const { return SPtr<Interface>(); } - virtual void set_respondee(SPtr<Interface> respondee) {} + virtual void set_respondee(SPtr<Interface>) {} virtual void message(const Message& msg) = 0; diff --git a/ingen/LV2Features.hpp b/ingen/LV2Features.hpp index 541af576..2b6008f2 100644 --- a/ingen/LV2Features.hpp +++ b/ingen/LV2Features.hpp @@ -57,7 +57,7 @@ protected: const char* uri() const override { return _uri; } - SPtr<LV2_Feature> feature(World* world, Node* block) override { + SPtr<LV2_Feature> feature(World*, Node*) override { return SPtr<LV2_Feature>(); } diff --git a/ingen/Module.hpp b/ingen/Module.hpp index 405f4fa1..6354ed96 100644 --- a/ingen/Module.hpp +++ b/ingen/Module.hpp @@ -40,8 +40,8 @@ public: Module(const Module&) = delete; Module& operator=(const Module&) = delete; - virtual void load(ingen::World* world) = 0; - virtual void run(ingen::World* world) {} + virtual void load(ingen::World*) = 0; + virtual void run(ingen::World*) {} /** Library implementing this module. * diff --git a/ingen/Node.hpp b/ingen/Node.hpp index 90a6e53f..cd900f9c 100644 --- a/ingen/Node.hpp +++ b/ingen/Node.hpp @@ -69,13 +69,13 @@ public: const Arcs& arcs() const { return _arcs; } // Blocks and graphs only - virtual uint32_t num_ports() const { return 0; } - virtual Node* port(uint32_t index) const { return nullptr; } - virtual const Resource* plugin() const { return nullptr; } + virtual uint32_t num_ports() const { return 0; } + virtual Node* port(uint32_t) const { return nullptr; } + virtual const Resource* plugin() const { return nullptr; } // Plugin blocks only virtual LilvInstance* instance() { return nullptr; } - virtual bool save_state(const FilePath& dir) const { return false; } + virtual bool save_state(const FilePath&) const { return false; } // All objects virtual GraphType graph_type() const = 0; diff --git a/ingen/Resource.hpp b/ingen/Resource.hpp index 94d92e12..0a1c5ec8 100644 --- a/ingen/Resource.hpp +++ b/ingen/Resource.hpp @@ -157,7 +157,7 @@ public: * This can be used by derived classes to implement special behaviour for * particular properties (e.g. ingen:value for ports). */ - virtual void on_property(const URI& uri, const Atom& value) {} + virtual void on_property(const URI&, const Atom&) {} /** Hook called whenever a property value is removed. * @@ -166,7 +166,7 @@ public: * This can be used by derived classes to implement special behaviour for * particular properties (e.g. ingen:value for ports). */ - virtual void on_property_removed(const URI& uri, const Atom& value) {} + virtual void on_property_removed(const URI&, const Atom&) {} /** Get the ingen type from a set of Properties. * diff --git a/ingen/URIs.hpp b/ingen/URIs.hpp index eb657473..71c56678 100644 --- a/ingen/URIs.hpp +++ b/ingen/URIs.hpp @@ -39,13 +39,10 @@ class URIMap; */ class INGEN_API URIs : public Raul::Noncopyable { public: - URIs(ingen::Forge& forge, URIMap* map, LilvWorld* lworld); + URIs(ingen::Forge& forge, LilvWorld* lworld); struct Quark : public URI { - Quark(ingen::Forge& forge, - URIMap* map, - LilvWorld* lworld, - const char* str); + Quark(ingen::Forge& forge, LilvWorld* lworld, const char* str); Quark(const Quark& copy); diff --git a/ingen/client/ObjectModel.hpp b/ingen/client/ObjectModel.hpp index 0c517ccf..fe5b64d8 100644 --- a/ingen/client/ObjectModel.hpp +++ b/ingen/client/ObjectModel.hpp @@ -86,8 +86,8 @@ protected: void set_path(const Raul::Path& p) override; virtual void set_parent(SPtr<ObjectModel> p); - virtual void add_child(SPtr<ObjectModel> c) {} - virtual bool remove_child(SPtr<ObjectModel> c) { return true; } + virtual void add_child(SPtr<ObjectModel>) {} + virtual bool remove_child(SPtr<ObjectModel>) { return true; } virtual void set(SPtr<ObjectModel> o); diff --git a/ingen/client/PortModel.hpp b/ingen/client/PortModel.hpp index fcb46c4f..45ce7fbf 100644 --- a/ingen/client/PortModel.hpp +++ b/ingen/client/PortModel.hpp @@ -82,8 +82,8 @@ private: , _direction(dir) {} - void add_child(SPtr<ObjectModel> c) override { throw; } - bool remove_child(SPtr<ObjectModel> c) override { throw; } + void add_child(SPtr<ObjectModel>) override { throw; } + bool remove_child(SPtr<ObjectModel>) override { throw; } void set(SPtr<ObjectModel> model) override; diff --git a/ingen/types.hpp b/ingen/types.hpp index 5e0d7506..7bb73441 100644 --- a/ingen/types.hpp +++ b/ingen/types.hpp @@ -25,7 +25,7 @@ namespace ingen { template <class T> -void NullDeleter(T* ptr) {} +void NullDeleter(T*) {} template <class T> struct FreeDeleter { void operator()(T* const ptr) { free(ptr); } }; diff --git a/src/Log.cpp b/src/Log.cpp index c1f8cb0a..1e4901a1 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -37,6 +37,8 @@ Log::rt_error(const char* msg) #ifndef NDEBUG va_list args; vtprintf(_uris.log_Error, msg, args); +#else + (void)msg; #endif } diff --git a/src/Serialiser.cpp b/src/Serialiser.cpp index 36d4a87f..73bbc063 100644 --- a/src/Serialiser.cpp +++ b/src/Serialiser.cpp @@ -80,8 +80,7 @@ struct Serialiser::Impl { Sord::Node path_rdf_node(const Raul::Path& path); - void write_manifest(const FilePath& bundle_path, - SPtr<const Node> graph); + void write_manifest(const FilePath& bundle_path); void write_plugins(const FilePath& bundle_path, const std::set<const Resource*> plugins); @@ -110,8 +109,7 @@ Serialiser::~Serialiser() } void -Serialiser::Impl::write_manifest(const FilePath& bundle_path, - SPtr<const Node> graph) +Serialiser::Impl::write_manifest(const FilePath& bundle_path) { const FilePath manifest_path(bundle_path / "manifest.ttl"); const FilePath binary_path(ingen_module_path("lv2")); @@ -199,7 +197,7 @@ Serialiser::Impl::write_bundle(SPtr<const Node> graph, const URI& uri) Sord::URI(_model->world(), main_file, _base_uri)); finish(); - write_manifest(path, graph); + write_manifest(path); write_plugins(path, plugins); _root_path = old_root_path; diff --git a/src/TurtleWriter.cpp b/src/TurtleWriter.cpp index 9bceaa06..55dcb766 100644 --- a/src/TurtleWriter.cpp +++ b/src/TurtleWriter.cpp @@ -84,7 +84,7 @@ TurtleWriter::~TurtleWriter() } bool -TurtleWriter::write(const LV2_Atom* msg, int32_t default_id) +TurtleWriter::write(const LV2_Atom* msg, int32_t /*default_id*/) { if (!_wrote_prefixes) { // Write namespace prefixes once to reduce traffic diff --git a/src/URIs.cpp b/src/URIs.cpp index 90f351b1..f9d12fec 100644 --- a/src/URIs.cpp +++ b/src/URIs.cpp @@ -36,14 +36,11 @@ namespace ingen { -URIs::Quark::Quark(Forge& forge, - URIMap* map, - LilvWorld* lworld, - const char* str) - : URI(str) - , urid(forge.make_urid(URI(str))) - , uri(forge.alloc_uri(str)) - , lnode(lilv_new_uri(lworld, str)) +URIs::Quark::Quark(Forge& forge, LilvWorld* lworld, const char* str) + : URI(str) + , urid(forge.make_urid(URI(str))) + , uri(forge.alloc_uri(str)) + , lnode(lilv_new_uri(lworld, str)) {} URIs::Quark::Quark(const Quark& copy) @@ -61,144 +58,144 @@ 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) +URIs::URIs(Forge& forge, 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) - , atom_Float (forge, map, lworld, LV2_ATOM__Float) - , atom_Int (forge, map, lworld, LV2_ATOM__Int) - , atom_Object (forge, map, lworld, LV2_ATOM__Object) - , atom_Path (forge, map, lworld, LV2_ATOM__Path) - , atom_Sequence (forge, map, lworld, LV2_ATOM__Sequence) - , atom_Sound (forge, map, lworld, LV2_ATOM__Sound) - , atom_String (forge, map, lworld, LV2_ATOM__String) - , atom_URI (forge, map, lworld, LV2_ATOM__URI) - , atom_URID (forge, map, lworld, LV2_ATOM__URID) - , atom_bufferType (forge, map, lworld, LV2_ATOM__bufferType) - , atom_eventTransfer (forge, map, lworld, LV2_ATOM__eventTransfer) - , atom_supports (forge, map, lworld, LV2_ATOM__supports) - , bufsz_maxBlockLength (forge, map, lworld, LV2_BUF_SIZE__maxBlockLength) - , bufsz_minBlockLength (forge, map, lworld, LV2_BUF_SIZE__minBlockLength) - , bufsz_sequenceSize (forge, map, lworld, LV2_BUF_SIZE__sequenceSize) - , doap_name (forge, map, lworld, "http://usefulinc.com/ns/doap#name") - , ingen_Arc (forge, map, lworld, INGEN__Arc) - , ingen_Block (forge, map, lworld, INGEN__Block) - , ingen_BundleEnd (forge, map, lworld, INGEN__BundleEnd) - , ingen_BundleStart (forge, map, lworld, INGEN__BundleStart) - , ingen_Graph (forge, map, lworld, INGEN__Graph) - , ingen_GraphPrototype (forge, map, lworld, INGEN__GraphPrototype) - , ingen_Internal (forge, map, lworld, INGEN__Internal) - , ingen_Redo (forge, map, lworld, INGEN__Redo) - , ingen_Undo (forge, map, lworld, INGEN__Undo) - , ingen_activity (forge, map, lworld, INGEN__activity) - , ingen_arc (forge, map, lworld, INGEN__arc) - , ingen_block (forge, map, lworld, INGEN__block) - , ingen_broadcast (forge, map, lworld, INGEN__broadcast) - , ingen_canvasX (forge, map, lworld, INGEN__canvasX) - , ingen_canvasY (forge, map, lworld, INGEN__canvasY) - , ingen_enabled (forge, map, lworld, INGEN__enabled) - , ingen_externalContext (forge, map, lworld, INGEN__externalContext) - , ingen_file (forge, map, lworld, INGEN__file) - , ingen_head (forge, map, lworld, INGEN__head) - , ingen_incidentTo (forge, map, lworld, INGEN__incidentTo) - , ingen_internalContext (forge, map, lworld, INGEN__internalContext) - , ingen_loadedBundle (forge, map, lworld, INGEN__loadedBundle) - , ingen_maxRunLoad (forge, map, lworld, INGEN__maxRunLoad) - , ingen_meanRunLoad (forge, map, lworld, INGEN__meanRunLoad) - , ingen_minRunLoad (forge, map, lworld, INGEN__minRunLoad) - , ingen_numThreads (forge, map, lworld, INGEN__numThreads) - , ingen_polyphonic (forge, map, lworld, INGEN__polyphonic) - , ingen_polyphony (forge, map, lworld, INGEN__polyphony) - , ingen_prototype (forge, map, lworld, INGEN__prototype) - , ingen_sprungLayout (forge, map, lworld, INGEN__sprungLayout) - , ingen_tail (forge, map, lworld, INGEN__tail) - , ingen_uiEmbedded (forge, map, lworld, INGEN__uiEmbedded) - , ingen_value (forge, map, lworld, INGEN__value) - , log_Error (forge, map, lworld, LV2_LOG__Error) - , log_Note (forge, map, lworld, LV2_LOG__Note) - , log_Trace (forge, map, lworld, LV2_LOG__Trace) - , log_Warning (forge, map, lworld, LV2_LOG__Warning) - , lv2_AudioPort (forge, map, lworld, LV2_CORE__AudioPort) - , lv2_CVPort (forge, map, lworld, LV2_CORE__CVPort) - , lv2_ControlPort (forge, map, lworld, LV2_CORE__ControlPort) - , lv2_InputPort (forge, map, lworld, LV2_CORE__InputPort) - , lv2_OutputPort (forge, map, lworld, LV2_CORE__OutputPort) - , lv2_Plugin (forge, map, lworld, LV2_CORE__Plugin) - , lv2_appliesTo (forge, map, lworld, LV2_CORE__appliesTo) - , lv2_binary (forge, map, lworld, LV2_CORE__binary) - , lv2_connectionOptional(forge, map, lworld, LV2_CORE__connectionOptional) - , lv2_control (forge, map, lworld, LV2_CORE__control) - , lv2_default (forge, map, lworld, LV2_CORE__default) - , lv2_designation (forge, map, lworld, LV2_CORE__designation) - , lv2_enumeration (forge, map, lworld, LV2_CORE__enumeration) - , lv2_extensionData (forge, map, lworld, LV2_CORE__extensionData) - , lv2_index (forge, map, lworld, LV2_CORE__index) - , lv2_integer (forge, map, lworld, LV2_CORE__integer) - , lv2_maximum (forge, map, lworld, LV2_CORE__maximum) - , lv2_microVersion (forge, map, lworld, LV2_CORE__microVersion) - , lv2_minimum (forge, map, lworld, LV2_CORE__minimum) - , lv2_minorVersion (forge, map, lworld, LV2_CORE__minorVersion) - , lv2_name (forge, map, lworld, LV2_CORE__name) - , lv2_port (forge, map, lworld, LV2_CORE__port) - , lv2_portProperty (forge, map, lworld, LV2_CORE__portProperty) - , lv2_prototype (forge, map, lworld, LV2_CORE__prototype) - , lv2_sampleRate (forge, map, lworld, LV2_CORE__sampleRate) - , lv2_scalePoint (forge, map, lworld, LV2_CORE__scalePoint) - , lv2_symbol (forge, map, lworld, LV2_CORE__symbol) - , lv2_toggled (forge, map, lworld, LV2_CORE__toggled) - , midi_Bender (forge, map, lworld, LV2_MIDI__Bender) - , midi_ChannelPressure (forge, map, lworld, LV2_MIDI__ChannelPressure) - , midi_Controller (forge, map, lworld, LV2_MIDI__Controller) - , midi_MidiEvent (forge, map, lworld, LV2_MIDI__MidiEvent) - , midi_NoteOn (forge, map, lworld, LV2_MIDI__NoteOn) - , midi_binding (forge, map, lworld, LV2_MIDI__binding) - , midi_controllerNumber (forge, map, lworld, LV2_MIDI__controllerNumber) - , midi_noteNumber (forge, map, lworld, LV2_MIDI__noteNumber) - , morph_AutoMorphPort (forge, map, lworld, LV2_MORPH__AutoMorphPort) - , morph_MorphPort (forge, map, lworld, LV2_MORPH__MorphPort) - , morph_currentType (forge, map, lworld, LV2_MORPH__currentType) - , morph_supportsType (forge, map, lworld, LV2_MORPH__supportsType) - , opt_interface (forge, map, lworld, LV2_OPTIONS__interface) - , param_sampleRate (forge, map, lworld, LV2_PARAMETERS__sampleRate) - , patch_Copy (forge, map, lworld, LV2_PATCH__Copy) - , patch_Delete (forge, map, lworld, LV2_PATCH__Delete) - , patch_Get (forge, map, lworld, LV2_PATCH__Get) - , patch_Message (forge, map, lworld, LV2_PATCH__Message) - , patch_Move (forge, map, lworld, LV2_PATCH__Move) - , patch_Patch (forge, map, lworld, LV2_PATCH__Patch) - , patch_Put (forge, map, lworld, LV2_PATCH__Put) - , patch_Response (forge, map, lworld, LV2_PATCH__Response) - , patch_Set (forge, map, lworld, LV2_PATCH__Set) - , patch_add (forge, map, lworld, LV2_PATCH__add) - , patch_body (forge, map, lworld, LV2_PATCH__body) - , patch_context (forge, map, lworld, LV2_PATCH__context) - , patch_destination (forge, map, lworld, LV2_PATCH__destination) - , patch_property (forge, map, lworld, LV2_PATCH__property) - , patch_remove (forge, map, lworld, LV2_PATCH__remove) - , patch_sequenceNumber (forge, map, lworld, LV2_PATCH__sequenceNumber) - , patch_subject (forge, map, lworld, LV2_PATCH__subject) - , patch_value (forge, map, lworld, LV2_PATCH__value) - , patch_wildcard (forge, map, lworld, LV2_PATCH__wildcard) - , pprops_logarithmic (forge, map, lworld, LV2_PORT_PROPS__logarithmic) - , pset_Preset (forge, map, lworld, LV2_PRESETS__Preset) - , pset_preset (forge, map, lworld, LV2_PRESETS__preset) - , rdf_type (forge, map, lworld, NS_RDF "type") - , rdfs_Class (forge, map, lworld, NS_RDFS "Class") - , rdfs_label (forge, map, lworld, NS_RDFS "label") - , rdfs_seeAlso (forge, map, lworld, NS_RDFS "seeAlso") - , rsz_minimumSize (forge, map, lworld, LV2_RESIZE_PORT__minimumSize) - , state_loadDefaultState(forge, map, lworld, LV2_STATE__loadDefaultState) - , state_state (forge, map, lworld, LV2_STATE__state) - , time_Position (forge, map, lworld, LV2_TIME__Position) - , time_bar (forge, map, lworld, LV2_TIME__bar) - , time_barBeat (forge, map, lworld, LV2_TIME__barBeat) - , time_beatUnit (forge, map, lworld, LV2_TIME__beatUnit) - , time_beatsPerBar (forge, map, lworld, LV2_TIME__beatsPerBar) - , time_beatsPerMinute (forge, map, lworld, LV2_TIME__beatsPerMinute) - , time_frame (forge, map, lworld, LV2_TIME__frame) - , time_speed (forge, map, lworld, LV2_TIME__speed) - , work_schedule (forge, map, lworld, LV2_WORKER__schedule) + , atom_AtomPort (forge, lworld, LV2_ATOM__AtomPort) + , atom_Bool (forge, lworld, LV2_ATOM__Bool) + , atom_Chunk (forge, lworld, LV2_ATOM__Chunk) + , atom_Float (forge, lworld, LV2_ATOM__Float) + , atom_Int (forge, lworld, LV2_ATOM__Int) + , atom_Object (forge, lworld, LV2_ATOM__Object) + , atom_Path (forge, lworld, LV2_ATOM__Path) + , atom_Sequence (forge, lworld, LV2_ATOM__Sequence) + , atom_Sound (forge, lworld, LV2_ATOM__Sound) + , atom_String (forge, lworld, LV2_ATOM__String) + , atom_URI (forge, lworld, LV2_ATOM__URI) + , atom_URID (forge, lworld, LV2_ATOM__URID) + , atom_bufferType (forge, lworld, LV2_ATOM__bufferType) + , atom_eventTransfer (forge, lworld, LV2_ATOM__eventTransfer) + , atom_supports (forge, lworld, LV2_ATOM__supports) + , bufsz_maxBlockLength (forge, lworld, LV2_BUF_SIZE__maxBlockLength) + , bufsz_minBlockLength (forge, lworld, LV2_BUF_SIZE__minBlockLength) + , bufsz_sequenceSize (forge, lworld, LV2_BUF_SIZE__sequenceSize) + , doap_name (forge, lworld, "http://usefulinc.com/ns/doap#name") + , ingen_Arc (forge, lworld, INGEN__Arc) + , ingen_Block (forge, lworld, INGEN__Block) + , ingen_BundleEnd (forge, lworld, INGEN__BundleEnd) + , ingen_BundleStart (forge, lworld, INGEN__BundleStart) + , ingen_Graph (forge, lworld, INGEN__Graph) + , ingen_GraphPrototype (forge, lworld, INGEN__GraphPrototype) + , ingen_Internal (forge, lworld, INGEN__Internal) + , ingen_Redo (forge, lworld, INGEN__Redo) + , ingen_Undo (forge, lworld, INGEN__Undo) + , ingen_activity (forge, lworld, INGEN__activity) + , ingen_arc (forge, lworld, INGEN__arc) + , ingen_block (forge, lworld, INGEN__block) + , ingen_broadcast (forge, lworld, INGEN__broadcast) + , ingen_canvasX (forge, lworld, INGEN__canvasX) + , ingen_canvasY (forge, lworld, INGEN__canvasY) + , ingen_enabled (forge, lworld, INGEN__enabled) + , ingen_externalContext (forge, lworld, INGEN__externalContext) + , ingen_file (forge, lworld, INGEN__file) + , ingen_head (forge, lworld, INGEN__head) + , ingen_incidentTo (forge, lworld, INGEN__incidentTo) + , ingen_internalContext (forge, lworld, INGEN__internalContext) + , ingen_loadedBundle (forge, lworld, INGEN__loadedBundle) + , ingen_maxRunLoad (forge, lworld, INGEN__maxRunLoad) + , ingen_meanRunLoad (forge, lworld, INGEN__meanRunLoad) + , ingen_minRunLoad (forge, lworld, INGEN__minRunLoad) + , ingen_numThreads (forge, lworld, INGEN__numThreads) + , ingen_polyphonic (forge, lworld, INGEN__polyphonic) + , ingen_polyphony (forge, lworld, INGEN__polyphony) + , ingen_prototype (forge, lworld, INGEN__prototype) + , ingen_sprungLayout (forge, lworld, INGEN__sprungLayout) + , ingen_tail (forge, lworld, INGEN__tail) + , ingen_uiEmbedded (forge, lworld, INGEN__uiEmbedded) + , ingen_value (forge, lworld, INGEN__value) + , log_Error (forge, lworld, LV2_LOG__Error) + , log_Note (forge, lworld, LV2_LOG__Note) + , log_Trace (forge, lworld, LV2_LOG__Trace) + , log_Warning (forge, lworld, LV2_LOG__Warning) + , lv2_AudioPort (forge, lworld, LV2_CORE__AudioPort) + , lv2_CVPort (forge, lworld, LV2_CORE__CVPort) + , lv2_ControlPort (forge, lworld, LV2_CORE__ControlPort) + , lv2_InputPort (forge, lworld, LV2_CORE__InputPort) + , lv2_OutputPort (forge, lworld, LV2_CORE__OutputPort) + , lv2_Plugin (forge, lworld, LV2_CORE__Plugin) + , lv2_appliesTo (forge, lworld, LV2_CORE__appliesTo) + , lv2_binary (forge, lworld, LV2_CORE__binary) + , lv2_connectionOptional(forge, lworld, LV2_CORE__connectionOptional) + , lv2_control (forge, lworld, LV2_CORE__control) + , lv2_default (forge, lworld, LV2_CORE__default) + , lv2_designation (forge, lworld, LV2_CORE__designation) + , lv2_enumeration (forge, lworld, LV2_CORE__enumeration) + , lv2_extensionData (forge, lworld, LV2_CORE__extensionData) + , lv2_index (forge, lworld, LV2_CORE__index) + , lv2_integer (forge, lworld, LV2_CORE__integer) + , lv2_maximum (forge, lworld, LV2_CORE__maximum) + , lv2_microVersion (forge, lworld, LV2_CORE__microVersion) + , lv2_minimum (forge, lworld, LV2_CORE__minimum) + , lv2_minorVersion (forge, lworld, LV2_CORE__minorVersion) + , lv2_name (forge, lworld, LV2_CORE__name) + , lv2_port (forge, lworld, LV2_CORE__port) + , lv2_portProperty (forge, lworld, LV2_CORE__portProperty) + , lv2_prototype (forge, lworld, LV2_CORE__prototype) + , lv2_sampleRate (forge, lworld, LV2_CORE__sampleRate) + , lv2_scalePoint (forge, lworld, LV2_CORE__scalePoint) + , lv2_symbol (forge, lworld, LV2_CORE__symbol) + , lv2_toggled (forge, lworld, LV2_CORE__toggled) + , midi_Bender (forge, lworld, LV2_MIDI__Bender) + , midi_ChannelPressure (forge, lworld, LV2_MIDI__ChannelPressure) + , midi_Controller (forge, lworld, LV2_MIDI__Controller) + , midi_MidiEvent (forge, lworld, LV2_MIDI__MidiEvent) + , midi_NoteOn (forge, lworld, LV2_MIDI__NoteOn) + , midi_binding (forge, lworld, LV2_MIDI__binding) + , midi_controllerNumber (forge, lworld, LV2_MIDI__controllerNumber) + , midi_noteNumber (forge, lworld, LV2_MIDI__noteNumber) + , morph_AutoMorphPort (forge, lworld, LV2_MORPH__AutoMorphPort) + , morph_MorphPort (forge, lworld, LV2_MORPH__MorphPort) + , morph_currentType (forge, lworld, LV2_MORPH__currentType) + , morph_supportsType (forge, lworld, LV2_MORPH__supportsType) + , opt_interface (forge, lworld, LV2_OPTIONS__interface) + , param_sampleRate (forge, lworld, LV2_PARAMETERS__sampleRate) + , patch_Copy (forge, lworld, LV2_PATCH__Copy) + , patch_Delete (forge, lworld, LV2_PATCH__Delete) + , patch_Get (forge, lworld, LV2_PATCH__Get) + , patch_Message (forge, lworld, LV2_PATCH__Message) + , patch_Move (forge, lworld, LV2_PATCH__Move) + , patch_Patch (forge, lworld, LV2_PATCH__Patch) + , patch_Put (forge, lworld, LV2_PATCH__Put) + , patch_Response (forge, lworld, LV2_PATCH__Response) + , patch_Set (forge, lworld, LV2_PATCH__Set) + , patch_add (forge, lworld, LV2_PATCH__add) + , patch_body (forge, lworld, LV2_PATCH__body) + , patch_context (forge, lworld, LV2_PATCH__context) + , patch_destination (forge, lworld, LV2_PATCH__destination) + , patch_property (forge, lworld, LV2_PATCH__property) + , patch_remove (forge, lworld, LV2_PATCH__remove) + , patch_sequenceNumber (forge, lworld, LV2_PATCH__sequenceNumber) + , patch_subject (forge, lworld, LV2_PATCH__subject) + , patch_value (forge, lworld, LV2_PATCH__value) + , patch_wildcard (forge, lworld, LV2_PATCH__wildcard) + , pprops_logarithmic (forge, lworld, LV2_PORT_PROPS__logarithmic) + , pset_Preset (forge, lworld, LV2_PRESETS__Preset) + , pset_preset (forge, lworld, LV2_PRESETS__preset) + , rdf_type (forge, lworld, NS_RDF "type") + , rdfs_Class (forge, lworld, NS_RDFS "Class") + , rdfs_label (forge, lworld, NS_RDFS "label") + , rdfs_seeAlso (forge, lworld, NS_RDFS "seeAlso") + , rsz_minimumSize (forge, lworld, LV2_RESIZE_PORT__minimumSize) + , state_loadDefaultState(forge, lworld, LV2_STATE__loadDefaultState) + , state_state (forge, lworld, LV2_STATE__state) + , time_Position (forge, lworld, LV2_TIME__Position) + , time_bar (forge, lworld, LV2_TIME__bar) + , time_barBeat (forge, lworld, LV2_TIME__barBeat) + , time_beatUnit (forge, lworld, LV2_TIME__beatUnit) + , time_beatsPerBar (forge, lworld, LV2_TIME__beatsPerBar) + , time_beatsPerMinute (forge, lworld, LV2_TIME__beatsPerMinute) + , time_frame (forge, lworld, LV2_TIME__frame) + , time_speed (forge, lworld, LV2_TIME__speed) + , work_schedule (forge, lworld, LV2_WORKER__schedule) {} } // namespace ingen diff --git a/src/World.cpp b/src/World.cpp index 2daff6a6..b2fbffe0 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -108,7 +108,7 @@ public: , lilv_world(lilv_world_new()) , uri_map(new URIMap(log, map, unmap)) , forge(new Forge(*uri_map)) - , uris(new URIs(*forge, uri_map, lilv_world)) + , uris(new URIs(*forge, lilv_world)) , conf(*forge) , log(lv2_log, *uris) { diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp index 0660b66d..7f420b27 100644 --- a/src/client/ingen_client.cpp +++ b/src/client/ingen_client.cpp @@ -20,7 +20,7 @@ #include "ingen_config.h" struct IngenClientModule : public ingen::Module { - void load(ingen::World* world) override {} + void load(ingen::World*) override {} }; extern "C" { diff --git a/src/gui/GraphCanvas.cpp b/src/gui/GraphCanvas.cpp index 931cc23f..2f431030 100644 --- a/src/gui/GraphCanvas.cpp +++ b/src/gui/GraphCanvas.cpp @@ -320,7 +320,7 @@ GraphCanvas::add_plugin(SPtr<PluginModel> p) } void -GraphCanvas::remove_plugin(const URI& uri) +GraphCanvas::remove_plugin(const URI&) { // Flag menus as dirty so they will be rebuilt when needed next _menu_dirty = true; diff --git a/src/gui/GraphTreeWindow.cpp b/src/gui/GraphTreeWindow.cpp index 2edf8a44..591a2b25 100644 --- a/src/gui/GraphTreeWindow.cpp +++ b/src/gui/GraphTreeWindow.cpp @@ -152,7 +152,7 @@ GraphTreeWindow::find_graph(Gtk::TreeModel::Children root, /** Show the context menu for the selected graph in the graphs treeview. */ void -GraphTreeWindow::show_graph_menu(GdkEventButton* ev) +GraphTreeWindow::show_graph_menu(GdkEventButton*) { Gtk::TreeModel::iterator active = _graph_tree_selection->get_selected(); if (active) { @@ -166,7 +166,7 @@ GraphTreeWindow::show_graph_menu(GdkEventButton* ev) void GraphTreeWindow::event_graph_activated(const Gtk::TreeModel::Path& path, - Gtk::TreeView::Column* col) + Gtk::TreeView::Column*) { Gtk::TreeModel::iterator active = _graph_treestore->get_iter(path); Gtk::TreeModel::Row row = *active; diff --git a/src/gui/GraphTreeWindow.hpp b/src/gui/GraphTreeWindow.hpp index 9ab05f94..09361661 100644 --- a/src/gui/GraphTreeWindow.hpp +++ b/src/gui/GraphTreeWindow.hpp @@ -95,10 +95,9 @@ protected: class GraphTreeView : public Gtk::TreeView { public: - GraphTreeView(BaseObjectType* cobject, - const Glib::RefPtr<Gtk::Builder>& xml) - : Gtk::TreeView(cobject) - , _window(NULL) + GraphTreeView(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&) + : Gtk::TreeView(cobject) + , _window(NULL) {} void set_window(GraphTreeWindow* win) { _window = win; } diff --git a/src/gui/LoadGraphWindow.cpp b/src/gui/LoadGraphWindow.cpp index a8bbd94a..a3b09e8f 100644 --- a/src/gui/LoadGraphWindow.cpp +++ b/src/gui/LoadGraphWindow.cpp @@ -216,7 +216,7 @@ LoadGraphWindow::cancel_clicked() Raul::Symbol LoadGraphWindow::symbol_from_filename(const Glib::ustring& filename) { - std::string symbol_str = Glib::path_get_basename(get_filename()); + std::string symbol_str = Glib::path_get_basename(filename); symbol_str = symbol_str.substr(0, symbol_str.find('.')); return Raul::Symbol::symbolify(symbol_str); } diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp index 743c0f11..f00b1da4 100644 --- a/src/gui/LoadPluginWindow.cpp +++ b/src/gui/LoadPluginWindow.cpp @@ -157,7 +157,7 @@ LoadPluginWindow::name_changed() } void -LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event) +LoadPluginWindow::name_cleared(Gtk::EntryIconPosition, const GdkEventButton*) { _search_entry->set_text(""); } @@ -317,8 +317,8 @@ LoadPluginWindow::add_plugin(SPtr<const PluginModel> plugin) ///// Event Handlers ////// void -LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, - Gtk::TreeViewColumn* col) +LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path&, + Gtk::TreeViewColumn*) { add_clicked(); } diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 8605e91d..0220898c 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -410,7 +410,7 @@ NodeModule::set_control_values() } bool -NodeModule::on_double_click(GdkEventButton* event) +NodeModule::on_double_click(GdkEventButton*) { popup_gui(); return true; diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp index 60e11471..8c7d35eb 100644 --- a/src/gui/Port.cpp +++ b/src/gui/Port.cpp @@ -495,7 +495,7 @@ Port::property_changed(const URI& key, const Atom& value) } void -Port::property_removed(const URI& key, const Atom& value) +Port::property_removed(const URI& key, const Atom&) { const URIs& uris = _app.uris(); if (key == uris.lv2_minimum || key == uris.lv2_maximum) { diff --git a/src/gui/Style.cpp b/src/gui/Style.cpp index 3a122e45..77dbc8a2 100644 --- a/src/gui/Style.cpp +++ b/src/gui/Style.cpp @@ -58,7 +58,7 @@ Style::Style(App& app) * the default location. */ void -Style::load_settings(std::string filename) +Style::load_settings(std::string /*filename*/) { /* ... */ } @@ -67,7 +67,7 @@ Style::load_settings(std::string filename) * default location. */ void -Style::save_settings(std::string filename) +Style::save_settings(std::string /*filename*/) { /* ... */ } diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp index c5f9c089..b2bcabb4 100644 --- a/src/gui/WindowFactory.cpp +++ b/src/gui/WindowFactory.cpp @@ -186,7 +186,7 @@ WindowFactory::new_graph_window(SPtr<const GraphModel> graph, } bool -WindowFactory::remove_graph_window(GraphWindow* win, GdkEventAny* ignored) +WindowFactory::remove_graph_window(GraphWindow* win, GdkEventAny*) { if (_graph_windows.size() <= 1) { return !_app.quit(win); diff --git a/src/gui/ingen_gui.cpp b/src/gui/ingen_gui.cpp index 441993f7..ffca6a2f 100644 --- a/src/gui/ingen_gui.cpp +++ b/src/gui/ingen_gui.cpp @@ -40,7 +40,7 @@ struct GUIModule : public Module { app = gui::App::create(world); } - void run(World* world) override { + void run(World*) override { app->run(); } diff --git a/src/gui/ingen_gui_lv2.cpp b/src/gui/ingen_gui_lv2.cpp index 251c75e1..f094eee8 100644 --- a/src/gui/ingen_gui_lv2.cpp +++ b/src/gui/ingen_gui_lv2.cpp @@ -183,7 +183,7 @@ port_event(LV2UI_Handle handle, } static const void* -extension_data(const char* uri) +extension_data(const char*) { return nullptr; } diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp index bf18f0dd..053e4594 100644 --- a/src/ingen/ingen.cpp +++ b/src/ingen/ingen.cpp @@ -45,7 +45,7 @@ using namespace ingen; class DummyInterface : public Interface { URI uri() const override { return URI("ingen:dummy"); } - void message(const Message& msg) override {} + void message(const Message&) override {} }; unique_ptr<ingen::World> world; diff --git a/src/server/BlockImpl.hpp b/src/server/BlockImpl.hpp index 34045b6d..52ba54dd 100644 --- a/src/server/BlockImpl.hpp +++ b/src/server/BlockImpl.hpp @@ -88,9 +88,9 @@ public: virtual void deactivate(); /** Duplicate this Node. */ - virtual BlockImpl* duplicate(Engine& engine, - const Raul::Symbol& symbol, - GraphImpl* parent) { return nullptr; } + virtual BlockImpl* duplicate(Engine&, const Raul::Symbol&, GraphImpl*) { + return nullptr; + } /** Return true iff this block is activated */ bool activated() const { return _activated; } @@ -102,15 +102,16 @@ public: void set_enabled(bool e) { _enabled = e; } /** Load a preset from the world for this block. */ - virtual LilvState* load_preset(const URI& uri) { return nullptr; } + virtual LilvState* load_preset(const URI&) { return nullptr; } /** Restore `state`. */ - virtual void apply_state(const UPtr<Worker>& worker, const LilvState* state) {} + virtual void apply_state(const UPtr<Worker>&, const LilvState*) {} /** Save current state as preset. */ - virtual boost::optional<Resource> - save_preset(const URI& bundle, - const Properties& props) { return boost::optional<Resource>(); } + virtual boost::optional<Resource> save_preset(const URI&, const Properties&) + { + return boost::optional<Resource>(); + } /** Learn the next incoming MIDI event (for internals) */ virtual void learn() {} diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp index eef594a3..fa59fe19 100644 --- a/src/server/Buffer.cpp +++ b/src/server/Buffer.cpp @@ -44,8 +44,7 @@ Buffer::Buffer(BufferFactory& bufs, LV2_URID type, LV2_URID value_type, uint32_t capacity, - bool external, - void* buf) + bool external) : _factory(bufs) , _next(nullptr) , _buf(external ? nullptr : aligned_alloc(capacity)) @@ -263,7 +262,7 @@ Buffer::peak(const RunContext& context) const } void -Buffer::prepare_write(RunContext& context) +Buffer::prepare_write(RunContext&) { if (_type == _factory.uris().atom_Sequence) { LV2_Atom* atom = get<LV2_Atom>(); @@ -275,7 +274,7 @@ Buffer::prepare_write(RunContext& context) } void -Buffer::prepare_output_write(RunContext& context) +Buffer::prepare_output_write(RunContext&) { if (_type == _factory.uris().atom_Sequence) { LV2_Atom* atom = get<LV2_Atom>(); diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp index d9b4e7ad..f1592b54 100644 --- a/src/server/Buffer.hpp +++ b/src/server/Buffer.hpp @@ -44,8 +44,7 @@ public: LV2_URID type, LV2_URID value_type, uint32_t capacity, - bool external = false, - void* buf = nullptr); + bool external = false); Buffer(const Buffer&) = delete; Buffer& operator=(const Buffer&) = delete; diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp index c9eeed49..dad61021 100644 --- a/src/server/BufferFactory.cpp +++ b/src/server/BufferFactory.cpp @@ -142,7 +142,7 @@ BufferFactory::get_buffer(LV2_URID type, BufferRef BufferFactory::claim_buffer(LV2_URID type, LV2_URID value_type, - uint32_t capacity) + uint32_t /*capacity*/) { Buffer* try_head = try_get_buffer(type); if (!try_head) { diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp index 45df0e8f..668de773 100644 --- a/src/server/ControlBindings.cpp +++ b/src/server/ControlBindings.cpp @@ -123,7 +123,7 @@ ControlBindings::midi_event_key(uint16_t size, const uint8_t* buf, uint16_t& val } bool -ControlBindings::set_port_binding(RunContext& context, +ControlBindings::set_port_binding(RunContext&, PortImpl* port, Binding* binding, const Atom& value) @@ -373,7 +373,7 @@ ControlBindings::get_all(const Raul::Path& path, std::vector<Binding*>& bindings } void -ControlBindings::remove(RunContext& ctx, const std::vector<Binding*>& bindings) +ControlBindings::remove(RunContext&, const std::vector<Binding*>& bindings) { for (Binding* b : bindings) { _bindings->erase(*b); @@ -414,7 +414,7 @@ ControlBindings::pre_process(RunContext& ctx, Buffer* buffer) } void -ControlBindings::post_process(RunContext& context, Buffer* buffer) +ControlBindings::post_process(RunContext&, Buffer* buffer) { if (buffer->get<LV2_Atom>()) { buffer->append_event_buffer(_feedback.get()); diff --git a/src/server/DirectDriver.hpp b/src/server/DirectDriver.hpp index b3d49af0..5f177403 100644 --- a/src/server/DirectDriver.hpp +++ b/src/server/DirectDriver.hpp @@ -60,23 +60,20 @@ public: return nullptr; } - void add_port(RunContext& context, EnginePort* port) override { + void add_port(RunContext&, EnginePort* port) override { _ports.push_back(*port); } - void remove_port(RunContext& context, EnginePort* port) override { + void remove_port(RunContext&, EnginePort* port) override { _ports.erase(_ports.iterator_to(*port)); } - void rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) override {} + void rename_port(const Raul::Path&, const Raul::Path&) override {} - void port_property(const Raul::Path& path, - const URI& uri, - const Atom& value) override {} + void port_property(const Raul::Path&, const URI&, const Atom&) override {} - void register_port(EnginePort& port) override {} - void unregister_port(EnginePort& port) override {} + void register_port(EnginePort&) override {} + void unregister_port(EnginePort&) override {} SampleCount block_length() const override { return _block_length; } @@ -88,7 +85,7 @@ public: return _engine.run_context().start(); } - void append_time_events(RunContext& context, Buffer& buffer) override {} + void append_time_events(RunContext&, Buffer&) override {} int real_time_priority() override { return 60; } diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp index 2823da05..91d57df4 100644 --- a/src/server/DuplexPort.cpp +++ b/src/server/DuplexPort.cpp @@ -155,7 +155,7 @@ DuplexPort::setup_buffers(RunContext& ctx, BufferFactory& bufs, uint32_t poly) void DuplexPort::set_is_driver_port(BufferFactory& bufs) { - _voices->at(0).buffer = new Buffer(bufs, buffer_type(), _value.type(), 0, true, nullptr); + _voices->at(0).buffer = new Buffer(bufs, buffer_type(), _value.type(), 0, true); PortImpl::set_is_driver_port(bufs); } @@ -167,7 +167,7 @@ DuplexPort::set_driver_buffer(void* buf, uint32_t capacity) } uint32_t -DuplexPort::max_tail_poly(RunContext& context) const +DuplexPort::max_tail_poly(RunContext&) const { return std::max(_poly, parent_graph()->internal_poly_process()); } diff --git a/src/server/Engine.hpp b/src/server/Engine.hpp index 02da0719..d71b0238 100644 --- a/src/server/Engine.hpp +++ b/src/server/Engine.hpp @@ -110,7 +110,7 @@ public: * * This value is comparable to the value returned by current_time(). */ - inline uint64_t cycle_start_time(const RunContext& context) const { + inline uint64_t cycle_start_time(const RunContext&) const { return _cycle_start_time; } diff --git a/src/server/Event.hpp b/src/server/Event.hpp index 9cd97a35..52e0ec3e 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -73,7 +73,7 @@ public: virtual void post_process() = 0; /** Write the inverse of this event to `sink`. */ - virtual void undo(Interface& target) {} + virtual void undo(Interface&) {} /** Return true iff this event has been pre-processed. */ inline bool is_prepared() const { return _status != Status::NOT_PREPARED; } diff --git a/src/server/GraphPlugin.hpp b/src/server/GraphPlugin.hpp index ef741587..462485ff 100644 --- a/src/server/GraphPlugin.hpp +++ b/src/server/GraphPlugin.hpp @@ -37,14 +37,19 @@ public: const Raul::Symbol& symbol, const std::string& name) : PluginImpl(uris, uris.ingen_Graph.urid, uri) - {} - - BlockImpl* instantiate(BufferFactory& bufs, - const Raul::Symbol& symbol, - bool polyphonic, - GraphImpl* parent, - Engine& engine, - const LilvState* state) override + { + set_property(uris.lv2_symbol, uris.forge.alloc(symbol)); + if (!name.empty()) { + set_property(uris.doap_name, uris.forge.alloc(name)); + } + } + + BlockImpl* instantiate(BufferFactory&, + const Raul::Symbol&, + bool, + GraphImpl*, + Engine&, + const LilvState*) override { return nullptr; } diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp index 76382270..c61977ab 100644 --- a/src/server/InputPort.cpp +++ b/src/server/InputPort.cpp @@ -124,7 +124,7 @@ InputPort::setup_buffers(RunContext& ctx, BufferFactory& bufs, uint32_t poly) } void -InputPort::add_arc(RunContext& context, ArcImpl& c) +InputPort::add_arc(RunContext&, ArcImpl& c) { _arcs.push_front(c); } @@ -136,7 +136,7 @@ InputPort::remove_arc(ArcImpl& arc) } uint32_t -InputPort::max_tail_poly(RunContext& context) const +InputPort::max_tail_poly(RunContext&) const { return parent_block()->parent_graph()->internal_poly_process(); } diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp index 49590b24..0695f573 100644 --- a/src/server/InternalPlugin.cpp +++ b/src/server/InternalPlugin.cpp @@ -44,7 +44,7 @@ InternalPlugin::instantiate(BufferFactory& bufs, bool polyphonic, GraphImpl* parent, Engine& engine, - const LilvState* state) + const LilvState*) { const SampleCount srate = engine.sample_rate(); diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp index a331811e..e87f2a04 100644 --- a/src/server/JackDriver.cpp +++ b/src/server/JackDriver.cpp @@ -231,7 +231,7 @@ JackDriver::add_port(RunContext& context, EnginePort* port) } void -JackDriver::remove_port(RunContext& context, EnginePort* port) +JackDriver::remove_port(RunContext&, EnginePort* port) { _ports.erase(_ports.iterator_to(*port)); } diff --git a/src/server/LV2Options.hpp b/src/server/LV2Options.hpp index 7a8b3c20..e39039cf 100644 --- a/src/server/LV2Options.hpp +++ b/src/server/LV2Options.hpp @@ -38,7 +38,7 @@ public: const char* uri() const override { return LV2_OPTIONS__options; } - SPtr<LV2_Feature> feature(World* w, Node* n) override { + SPtr<LV2_Feature> feature(World*, Node*) override { const LV2_Options_Option options[] = { { LV2_OPTIONS_INSTANCE, 0, _uris.bufsz_minBlockLength, sizeof(int32_t), _uris.atom_Int, &_block_length }, diff --git a/src/server/PortAudioDriver.cpp b/src/server/PortAudioDriver.cpp index f67a62bb..e3270466 100644 --- a/src/server/PortAudioDriver.cpp +++ b/src/server/PortAudioDriver.cpp @@ -175,37 +175,34 @@ PortAudioDriver::get_port(const Raul::Path& path) } void -PortAudioDriver::add_port(RunContext& context, EnginePort* port) +PortAudioDriver::add_port(RunContext&, EnginePort* port) { _ports.push_back(*port); } void -PortAudioDriver::remove_port(RunContext& context, EnginePort* port) +PortAudioDriver::remove_port(RunContext&, EnginePort* port) { _ports.erase(_ports.iterator_to(*port)); } void -PortAudioDriver::register_port(EnginePort& port) +PortAudioDriver::register_port(EnginePort&) { } void -PortAudioDriver::unregister_port(EnginePort& port) +PortAudioDriver::unregister_port(EnginePort&) { } void -PortAudioDriver::rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) +PortAudioDriver::rename_port(const Raul::Path&, const Raul::Path&) { } void -PortAudioDriver::port_property(const Raul::Path& path, - const URI& uri, - const Atom& value) +PortAudioDriver::port_property(const Raul::Path&, const URI&, const Atom&) { } @@ -239,7 +236,7 @@ PortAudioDriver::create_port(DuplexPort* graph_port) } void -PortAudioDriver::pre_process_port(RunContext& context, +PortAudioDriver::pre_process_port(RunContext&, EnginePort* port, const void* inputs, void* outputs) @@ -260,19 +257,16 @@ PortAudioDriver::pre_process_port(RunContext& context, } void -PortAudioDriver::post_process_port(RunContext& context, - EnginePort* port, - const void* inputs, - void* outputs) +PortAudioDriver::post_process_port(RunContext&, EnginePort*, const void*, void*) { } int -PortAudioDriver::process_cb(const void* inputs, - void* outputs, - unsigned long nframes, - const PaStreamCallbackTimeInfo* time, - PaStreamCallbackFlags flags) +PortAudioDriver::process_cb(const void* inputs, + void* outputs, + unsigned long nframes, + const PaStreamCallbackTimeInfo*, + PaStreamCallbackFlags) { _engine.advance(nframes); _timer->update(_engine.current_time(), _engine.run_context().start()); diff --git a/src/server/PortAudioDriver.hpp b/src/server/PortAudioDriver.hpp index e50cc8a6..efea9d25 100644 --- a/src/server/PortAudioDriver.hpp +++ b/src/server/PortAudioDriver.hpp @@ -65,7 +65,7 @@ public: void register_port(EnginePort& port) override; void unregister_port(EnginePort& port) override; - void append_time_events(RunContext& context, Buffer& buffer) override {} + void append_time_events(RunContext&, Buffer&) override {} SampleCount frame_time() const override; diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp index f03939d3..ee25395f 100644 --- a/src/server/PortImpl.cpp +++ b/src/server/PortImpl.cpp @@ -108,7 +108,7 @@ PortImpl::get_buffers(BufferFactory& bufs, GetFn get, const MPtr<Voices>& voices, uint32_t poly, - size_t num_in_arcs) const + size_t /*num_in_arcs*/) const { for (uint32_t v = 0; v < poly; ++v) { voices->at(v).buffer.reset(); @@ -120,7 +120,7 @@ PortImpl::get_buffers(BufferFactory& bufs, } bool -PortImpl::setup_buffers(RunContext& ctx, BufferFactory& bufs, uint32_t poly) +PortImpl::setup_buffers(RunContext&, BufferFactory& bufs, uint32_t poly) { return get_buffers(bufs, &BufferFactory::claim_buffer, _voices, poly, 0); } @@ -204,7 +204,7 @@ PortImpl::deactivate() } void -PortImpl::set_voices(RunContext& context, MPtr<Voices>&& voices) +PortImpl::set_voices(RunContext&, MPtr<Voices>&& voices) { _voices = std::move(voices); connect_buffers(); @@ -375,7 +375,7 @@ PortImpl::apply_poly(RunContext& context, uint32_t poly) } void -PortImpl::set_buffer_size(RunContext& context, BufferFactory& bufs, size_t size) +PortImpl::set_buffer_size(RunContext&, BufferFactory&, size_t size) { _buffer_size = size; @@ -403,7 +403,7 @@ PortImpl::recycle_buffers() } void -PortImpl::set_is_driver_port(BufferFactory& bufs) +PortImpl::set_is_driver_port(BufferFactory&) { _is_driver_port = true; } @@ -555,6 +555,11 @@ PortImpl::pre_process(RunContext& context) } void +PortImpl::pre_run(RunContext&) +{ +} + +void PortImpl::post_process(RunContext& context) { for (uint32_t v = 0; v < _poly; ++v) { diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp index d9b81a16..37eb003a 100644 --- a/src/server/PortImpl.hpp +++ b/src/server/PortImpl.hpp @@ -167,7 +167,7 @@ public: /** Called once per process cycle */ virtual void pre_process(RunContext& context); - virtual void pre_run(RunContext& context) {} + virtual void pre_run(RunContext& context); virtual void post_process(RunContext& context); /** Clear/silence all buffers */ @@ -185,9 +185,7 @@ public: This is used for Graph ports, so e.g. a control input has the range of all the ports it is connected to. */ - virtual void inherit_neighbour(const PortImpl* port, - Properties& remove, - Properties& add) {} + virtual void inherit_neighbour(const PortImpl*, Properties&, Properties&) {} virtual void connect_buffers(SampleCount offset=0); virtual void recycle_buffers(); diff --git a/src/server/PostProcessor.cpp b/src/server/PostProcessor.cpp index 02a6f639..0350d15b 100644 --- a/src/server/PostProcessor.cpp +++ b/src/server/PostProcessor.cpp @@ -28,8 +28,8 @@ class Sentinel : public Event { public: Sentinel(Engine& engine) : Event(engine) {} - bool pre_process(PreProcessContext& ctx) override { return false; } - void execute(RunContext& context) override {} + bool pre_process(PreProcessContext&) override { return false; } + void execute(RunContext&) override {} void post_process() override {} }; @@ -54,7 +54,7 @@ PostProcessor::~PostProcessor() } void -PostProcessor::append(RunContext& context, Event* first, Event* last) +PostProcessor::append(RunContext&, Event* first, Event* last) { assert(first); assert(last); diff --git a/src/server/Task.cpp b/src/server/Task.cpp index 63f3ef34..66858228 100644 --- a/src/server/Task.cpp +++ b/src/server/Task.cpp @@ -59,7 +59,7 @@ Task::run(RunContext& context) } Task* -Task::steal(RunContext& context) +Task::steal(RunContext&) { if (_mode == Mode::PARALLEL) { const unsigned i = _next++; diff --git a/src/server/ThreadManager.hpp b/src/server/ThreadManager.hpp index bf14a423..775b7327 100644 --- a/src/server/ThreadManager.hpp +++ b/src/server/ThreadManager.hpp @@ -38,20 +38,26 @@ public: static inline void set_flag(ThreadFlag f) { #ifndef NDEBUG flags = ((unsigned)flags | f); +#else + (void)f; #endif } static inline void unset_flag(ThreadFlag f) { #ifndef NDEBUG flags = ((unsigned)flags & (~f)); +#else + (void)f; #endif } static inline void assert_thread(ThreadFlag f) { + (void)f; assert(single_threaded || (flags & f)); } static inline void assert_not_thread(ThreadFlag f) { + (void)f; assert(single_threaded || !(flags & f)); } diff --git a/src/server/UndoStack.cpp b/src/server/UndoStack.cpp index 77b4706f..d2bae958 100644 --- a/src/server/UndoStack.cpp +++ b/src/server/UndoStack.cpp @@ -44,7 +44,7 @@ UndoStack::start_entry() } bool -UndoStack::write(const LV2_Atom* msg, int32_t default_id) +UndoStack::write(const LV2_Atom* msg, int32_t) { _stack.back().push_event(msg); return true; @@ -149,10 +149,10 @@ struct ListContext { flags = SERD_LIST_CONT; serd_writer_write_statement(writer, flags|oflags, nullptr, &node, &p, value, nullptr, nullptr); - end_node(writer, &node); + end_node(&node); } - void end_node(SerdWriter* writer, const SerdNode* node) { + void end_node(const SerdNode* node) { // Prepare for next call: node rdf:rest ... s = *node; p = serd_node_from_string(SERD_URI, NS_RDF "rest"); @@ -197,7 +197,7 @@ UndoStack::write_entry(Sratom* sratom, &node, &p, atom->type, atom->size, LV2_ATOM_BODY_CONST(atom)); - ctx.end_node(writer, &node); + ctx.end_node(&node); } ctx.end(writer); diff --git a/src/server/Worker.cpp b/src/server/Worker.cpp index 59ef306f..81698b32 100644 --- a/src/server/Worker.cpp +++ b/src/server/Worker.cpp @@ -86,7 +86,7 @@ Worker::request(LV2Block* block, } SPtr<LV2_Feature> -Worker::Schedule::feature(World* world, Node* n) +Worker::Schedule::feature(World*, Node* n) { LV2Block* block = dynamic_cast<LV2Block*>(n); if (!block) { diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index 5d2d511c..5ef55012 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -135,7 +135,7 @@ ends_with(const std::string& str, const std::string& end) } bool -Copy::engine_to_filesystem(PreProcessContext& ctx) +Copy::engine_to_filesystem(PreProcessContext&) { // Ensure source is a graph SPtr<GraphImpl> graph = dynamic_ptr_cast<GraphImpl>(_old_block); @@ -161,7 +161,7 @@ Copy::engine_to_filesystem(PreProcessContext& ctx) } bool -Copy::filesystem_to_engine(PreProcessContext& ctx) +Copy::filesystem_to_engine(PreProcessContext&) { if (!_engine.world()->parser()) { return Event::pre_process_done(Status::INTERNAL_ERROR); @@ -187,7 +187,7 @@ Copy::filesystem_to_engine(PreProcessContext& ctx) } void -Copy::execute(RunContext& context) +Copy::execute(RunContext&) { if (_block && _compiled_graph) { _parent->set_compiled_graph(std::move(_compiled_graph)); diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index fabdbd85..c31a9ac3 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -153,7 +153,7 @@ CreateBlock::pre_process(PreProcessContext& ctx) } void -CreateBlock::execute(RunContext& context) +CreateBlock::execute(RunContext&) { if (_status == Status::SUCCESS && _compiled_graph) { _graph->set_compiled_graph(std::move(_compiled_graph)); diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index a79c85ef..7092263e 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -84,7 +84,7 @@ CreatePort::CreatePort(Engine& engine, } bool -CreatePort::pre_process(PreProcessContext& ctx) +CreatePort::pre_process(PreProcessContext&) { if (_port_type == PortType::UNKNOWN) { return Event::pre_process_done(Status::UNKNOWN_TYPE, _path); diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index ad412beb..322db2ab 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -44,7 +44,7 @@ Get::Get(Engine& engine, {} bool -Get::pre_process(PreProcessContext& ctx) +Get::pre_process(PreProcessContext&) { std::lock_guard<Store::Mutex> lock(_engine.store()->mutex()); diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 9598010c..4e99d4f2 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -46,8 +46,8 @@ public: SampleCount timestamp, const ingen::Get& msg); - bool pre_process(PreProcessContext& ctx) override; - void execute(RunContext& context) override {} + bool pre_process(PreProcessContext&) override; + void execute(RunContext&) override {} void post_process() override; private: diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index be943533..edc0377a 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -72,7 +72,7 @@ Mark::pre_process(PreProcessContext& ctx) } void -Mark::execute(RunContext& context) +Mark::execute(RunContext&) { for (auto& g : _compiled_graphs) { g.first->set_compiled_graph(std::move(g.second)); diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 1890dc5f..35a508fe 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -39,7 +39,7 @@ Move::Move(Engine& engine, } bool -Move::pre_process(PreProcessContext& ctx) +Move::pre_process(PreProcessContext&) { std::lock_guard<Store::Mutex> lock(_engine.store()->mutex()); @@ -67,7 +67,7 @@ Move::pre_process(PreProcessContext& ctx) } void -Move::execute(RunContext& context) +Move::execute(RunContext&) { } diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index fa36d739..5052b872 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -50,7 +50,7 @@ SetPortValue::SetPortValue(Engine& engine, } bool -SetPortValue::pre_process(PreProcessContext& ctx) +SetPortValue::pre_process(PreProcessContext&) { ingen::URIs& uris = _engine.world()->uris(); if (_port->is_output()) { diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index 0c307e85..171df3ec 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -41,7 +41,7 @@ Undo::Undo(Engine& engine, {} bool -Undo::pre_process(PreProcessContext& ctx) +Undo::pre_process(PreProcessContext&) { const UPtr<UndoStack>& stack = _is_redo ? _engine.redo_stack() : _engine.undo_stack(); const Event::Mode mode = _is_redo ? Event::Mode::REDO : Event::Mode::UNDO; @@ -70,7 +70,7 @@ Undo::pre_process(PreProcessContext& ctx) } void -Undo::execute(RunContext& context) +Undo::execute(RunContext&) { } diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index 04cc5a33..3d9421e9 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -153,7 +153,7 @@ public: } } - void post_process_port(RunContext& context, EnginePort* port) { + void post_process_port(RunContext&, EnginePort* port) { DuplexPort* graph_port = port->graph_port(); // No copying necessary, host buffers are used directly @@ -206,7 +206,7 @@ public: } /** Add a port. Called only during init or restore. */ - void add_port(RunContext& context, EnginePort* port) override { + void add_port(RunContext&, EnginePort* port) override { const uint32_t index = port->graph_port()->index(); if (_ports.size() <= index) { _ports.resize(index + 1); @@ -215,32 +215,29 @@ public: } /** Remove a port. Called only during init or restore. */ - void remove_port(RunContext& context, EnginePort* port) override { + void remove_port(RunContext&, EnginePort* port) override { const uint32_t index = port->graph_port()->index(); _ports[index] = nullptr; } /** Unused since LV2 has no dynamic ports. */ - void register_port(EnginePort& port) override {} + void register_port(EnginePort&) override {} /** Unused since LV2 has no dynamic ports. */ - void unregister_port(EnginePort& port) override {} + void unregister_port(EnginePort&) override {} /** Unused since LV2 has no dynamic ports. */ - void rename_port(const Raul::Path& old_path, - const Raul::Path& new_path) override {} + void rename_port(const Raul::Path&, const Raul::Path&) override {} /** Unused since LV2 has no dynamic ports. */ - void port_property(const Raul::Path& path, - const URI& uri, - const Atom& value) override {} + void port_property(const Raul::Path&, const URI&, const Atom&) override {} EnginePort* create_port(DuplexPort* graph_port) override { graph_port->set_is_driver_port(*_engine.buffer_factory()); return new EnginePort(graph_port); } - void append_time_events(RunContext& context, Buffer& buffer) override { + void append_time_events(RunContext&, Buffer& buffer) override { const URIs& uris = _engine.world()->uris(); LV2_Atom_Sequence* seq = (LV2_Atom_Sequence*)_ports[0]->buffer(); LV2_ATOM_SEQUENCE_FOREACH(seq, ev) { @@ -309,7 +306,7 @@ public: free(buf); } - void flush_to_ui(RunContext& context) { + void flush_to_ui(RunContext&) { if (_ports.size() < 2) { _engine.log().rt_error("Standard control ports are not present\n"); return; @@ -829,8 +826,7 @@ lib_get_plugin(LV2_Lib_Handle handle, uint32_t index) /** LV2 plugin library entry point */ LV2_SYMBOL_EXPORT const LV2_Lib_Descriptor* -lv2_lib_descriptor(const char* bundle_path, - const LV2_Feature*const* features) +lv2_lib_descriptor(const char* bundle_path, const LV2_Feature*const*) { static const uint32_t desc_size = sizeof(LV2_Lib_Descriptor); Lib* lib = new Lib(bundle_path); diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 9d39f345..f38c4e0e 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -373,7 +373,7 @@ NoteNode::all_notes_off(RunContext& context, FrameTime time) } void -NoteNode::sustain_on(RunContext& context, FrameTime time) +NoteNode::sustain_on(RunContext&, FrameTime) { _sustain = true; } |