Tidy.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2351 a436a847-0d15-0410-975c-d299462d15a1

17 files changed, 22 insertions, 75 deletions

diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp
index c7ac5238..8a0ed67e 100644
--- a/src/engine/AudioBuffer.hpp
+++ b/src/engine/AudioBuffer.hpp
@@ -69,9 +69,9 @@ private:
 
 	LV2_Vector_Body* vector() { return(LV2_Vector_Body*)object()->body; }
 
-	State            _state;     ///< State of buffer for setting values next cycle
-	Sample           _set_value; ///< Value set by set_value (for completing the set next cycle)
-	FrameTime        _set_time;  ///< Time _set_value was set (to reset next cycle)
+	State     _state;     ///< State of buffer for setting values next cycle
+	Sample    _set_value; ///< Value set by set_value (for completing the set next cycle)
+	FrameTime _set_time;  ///< Time _set_value was set (to reset next cycle)
 };
 
 
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index 6ccaceda..f13530ca 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -54,8 +54,6 @@ public:
 
 	Shared::ClientInterface* client(const Raul::URI& uri);
 
-	//void send_client_registration(const string& url, int client_id);
-
 	void bundle_begin();
 	void bundle_end();
 
@@ -81,7 +79,6 @@ private:
 };
 
 
-
 } // namespace Ingen
 
 #endif // CLIENTBROADCASTER_H
diff --git a/src/engine/CompiledPatch.hpp b/src/engine/CompiledPatch.hpp
index ef12bcd6..d6a61f50 100644
--- a/src/engine/CompiledPatch.hpp
+++ b/src/engine/CompiledPatch.hpp
@@ -68,8 +68,6 @@ private:
 struct CompiledPatch : public std::vector<CompiledNode>
                      , public Raul::Deletable
                      , public boost::noncopyable {
-	/*CompiledPatch() : std::vector<CompiledNode>() {}
-	CompiledPatch(size_t reserve) : std::vector<CompiledNode>(reserve) {}*/
 };
 
 
diff --git a/src/engine/Context.hpp b/src/engine/Context.hpp
index 8d3085b8..0029e00c 100644
--- a/src/engine/Context.hpp
+++ b/src/engine/Context.hpp
@@ -19,6 +19,7 @@
 #define CONTEXT_H
 
 #include "EventSink.hpp"
+#include "tuning.hpp"
 
 namespace Ingen {
 
@@ -35,7 +36,7 @@ public:
 	Context(Engine& engine, ID id)
 		: _id(id)
 		, _engine(engine)
-		, _event_sink(engine, 1024) // FIXME: size?
+		, _event_sink(engine, event_queue_size)
 		, _start(0)
 		, _realtime(true)
 	{}
diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp
index 891a7184..7d7070f9 100644
--- a/src/engine/HTTPClientSender.cpp
+++ b/src/engine/HTTPClientSender.cpp
@@ -48,7 +48,7 @@ HTTPClientSender::response_error(int32_t id, const std::string& msg)
 void
 HTTPClientSender::error(const std::string& msg)
 {
-	//send("/ingen/error", "s", msg.c_str(), LO_ARGS_END);
+	warn << "HTTP send error " << msg << endl;
 }
 
 
@@ -128,10 +128,7 @@ HTTPClientSender::set_port_value(const Path& port_path, const Atom& value)
 void
 HTTPClientSender::set_voice_value(const Path& port_path, uint32_t voice, const Atom& value)
 {
-	/*lo_message m = lo_message_new();
-	lo_message_add_string(m, port_path.c_str());
-	AtomLiblo::lo_message_add_atom(m, value);
-	send_message("/ingen/set_port_value", m);*/
+	warn << "TODO: HTTP set voice value" << endl;
 }
 
 
@@ -144,24 +141,6 @@ HTTPClientSender::activity(const Path& path)
 	send_chunk(msg);
 }
 
-#if 0
-static void null_deleter(const GraphObject*) {}
-
-bool
-HTTPClientSender::new_object(const GraphObject* object)
-{
-	SharedPtr<Serialisation::Serialiser> serialiser = _engine.world()->serialiser;
-	serialiser->start_to_string("/", "");
-	// FIXME: kludge
-	// FIXME: engine boost dependency?
-	boost::shared_ptr<GraphObject> obj((GraphObject*)object, null_deleter);
-	serialiser->serialise(obj);
-	string str = serialiser->finish();
-	send_chunk(str);
-	return true;
-}
-#endif
-
 
 void
 HTTPClientSender::move(const Path& old_path, const Path& new_path)
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index 81af61db..d3bc9505 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -61,15 +61,11 @@ public:
 
 	/* *** ClientInterface Implementation Below *** */
 
-	//void client_registration(const std::string& url, int client_id);
-
 	void response_ok(int32_t id);
 	void response_error(int32_t id, const std::string& msg);
 
 	void error(const std::string& msg);
 
-	//virtual bool new_object(const Shared::GraphObject* object);
-
 	virtual void put(const Raul::URI&                    path,
 	                 const Shared::Resource::Properties& properties);
 
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index 98523f43..0a747397 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -228,7 +228,7 @@ JackDriver::attach(const std::string& server_name,
 			_client = jack_client_open(client_name.c_str(),
 					JackServerName, NULL, server_name.c_str());
 			if (_client)
-				LOG(info) << "Connected to JACK server '" << server_name << "'" << endl;
+				LOG(info) << "Connected to JACK server `" << server_name << "'" << endl;
 		}
 
 		// Either server name not specified, or supplied server name does not exist
@@ -237,12 +237,12 @@ JackDriver::attach(const std::string& server_name,
 			_client = jack_client_open(client_name.c_str(), JackNullOption, NULL);
 
 			if (_client)
-				LOG(info) << "Connected to default JACK server." << endl;
+				LOG(info) << "Connected to default JACK server" << endl;
 		}
 
 		// Still failed
 		if (!_client) {
-			LOG(error) << "Unable to connect to Jack.  Exiting." << endl;
+			LOG(error) << "Unable to connect to Jack" << endl;
 			return false;
 		}
 	} else {
@@ -311,7 +311,7 @@ JackDriver::deactivate()
 		}
 
 		_jack_thread->stop();
-		LOG(info) << "Deactivated Jack client." << endl;
+		LOG(info) << "Deactivated Jack client" << endl;
 	}
 }
 
@@ -395,7 +395,6 @@ JackDriver::driver_port(const Path& path)
 /**** Jack Callbacks ****/
 
 
-
 /** Jack process callback, drives entire audio thread.
  *
  * \callgraph
diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp
index e120d74e..1e7165d1 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/engine/JackDriver.hpp
@@ -57,11 +57,11 @@ public:
 	void pre_process(ProcessContext& context);
 	void post_process(ProcessContext& context);
 
-	jack_port_t*  jack_port() const  { return _jack_port; }
+	jack_port_t* jack_port() const { return _jack_port; }
 
 private:
-	JackDriver* _driver;
-	jack_port_t*     _jack_port;
+	JackDriver*  _driver;
+	jack_port_t* _jack_port;
 };
 
 
diff --git a/src/engine/LADSPANode.hpp b/src/engine/LADSPANode.hpp
index ef7db579..b241c471 100644
--- a/src/engine/LADSPANode.hpp
+++ b/src/engine/LADSPANode.hpp
@@ -64,7 +64,7 @@ protected:
 	                     boost::optional<Sample>& lower_bound,
 	                     boost::optional<Sample>& upper_bound);
 
-	const LADSPA_Descriptor* _descriptor;
+	const LADSPA_Descriptor*    _descriptor;
 	Raul::Array<LADSPA_Handle>* _instances;
 	Raul::Array<LADSPA_Handle>* _prepared_instances;
 };
diff --git a/src/engine/LADSPAPlugin.cpp b/src/engine/LADSPAPlugin.cpp
index 7bf4ef4a..1f316849 100644
--- a/src/engine/LADSPAPlugin.cpp
+++ b/src/engine/LADSPAPlugin.cpp
@@ -103,7 +103,7 @@ LADSPAPlugin::instantiate(BufferFactory&    bufs,
 		}
 
 	} else {
-		error << "Could not find plugin \"" << _id << "\" in " << _library_path << endl;
+		error << "Could not find plugin `" << _id << "' in " << _library_path << endl;
 	}
 
 	return n;
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index 34d88fc4..c5317a14 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -61,8 +61,6 @@ public:
 
 	/* *** ClientInterface Implementation Below *** */
 
-	//void client_registration(const std::string& url, int client_id);
-
 	void response_ok(int32_t id);
 	void response_error(int32_t id, const std::string& msg);
 
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index e9348d13..d4b6e43e 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -230,7 +230,7 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types,
 void
 OSCEngineReceiver::error_cb(int num, const char* msg, const char* path)
 {
-	error << "liblo server error " << num << " in path \"" << "\" - " << msg << endl;
+	error << "liblo server error " << num << " for path `" << path << "' (" << msg << ")" << endl;
 }
 
 
diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp
index 821d1028..83a2e5c1 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/engine/ObjectBuffer.hpp
@@ -37,7 +37,6 @@ public:
 	const void* port_data(Shared::PortType port_type) const;
 
 	void copy(Context& context, const Buffer* src);
-	//void mix(Context& context, const Buffer* src) {}
 
 	void resize(size_t size);
 
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index 03365a87..ded0b5cf 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -295,15 +295,3 @@ QueuedEngineInterface::request_all_objects()
 
 
 } // namespace Ingen
-
-
-extern "C" {
-
-Ingen::QueuedEngineInterface*
-new_queued_interface(Ingen::Engine& engine)
-{
-	return new Ingen::QueuedEngineInterface(engine, Ingen::event_queue_size);
-}
-
-} // extern "C"
-
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 9197a27b..ef470e3e 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -103,8 +103,7 @@ public:
 
 	virtual void midi_learn(const Raul::Path& node_path);
 
-	// Requests //
-
+	// Requests
 	virtual void ping();
 	virtual void get(const Raul::URI& uri);
 	virtual void request_property(const Raul::URI& object_path, const Raul::URI& key);
@@ -112,7 +111,6 @@ public:
 	virtual void request_all_objects();
 
 protected:
-
 	virtual void disable_responses();
 
 	SharedPtr<Responder> _responder; ///< NULL if responding disabled
@@ -126,9 +124,4 @@ private:
 
 } // namespace Ingen
 
-extern "C" {
-	extern Ingen::QueuedEngineInterface* new_queued_interface(Ingen::Engine& engine);
-}
-
 #endif // QUEUEDENGINEINTERFACE_H
-
diff --git a/src/engine/QueuedEvent.hpp b/src/engine/QueuedEvent.hpp
index 71c29624..64a82304 100644
--- a/src/engine/QueuedEvent.hpp
+++ b/src/engine/QueuedEvent.hpp
@@ -42,13 +42,12 @@ class QueuedEventSource;
 class QueuedEvent : public Event
 {
 public:
-	/** Process this event into a realtime-suitable event.
-	 */
+	/** Process this event into a realtime-suitable event. */
 	virtual void pre_process();
 
 	virtual void execute(ProcessContext& context);
 
-	/** If this event blocks the prepare phase of other slow events */
+	/** True iff this event blocks the prepare phase of other events. */
 	bool is_blocking() { return _blocking; }
 
 	bool is_prepared() { return _pre_processed; }
diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp
index 0dd08924..c35266c5 100644
--- a/src/engine/events/SendPortActivity.hpp
+++ b/src/engine/events/SendPortActivity.hpp
@@ -44,8 +44,8 @@ class SendPortActivity : public Event
 {
 public:
 	inline SendPortActivity(Engine&     engine,
-	                             SampleCount timestamp,
-	                             PortImpl*   port)
+	                        SampleCount timestamp,
+	                        PortImpl*   port)
 		: Event(engine, SharedPtr<Responder>(), timestamp)
 		, _port(port)
 	{