From 784dc03a78dc338b45111ebdca45371dfaaa6fa9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 23 Feb 2010 18:45:26 +0000 Subject: Fix various code issues discovered by cppcheck. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2484 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/Buffer.hpp | 1 + src/engine/HTTPClientSender.hpp | 1 + src/engine/InputPort.cpp | 7 ------- src/engine/InputPort.hpp | 1 - src/engine/ObjectBuffer.cpp | 6 ++++++ src/engine/ObjectBuffer.hpp | 1 + src/engine/PostProcessor.cpp | 6 ++++++ src/engine/PostProcessor.hpp | 1 + src/engine/events/Connect.cpp | 2 ++ src/engine/events/SendBinding.hpp | 3 ++- src/engine/events/SendPortActivity.hpp | 3 ++- src/engine/events/SendPortValue.hpp | 3 ++- src/engine/events/SetMetadata.hpp | 1 - src/engine/ingen.lv2/ingen_lv2.cpp | 1 + 14 files changed, 25 insertions(+), 12 deletions(-) (limited to 'src/engine') diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp index b6d8b722..0a9d59c2 100644 --- a/src/engine/Buffer.hpp +++ b/src/engine/Buffer.hpp @@ -41,6 +41,7 @@ public: : _factory(bufs) , _type(type) , _size(size) + , _next(NULL) , _refs(0) {} diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index c34decad..1f2863e4 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -45,6 +45,7 @@ class HTTPClientSender public: HTTPClientSender(Engine& engine) : _engine(engine) + , _enabled(true) {} bool enabled() const { return _enabled; } diff --git a/src/engine/InputPort.cpp b/src/engine/InputPort.cpp index 04573a1a..f4fd3620 100644 --- a/src/engine/InputPort.cpp +++ b/src/engine/InputPort.cpp @@ -226,12 +226,5 @@ InputPort::post_process(Context& context) } -bool -InputPort::is_silent() const -{ - return (_connections.size() == 0 && _type == PortType::AUDIO); -} - - } // namespace Ingen diff --git a/src/engine/InputPort.hpp b/src/engine/InputPort.hpp index 21cf3372..44f82370 100644 --- a/src/engine/InputPort.hpp +++ b/src/engine/InputPort.hpp @@ -78,7 +78,6 @@ public: bool is_input() const { return true; } bool is_output() const { return false; } - bool is_silent() const; protected: size_t _num_connections; ///< Pre-process thread diff --git a/src/engine/ObjectBuffer.cpp b/src/engine/ObjectBuffer.cpp index e568f541..c905826d 100644 --- a/src/engine/ObjectBuffer.cpp +++ b/src/engine/ObjectBuffer.cpp @@ -59,6 +59,12 @@ ObjectBuffer::ObjectBuffer(BufferFactory& bufs, size_t capacity) } +ObjectBuffer::~ObjectBuffer() +{ + free(_buf); +} + + void ObjectBuffer::clear() { diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp index 30b1029c..7d6d08e1 100644 --- a/src/engine/ObjectBuffer.hpp +++ b/src/engine/ObjectBuffer.hpp @@ -30,6 +30,7 @@ class Context; class ObjectBuffer : public Buffer { public: ObjectBuffer(BufferFactory& bufs, size_t capacity); + ~ObjectBuffer(); void clear(); diff --git a/src/engine/PostProcessor.cpp b/src/engine/PostProcessor.cpp index de073f1a..067c00ba 100644 --- a/src/engine/PostProcessor.cpp +++ b/src/engine/PostProcessor.cpp @@ -42,6 +42,12 @@ PostProcessor::PostProcessor(Engine& engine, size_t queue_size) } +PostProcessor::~PostProcessor() +{ + free(_event_buffer); +} + + void PostProcessor::process() { diff --git a/src/engine/PostProcessor.hpp b/src/engine/PostProcessor.hpp index 6450d10a..e35f75a5 100644 --- a/src/engine/PostProcessor.hpp +++ b/src/engine/PostProcessor.hpp @@ -43,6 +43,7 @@ class PostProcessor { public: PostProcessor(Engine& engine, size_t queue_size); + ~PostProcessor(); /** Push a list of events on to the process queue, realtime-safe, not thread-safe. */ inline void append(Raul::List* l) { _events.append(*l); } diff --git a/src/engine/events/Connect.cpp b/src/engine/events/Connect.cpp index 6d096bbd..fac11965 100644 --- a/src/engine/events/Connect.cpp +++ b/src/engine/events/Connect.cpp @@ -49,6 +49,8 @@ Connect::Connect(Engine& engine, SharedPtr request, SampleCount timesta , _patch(NULL) , _src_port(NULL) , _dst_port(NULL) + , _src_output_port(NULL) + , _dst_input_port(NULL) , _compiled_patch(NULL) , _patch_listnode(NULL) , _port_listnode(NULL) diff --git a/src/engine/events/SendBinding.hpp b/src/engine/events/SendBinding.hpp index 837d3463..b11ecfd2 100644 --- a/src/engine/events/SendBinding.hpp +++ b/src/engine/events/SendBinding.hpp @@ -65,10 +65,11 @@ public: } } - inline void operator=(const SendBinding& ev) { + inline SendBinding& operator=(const SendBinding& ev) { _port = ev._port; _type = ev._type; _num = ev._num; + return *this; } void post_process(); diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp index 4481d8fc..61e0113a 100644 --- a/src/engine/events/SendPortActivity.hpp +++ b/src/engine/events/SendPortActivity.hpp @@ -51,8 +51,9 @@ public: { } - inline void operator=(const SendPortActivity& ev) { + inline SendPortActivity& operator=(const SendPortActivity& ev) { _port = ev._port; + return *this; } void post_process(); diff --git a/src/engine/events/SendPortValue.hpp b/src/engine/events/SendPortValue.hpp index 8cbb3cbe..2b390832 100644 --- a/src/engine/events/SendPortValue.hpp +++ b/src/engine/events/SendPortValue.hpp @@ -58,11 +58,12 @@ public: { } - inline void operator=(const SendPortValue& ev) { + inline SendPortValue& operator=(const SendPortValue& ev) { _port = ev._port; _omni = ev._omni; _voice_num = ev._voice_num; _value = ev._value; + return *this; } void post_process(); diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp index ee7d9d42..c13505cc 100644 --- a/src/engine/events/SetMetadata.hpp +++ b/src/engine/events/SetMetadata.hpp @@ -114,7 +114,6 @@ private: std::string _error_predicate; bool _create; bool _is_meta; - bool _success; SharedPtr _old_bindings; }; diff --git a/src/engine/ingen.lv2/ingen_lv2.cpp b/src/engine/ingen.lv2/ingen_lv2.cpp index 3ff285e5..fb145c53 100644 --- a/src/engine/ingen.lv2/ingen_lv2.cpp +++ b/src/engine/ingen.lv2/ingen_lv2.cpp @@ -40,6 +40,7 @@ struct IngenLV2Driver : public Ingen::Driver { , _buffer_size(buffer_size) , _sample_rate(sample_rate) , _frame_time(0) + , _root_patch(NULL) {} void activate() {} -- cgit v1.2.1