summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-16 19:02:36 +0000
committerDavid Robillard <d@drobilla.net>2011-04-16 19:02:36 +0000
commit9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2 (patch)
tree089c1366a567dfbf88c0473288236b276ef24bf6 /src
parent987710474b824cb92d83ff6fa7a090f50e10756f (diff)
downloadingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.gz
ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.tar.bz2
ingen-9e5a7cf49ad84a5a3fa0aa61be11129fc4df1cc2.zip
Squeeze blank lines and delete trailing whitespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3152 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/client/ConnectionModel.hpp2
-rw-r--r--src/client/HTTPClientReceiver.cpp9
-rw-r--r--src/client/HTTPClientReceiver.hpp1
-rw-r--r--src/client/HTTPEngineSender.cpp25
-rw-r--r--src/client/HTTPEngineSender.hpp2
-rw-r--r--src/client/NodeModel.cpp18
-rw-r--r--src/client/NodeModel.hpp2
-rw-r--r--src/client/OSCClientReceiver.cpp19
-rw-r--r--src/client/OSCClientReceiver.hpp2
-rw-r--r--src/client/OSCEngineSender.cpp24
-rw-r--r--src/client/OSCEngineSender.hpp3
-rw-r--r--src/client/ObjectModel.cpp12
-rw-r--r--src/client/ObjectModel.hpp4
-rw-r--r--src/client/PatchModel.cpp10
-rw-r--r--src/client/PatchModel.hpp2
-rw-r--r--src/client/PluginModel.cpp11
-rw-r--r--src/client/PluginModel.hpp2
-rw-r--r--src/client/PluginUI.cpp3
-rw-r--r--src/client/PluginUI.hpp4
-rw-r--r--src/client/PortModel.cpp7
-rw-r--r--src/client/PortModel.hpp2
-rw-r--r--src/client/SigClientInterface.hpp2
-rw-r--r--src/client/ThreadedSigClientInterface.cpp3
-rw-r--r--src/client/ThreadedSigClientInterface.hpp2
-rw-r--r--src/engine/AudioBuffer.cpp9
-rw-r--r--src/engine/AudioBuffer.hpp3
-rw-r--r--src/engine/Buffer.hpp2
-rw-r--r--src/engine/BufferFactory.cpp9
-rw-r--r--src/engine/ClientBroadcaster.cpp8
-rw-r--r--src/engine/ClientBroadcaster.hpp3
-rw-r--r--src/engine/CompiledPatch.hpp2
-rw-r--r--src/engine/ConnectionImpl.cpp7
-rw-r--r--src/engine/ConnectionImpl.hpp2
-rw-r--r--src/engine/Context.hpp2
-rw-r--r--src/engine/ControlBindings.cpp16
-rw-r--r--src/engine/Driver.hpp3
-rw-r--r--src/engine/DuplexPort.cpp5
-rw-r--r--src/engine/DuplexPort.hpp2
-rw-r--r--src/engine/Engine.cpp10
-rw-r--r--src/engine/EngineStore.cpp11
-rw-r--r--src/engine/EngineStore.hpp2
-rw-r--r--src/engine/Event.cpp3
-rw-r--r--src/engine/Event.hpp2
-rw-r--r--src/engine/EventBuffer.cpp11
-rw-r--r--src/engine/EventBuffer.hpp2
-rw-r--r--src/engine/EventSink.cpp3
-rw-r--r--src/engine/EventSink.hpp3
-rw-r--r--src/engine/EventSource.cpp8
-rw-r--r--src/engine/EventSource.hpp2
-rw-r--r--src/engine/GraphObjectImpl.cpp7
-rw-r--r--src/engine/GraphObjectImpl.hpp2
-rw-r--r--src/engine/HTTPClientSender.cpp11
-rw-r--r--src/engine/HTTPClientSender.hpp2
-rw-r--r--src/engine/HTTPEngineReceiver.cpp6
-rw-r--r--src/engine/InputPort.cpp8
-rw-r--r--src/engine/InputPort.hpp2
-rw-r--r--src/engine/InternalPlugin.cpp2
-rw-r--r--src/engine/InternalPlugin.hpp2
-rw-r--r--src/engine/JackDriver.cpp27
-rw-r--r--src/engine/JackDriver.hpp4
-rw-r--r--src/engine/LV2Info.hpp1
-rw-r--r--src/engine/LV2Node.cpp11
-rw-r--r--src/engine/LV2Node.hpp2
-rw-r--r--src/engine/LV2Plugin.cpp6
-rw-r--r--src/engine/LV2Plugin.hpp2
-rw-r--r--src/engine/MessageContext.cpp3
-rw-r--r--src/engine/MessageContext.hpp1
-rw-r--r--src/engine/NodeFactory.cpp6
-rw-r--r--src/engine/NodeFactory.hpp2
-rw-r--r--src/engine/NodeImpl.cpp21
-rw-r--r--src/engine/NodeImpl.hpp2
-rw-r--r--src/engine/OSCClientSender.cpp14
-rw-r--r--src/engine/OSCClientSender.hpp2
-rw-r--r--src/engine/OSCEngineReceiver.cpp34
-rw-r--r--src/engine/OSCEngineReceiver.hpp4
-rw-r--r--src/engine/ObjectBuffer.cpp9
-rw-r--r--src/engine/ObjectBuffer.hpp1
-rw-r--r--src/engine/ObjectSender.cpp4
-rw-r--r--src/engine/ObjectSender.hpp1
-rw-r--r--src/engine/OutputPort.cpp4
-rw-r--r--src/engine/OutputPort.hpp2
-rw-r--r--src/engine/PatchImpl.cpp25
-rw-r--r--src/engine/PatchImpl.hpp4
-rw-r--r--src/engine/PatchPlugin.hpp2
-rw-r--r--src/engine/PluginImpl.cpp3
-rw-r--r--src/engine/PluginImpl.hpp2
-rw-r--r--src/engine/PortImpl.cpp15
-rw-r--r--src/engine/PortImpl.hpp2
-rw-r--r--src/engine/PostProcessor.cpp4
-rw-r--r--src/engine/PostProcessor.hpp2
-rw-r--r--src/engine/ProcessContext.hpp2
-rw-r--r--src/engine/ProcessSlave.cpp3
-rw-r--r--src/engine/ProcessSlave.hpp2
-rw-r--r--src/engine/QueuedEngineInterface.cpp25
-rw-r--r--src/engine/QueuedEngineInterface.hpp2
-rw-r--r--src/engine/QueuedEvent.cpp3
-rw-r--r--src/engine/QueuedEvent.hpp2
-rw-r--r--src/engine/Request.hpp2
-rw-r--r--src/engine/ThreadManager.hpp3
-rw-r--r--src/engine/events/Connect.cpp5
-rw-r--r--src/engine/events/Connect.hpp2
-rw-r--r--src/engine/events/CreateNode.cpp4
-rw-r--r--src/engine/events/CreateNode.hpp2
-rw-r--r--src/engine/events/CreatePatch.cpp5
-rw-r--r--src/engine/events/CreatePatch.hpp3
-rw-r--r--src/engine/events/CreatePort.cpp5
-rw-r--r--src/engine/events/CreatePort.hpp2
-rw-r--r--src/engine/events/Deactivate.hpp2
-rw-r--r--src/engine/events/Delete.cpp6
-rw-r--r--src/engine/events/Delete.hpp2
-rw-r--r--src/engine/events/Disconnect.cpp7
-rw-r--r--src/engine/events/Disconnect.hpp2
-rw-r--r--src/engine/events/DisconnectAll.cpp7
-rw-r--r--src/engine/events/DisconnectAll.hpp3
-rw-r--r--src/engine/events/Get.cpp4
-rw-r--r--src/engine/events/Get.hpp2
-rw-r--r--src/engine/events/LoadPlugins.cpp2
-rw-r--r--src/engine/events/LoadPlugins.hpp2
-rw-r--r--src/engine/events/Move.cpp6
-rw-r--r--src/engine/events/Move.hpp2
-rw-r--r--src/engine/events/Ping.hpp2
-rw-r--r--src/engine/events/RegisterClient.cpp4
-rw-r--r--src/engine/events/RegisterClient.hpp2
-rw-r--r--src/engine/events/RequestMetadata.cpp5
-rw-r--r--src/engine/events/RequestMetadata.hpp2
-rw-r--r--src/engine/events/SendBinding.cpp2
-rw-r--r--src/engine/events/SendBinding.hpp2
-rw-r--r--src/engine/events/SendPortActivity.cpp2
-rw-r--r--src/engine/events/SendPortActivity.hpp2
-rw-r--r--src/engine/events/SendPortValue.cpp2
-rw-r--r--src/engine/events/SendPortValue.hpp2
-rw-r--r--src/engine/events/SetMetadata.cpp7
-rw-r--r--src/engine/events/SetMetadata.hpp2
-rw-r--r--src/engine/events/SetPortValue.cpp7
-rw-r--r--src/engine/events/SetPortValue.hpp2
-rw-r--r--src/engine/events/UnregisterClient.cpp3
-rw-r--r--src/engine/events/UnregisterClient.hpp2
-rw-r--r--src/engine/ingen_lv2.cpp2
-rw-r--r--src/engine/internals/Controller.cpp3
-rw-r--r--src/engine/internals/Controller.hpp2
-rw-r--r--src/engine/internals/Delay.cpp6
-rw-r--r--src/engine/internals/Delay.hpp2
-rw-r--r--src/engine/internals/Note.cpp12
-rw-r--r--src/engine/internals/Note.hpp2
-rw-r--r--src/engine/internals/Trigger.cpp4
-rw-r--r--src/engine/internals/Trigger.hpp2
-rw-r--r--src/engine/tuning.hpp1
-rw-r--r--src/gui/App.cpp21
-rw-r--r--src/gui/App.hpp2
-rw-r--r--src/gui/BreadCrumbs.cpp9
-rw-r--r--src/gui/BreadCrumbs.hpp1
-rw-r--r--src/gui/Configuration.cpp7
-rw-r--r--src/gui/Configuration.hpp2
-rw-r--r--src/gui/ConnectWindow.cpp18
-rw-r--r--src/gui/ConnectWindow.hpp2
-rw-r--r--src/gui/Connection.cpp1
-rw-r--r--src/gui/Connection.hpp2
-rw-r--r--src/gui/ControlPanel.cpp8
-rw-r--r--src/gui/ControlPanel.hpp2
-rw-r--r--src/gui/Controls.cpp28
-rw-r--r--src/gui/Controls.hpp5
-rw-r--r--src/gui/GladeFactory.cpp3
-rw-r--r--src/gui/GladeFactory.hpp2
-rw-r--r--src/gui/LoadPatchWindow.cpp12
-rw-r--r--src/gui/LoadPatchWindow.hpp2
-rw-r--r--src/gui/LoadPluginWindow.cpp20
-rw-r--r--src/gui/LoadPluginWindow.hpp2
-rw-r--r--src/gui/LoadRemotePatchWindow.cpp9
-rw-r--r--src/gui/LoadRemotePatchWindow.hpp4
-rw-r--r--src/gui/MessagesWindow.cpp4
-rw-r--r--src/gui/MessagesWindow.hpp2
-rw-r--r--src/gui/NewSubpatchWindow.cpp5
-rw-r--r--src/gui/NewSubpatchWindow.hpp2
-rw-r--r--src/gui/NodeControlWindow.cpp7
-rw-r--r--src/gui/NodeControlWindow.hpp2
-rw-r--r--src/gui/NodeMenu.cpp11
-rw-r--r--src/gui/NodeMenu.hpp2
-rw-r--r--src/gui/NodeModule.cpp21
-rw-r--r--src/gui/NodeModule.hpp2
-rw-r--r--src/gui/ObjectMenu.cpp9
-rw-r--r--src/gui/ObjectMenu.hpp1
-rw-r--r--src/gui/PatchCanvas.hpp2
-rw-r--r--src/gui/PatchPortModule.cpp10
-rw-r--r--src/gui/PatchPortModule.hpp2
-rw-r--r--src/gui/PatchTreeWindow.cpp12
-rw-r--r--src/gui/PatchTreeWindow.hpp3
-rw-r--r--src/gui/PatchView.cpp13
-rw-r--r--src/gui/PatchView.hpp2
-rw-r--r--src/gui/PatchWindow.cpp40
-rw-r--r--src/gui/PatchWindow.hpp2
-rw-r--r--src/gui/Port.cpp13
-rw-r--r--src/gui/Port.hpp2
-rw-r--r--src/gui/PortMenu.cpp7
-rw-r--r--src/gui/PortMenu.hpp2
-rw-r--r--src/gui/PortPropertiesWindow.cpp8
-rw-r--r--src/gui/PortPropertiesWindow.hpp1
-rw-r--r--src/gui/PropertiesWindow.cpp10
-rw-r--r--src/gui/PropertiesWindow.hpp1
-rw-r--r--src/gui/RenameWindow.cpp7
-rw-r--r--src/gui/RenameWindow.hpp1
-rw-r--r--src/gui/SubpatchModule.cpp4
-rw-r--r--src/gui/SubpatchModule.hpp2
-rw-r--r--src/gui/UploadPatchWindow.cpp16
-rw-r--r--src/gui/UploadPatchWindow.hpp3
-rw-r--r--src/gui/Window.cpp2
-rw-r--r--src/gui/Window.hpp3
-rw-r--r--src/gui/WindowFactory.cpp22
-rw-r--r--src/gui/WindowFactory.hpp3
-rw-r--r--src/ingen/main.cpp2
-rw-r--r--src/serialisation/Parser.cpp2
-rw-r--r--src/serialisation/Serialiser.cpp2
-rw-r--r--src/shared/Builder.cpp5
-rw-r--r--src/shared/Builder.hpp2
-rw-r--r--src/shared/ClashAvoider.cpp11
-rw-r--r--src/shared/ClashAvoider.hpp2
-rw-r--r--src/shared/HTTPSender.cpp6
-rw-r--r--src/shared/HTTPSender.hpp1
-rw-r--r--src/shared/LV2Atom.cpp3
-rw-r--r--src/shared/LV2Features.cpp5
-rw-r--r--src/shared/LV2URIMap.cpp9
-rw-r--r--src/shared/LV2URIMap.hpp8
-rw-r--r--src/shared/Module.hpp1
-rw-r--r--src/shared/OSCSender.cpp7
-rw-r--r--src/shared/OSCSender.hpp1
-rw-r--r--src/shared/ResourceImpl.cpp12
-rw-r--r--src/shared/ResourceImpl.hpp1
-rw-r--r--src/shared/Store.cpp6
-rw-r--r--src/shared/Store.hpp2
-rw-r--r--src/shared/World.cpp12
-rw-r--r--src/shared/World.hpp4
230 files changed, 14 insertions, 1283 deletions
diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp
index 5481b713..9c25975f 100644
--- a/src/client/ConnectionModel.hpp
+++ b/src/client/ConnectionModel.hpp
@@ -31,7 +31,6 @@ namespace Client {
class ClientStore;
-
/** Class to represent a port->port connection in the engine.
*
* This can either have pointers to the connection ports' models, or just
@@ -69,7 +68,6 @@ private:
const SharedPtr<PortModel> _dst_port;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp
index 3ba334b0..81119767 100644
--- a/src/client/HTTPClientReceiver.cpp
+++ b/src/client/HTTPClientReceiver.cpp
@@ -57,7 +57,6 @@ HTTPClientReceiver::HTTPClientReceiver(
client_receiver = this;
}
-
HTTPClientReceiver::~HTTPClientReceiver()
{
stop();
@@ -65,7 +64,6 @@ HTTPClientReceiver::~HTTPClientReceiver()
client_receiver = NULL;
}
-
HTTPClientReceiver::Listener::Listener(HTTPClientReceiver* receiver, const std::string& uri)
: _uri(uri)
, _receiver(receiver)
@@ -104,7 +102,6 @@ HTTPClientReceiver::Listener::Listener(HTTPClientReceiver* receiver, const std::
}
}
-
HTTPClientReceiver::Listener::~Listener()
{
close(_sock);
@@ -122,7 +119,6 @@ HTTPClientReceiver::send(SoupMessage* msg)
soup_session_queue_message(client_session, msg, message_callback, client_receiver);
}
-
void
HTTPClientReceiver::close_session()
{
@@ -133,7 +129,6 @@ HTTPClientReceiver::close_session()
}
}
-
void
HTTPClientReceiver::update(const std::string& str)
{
@@ -168,7 +163,6 @@ HTTPClientReceiver::Listener::_run()
LOG(info) << "HTTP listener finished" << endl;
}
-
void
HTTPClientReceiver::message_callback(SoupSession* session, SoupMessage* msg, void* ptr)
{
@@ -226,7 +220,6 @@ HTTPClientReceiver::message_callback(SoupSession* session, SoupMessage* msg, voi
}
}
-
void
HTTPClientReceiver::start(bool dump)
{
@@ -238,7 +231,6 @@ HTTPClientReceiver::start(bool dump)
soup_session_queue_message(client_session, msg, message_callback, this);
}
-
void
HTTPClientReceiver::stop()
{
@@ -246,7 +238,6 @@ HTTPClientReceiver::stop()
close_session();
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/HTTPClientReceiver.hpp b/src/client/HTTPClientReceiver.hpp
index 415ac8a1..f699f74e 100644
--- a/src/client/HTTPClientReceiver.hpp
+++ b/src/client/HTTPClientReceiver.hpp
@@ -78,7 +78,6 @@ private:
bool _quit_flag;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp
index c426777d..27682c5e 100644
--- a/src/client/HTTPEngineSender.cpp
+++ b/src/client/HTTPEngineSender.cpp
@@ -34,7 +34,6 @@ namespace Ingen {
using namespace Shared;
namespace Client {
-
HTTPEngineSender::HTTPEngineSender(World* world, const URI& engine_url)
: _world(*world->rdf_world())
, _engine_url(engine_url)
@@ -44,7 +43,6 @@ HTTPEngineSender::HTTPEngineSender(World* world, const URI& engine_url)
_session = soup_session_sync_new();
}
-
HTTPEngineSender::~HTTPEngineSender()
{
soup_session_abort(_session);
@@ -58,10 +56,8 @@ HTTPEngineSender::attach(int32_t ping_id, bool block)
HTTPClientReceiver::send(msg);
}
-
/* *** EngineInterface implementation below here *** */
-
/** Register with the engine via HTTP.
*
* Note that this does not actually use 'key', since the engine creates
@@ -75,13 +71,11 @@ HTTPEngineSender::register_client(ClientInterface* client)
HTTPClientReceiver::send(msg);*/
}
-
void
HTTPEngineSender::unregister_client(const URI& uri)
{
}
-
// Engine commands
void
HTTPEngineSender::load_plugins()
@@ -90,30 +84,23 @@ HTTPEngineSender::load_plugins()
HTTPClientReceiver::send(msg);
}
-
void
HTTPEngineSender::activate()
{
}
-
void
HTTPEngineSender::deactivate()
{
}
-
void
HTTPEngineSender::quit()
{
}
-
-
// Object commands
-
-
void
HTTPEngineSender::put(const URI& uri,
const Resource::Properties& properties,
@@ -135,7 +122,6 @@ HTTPEngineSender::put(const URI& uri,
soup_session_send_message(_session, msg);
}
-
void
HTTPEngineSender::delta(const Raul::URI& path,
const Shared::Resource::Properties& remove,
@@ -144,7 +130,6 @@ HTTPEngineSender::delta(const Raul::URI& path,
warn << "FIXME: HTTP DELTA" << endl;
}
-
void
HTTPEngineSender::move(const Path& old_path,
const Path& new_path)
@@ -156,7 +141,6 @@ HTTPEngineSender::move(const Path& old_path,
soup_session_send_message(_session, msg);
}
-
void
HTTPEngineSender::del(const Path& uri)
{
@@ -166,28 +150,24 @@ HTTPEngineSender::del(const Path& uri)
soup_session_send_message(_session, msg);
}
-
void
HTTPEngineSender::connect(const Path& src_port_path,
const Path& dst_port_path)
{
}
-
void
HTTPEngineSender::disconnect(const Path& src_port_path,
const Path& dst_port_path)
{
}
-
void
HTTPEngineSender::disconnect_all(const Path& parent_patch_path,
const Path& path)
{
}
-
void
HTTPEngineSender::set_property(const URI& subject,
const URI& predicate,
@@ -198,8 +178,6 @@ HTTPEngineSender::set_property(const URI& subject,
put(subject, prop);
}
-
-
// Requests //
void
@@ -209,7 +187,6 @@ HTTPEngineSender::ping()
get(_engine_url);
}
-
void
HTTPEngineSender::get(const URI& uri)
{
@@ -218,14 +195,12 @@ HTTPEngineSender::get(const URI& uri)
HTTPClientReceiver::send(msg);
}
-
void
HTTPEngineSender::request_property(const URI& object_path, const URI& key)
{
LOG(warn) << "TODO: request property" << endl;
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp
index 207d644f..5713d593 100644
--- a/src/client/HTTPEngineSender.hpp
+++ b/src/client/HTTPEngineSender.hpp
@@ -60,7 +60,6 @@ public:
void attach(int32_t ping_id, bool block);
-
/* *** EngineInterface implementation below here *** */
void enable() { _enabled = true; }
@@ -124,7 +123,6 @@ protected:
bool _enabled;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp
index 2d3f8f72..d7bcc7f4 100644
--- a/src/client/NodeModel.cpp
+++ b/src/client/NodeModel.cpp
@@ -29,7 +29,6 @@ using namespace Raul;
namespace Ingen {
namespace Client {
-
NodeModel::NodeModel(Shared::LV2URIMap& uris, SharedPtr<PluginModel> plugin, const Path& path)
: Node()
, ObjectModel(uris, path)
@@ -51,7 +50,6 @@ NodeModel::NodeModel(Shared::LV2URIMap& uris, const URI& plugin_uri, const Path&
{
}
-
NodeModel::NodeModel(const NodeModel& copy)
: Node(copy)
, ObjectModel(copy)
@@ -64,13 +62,11 @@ NodeModel::NodeModel(const NodeModel& copy)
memcpy(_max_values, copy._max_values, sizeof(float) * _num_values);
}
-
NodeModel::~NodeModel()
{
clear();
}
-
void
NodeModel::remove_port(SharedPtr<PortModel> port)
{
@@ -83,7 +79,6 @@ NodeModel::remove_port(SharedPtr<PortModel> port)
signal_removed_port.emit(port);
}
-
void
NodeModel::remove_port(const Path& port_path)
{
@@ -95,7 +90,6 @@ NodeModel::remove_port(const Path& port_path)
}
}
-
void
NodeModel::clear()
{
@@ -107,7 +101,6 @@ NodeModel::clear()
_max_values = 0;
}
-
void
NodeModel::add_child(SharedPtr<ObjectModel> c)
{
@@ -120,7 +113,6 @@ NodeModel::add_child(SharedPtr<ObjectModel> c)
add_port(pm);
}
-
bool
NodeModel::remove_child(SharedPtr<ObjectModel> c)
{
@@ -137,7 +129,6 @@ NodeModel::remove_child(SharedPtr<ObjectModel> c)
return true;
}
-
void
NodeModel::add_port(SharedPtr<PortModel> pm)
{
@@ -154,7 +145,6 @@ NodeModel::add_port(SharedPtr<PortModel> pm)
signal_new_port.emit(pm);
}
-
SharedPtr<PortModel>
NodeModel::get_port(const Raul::Symbol& symbol) const
{
@@ -164,7 +154,6 @@ NodeModel::get_port(const Raul::Symbol& symbol) const
return SharedPtr<PortModel>();
}
-
Shared::Port*
NodeModel::port(uint32_t index) const
{
@@ -172,7 +161,6 @@ NodeModel::port(uint32_t index) const
return dynamic_cast<Shared::Port*>(_ports[index].get());
}
-
void
NodeModel::default_port_value_range(SharedPtr<PortModel> port, float& min, float& max) const
{
@@ -200,7 +188,6 @@ NodeModel::default_port_value_range(SharedPtr<PortModel> port, float& min, float
#endif
}
-
void
NodeModel::port_value_range(SharedPtr<PortModel> port, float& min, float& max) const
{
@@ -220,7 +207,6 @@ NodeModel::port_value_range(SharedPtr<PortModel> port, float& min, float& max) c
max = min + 1.0;
}
-
std::string
NodeModel::port_label(SharedPtr<PortModel> port) const
{
@@ -228,7 +214,7 @@ NodeModel::port_label(SharedPtr<PortModel> port) const
if (name.is_valid()) {
return name.get_string();
}
-
+
#ifdef HAVE_SLV2
if (_plugin && _plugin->type() == PluginModel::LV2) {
SLV2World c_world = _plugin->slv2_world();
@@ -247,7 +233,6 @@ NodeModel::port_label(SharedPtr<PortModel> port) const
return port->symbol().c_str();
}
-
void
NodeModel::set(SharedPtr<ObjectModel> model)
{
@@ -260,6 +245,5 @@ NodeModel::set(SharedPtr<ObjectModel> model)
ObjectModel::set(model);
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp
index cc47a25d..4ca3847e 100644
--- a/src/client/NodeModel.hpp
+++ b/src/client/NodeModel.hpp
@@ -40,7 +40,6 @@ namespace Client {
class PluginModel;
class ClientStore;
-
/** Node model class, used by the client to store engine's state.
*
* \ingroup IngenClient
@@ -101,7 +100,6 @@ private:
mutable float* _max_values; ///< Port max values (cached for LV2)
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp
index 00d8cc32..37cfb532 100644
--- a/src/client/OSCClientReceiver.cpp
+++ b/src/client/OSCClientReceiver.cpp
@@ -50,13 +50,11 @@ OSCClientReceiver::OSCClientReceiver(int listen_port, SharedPtr<Shared::ClientIn
#endif
}
-
OSCClientReceiver::~OSCClientReceiver()
{
stop();
}
-
void
OSCClientReceiver::start(bool dump_osc)
{
@@ -95,7 +93,6 @@ OSCClientReceiver::start(bool dump_osc)
lo_server_thread_start(_st);
}
-
void
OSCClientReceiver::stop()
{
@@ -106,7 +103,6 @@ OSCClientReceiver::stop()
}
}
-
int
OSCClientReceiver::generic_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* user_data)
{
@@ -121,15 +117,12 @@ OSCClientReceiver::generic_cb(const char* path, const char* types, lo_arg** argv
return 1; // not handled
}
-
void
OSCClientReceiver::lo_error_cb(int num, const char* msg, const char* path)
{
LOG(error) << "Got error from server: " << msg << endl;
}
-
-
int
OSCClientReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv, int argc, void* data, void* user_data)
{
@@ -141,7 +134,6 @@ OSCClientReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv
return 0;
}
-
void
OSCClientReceiver::setup_callbacks()
{
@@ -157,7 +149,6 @@ OSCClientReceiver::setup_callbacks()
lo_server_thread_add_method(_st, "/activity", "s", activity_cb, this);
}
-
/** Catches errors that aren't a direct result of a client request.
*/
int
@@ -167,7 +158,6 @@ OSCClientReceiver::_error_cb(const char* path, const char* types, lo_arg** argv,
return 0;
}
-
int
OSCClientReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -175,7 +165,6 @@ OSCClientReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, i
return 0;
}
-
int
OSCClientReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -187,7 +176,6 @@ OSCClientReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, i
return 0;
}
-
int
OSCClientReceiver::_move_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -195,7 +183,6 @@ OSCClientReceiver::_move_cb(const char* path, const char* types, lo_arg** argv,
return 0;
}
-
int
OSCClientReceiver::_connection_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -207,7 +194,6 @@ OSCClientReceiver::_connection_cb(const char* path, const char* types, lo_arg**
return 0;
}
-
int
OSCClientReceiver::_disconnection_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -219,7 +205,6 @@ OSCClientReceiver::_disconnection_cb(const char* path, const char* types, lo_arg
return 0;
}
-
/** Notification of a new or updated property.
*/
int
@@ -238,7 +223,6 @@ OSCClientReceiver::_set_property_cb(const char* path, const char* types, lo_arg*
return 0;
}
-
int
OSCClientReceiver::_activity_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -249,7 +233,6 @@ OSCClientReceiver::_activity_cb(const char* path, const char* types, lo_arg** ar
return 0;
}
-
int
OSCClientReceiver::_response_ok_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -259,7 +242,6 @@ OSCClientReceiver::_response_ok_cb(const char* path, const char* types, lo_arg**
return 0;
}
-
int
OSCClientReceiver::_response_error_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg)
{
@@ -269,6 +251,5 @@ OSCClientReceiver::_response_error_cb(const char* path, const char* types, lo_ar
return 0;
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/OSCClientReceiver.hpp b/src/client/OSCClientReceiver.hpp
index 9f9b8088..76c84d3d 100644
--- a/src/client/OSCClientReceiver.hpp
+++ b/src/client/OSCClientReceiver.hpp
@@ -38,7 +38,6 @@ int _##name##_cb (LO_HANDLER_ARGS);\
inline static int name##_cb(LO_HANDLER_ARGS, void* osc_listener)\
{ return ((OSCClientReceiver*)osc_listener)->_##name##_cb(path, types, argv, argc, msg); }
-
/** Callbacks for "notification band" OSC messages.
*
* Receives all notification of engine state, but not replies on the "control
@@ -94,7 +93,6 @@ private:
LO_HANDLER(activity);
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp
index 70b40e7d..ee45f6b8 100644
--- a/src/client/OSCEngineSender.cpp
+++ b/src/client/OSCEngineSender.cpp
@@ -33,7 +33,6 @@ using namespace Raul;
namespace Ingen {
namespace Client {
-
/** Note the sending port is implicitly set by liblo, lo_send by default sends
* from the most recently created server, so create the OSC listener before
* this to have it all happen on the same port. Yeah, this is a big magic :/
@@ -45,13 +44,11 @@ OSCEngineSender::OSCEngineSender(const URI& engine_url)
_address = lo_address_new_from_url(engine_url.c_str());
}
-
OSCEngineSender::~OSCEngineSender()
{
lo_address_free(_address);
}
-
/** Attempt to connect to the engine (by pinging it).
*
* This doesn't register a client (or otherwise affect the client/engine state).
@@ -81,7 +78,6 @@ OSCEngineSender::attach(int32_t ping_id, bool block)
/* *** EngineInterface implementation below here *** */
-
/** Register with the engine via OSC.
*
* Note that this does not actually use 'client', since the engine creates
@@ -94,14 +90,12 @@ OSCEngineSender::register_client(Shared::ClientInterface* client)
send("/register_client", "i", next_id(), LO_ARGS_END);
}
-
void
OSCEngineSender::unregister_client(const URI& uri)
{
send("/unregister_client", "i", next_id(), LO_ARGS_END);
}
-
// Engine commands
void
OSCEngineSender::load_plugins()
@@ -109,32 +103,26 @@ OSCEngineSender::load_plugins()
send("/load_plugins", "i", next_id(), LO_ARGS_END);
}
-
void
OSCEngineSender::activate()
{
send("/activate", "i", next_id(), LO_ARGS_END);
}
-
void
OSCEngineSender::deactivate()
{
send("/deactivate", "i", next_id(), LO_ARGS_END);
}
-
void
OSCEngineSender::quit()
{
send("/quit", "i", next_id(), LO_ARGS_END);
}
-
-
// Object commands
-
void
OSCEngineSender::put(const Raul::URI& path,
const Shared::Resource::Properties& properties,
@@ -151,7 +139,6 @@ OSCEngineSender::put(const Raul::URI& path,
send_message("/put", m);
}
-
void
OSCEngineSender::delta(const Raul::URI& path,
const Shared::Resource::Properties& remove,
@@ -160,7 +147,6 @@ OSCEngineSender::delta(const Raul::URI& path,
warn << "FIXME: OSC DELTA" << endl;
}
-
void
OSCEngineSender::move(const Path& old_path,
const Path& new_path)
@@ -172,7 +158,6 @@ OSCEngineSender::move(const Path& old_path,
LO_ARGS_END);
}
-
void
OSCEngineSender::del(const Path& path)
{
@@ -182,7 +167,6 @@ OSCEngineSender::del(const Path& path)
LO_ARGS_END);
}
-
void
OSCEngineSender::connect(const Path& src_port_path,
const Path& dst_port_path)
@@ -194,7 +178,6 @@ OSCEngineSender::connect(const Path& src_port_path,
LO_ARGS_END);
}
-
void
OSCEngineSender::disconnect(const Path& src_port_path,
const Path& dst_port_path)
@@ -206,7 +189,6 @@ OSCEngineSender::disconnect(const Path& src_port_path,
LO_ARGS_END);
}
-
void
OSCEngineSender::disconnect_all(const Path& parent_patch_path,
const Path& path)
@@ -218,7 +200,6 @@ OSCEngineSender::disconnect_all(const Path& parent_patch_path,
LO_ARGS_END);
}
-
void
OSCEngineSender::set_property(const URI& subject,
const URI& predicate,
@@ -232,8 +213,6 @@ OSCEngineSender::set_property(const URI& subject,
send_message("/set_property", m);
}
-
-
// Requests //
void
@@ -242,7 +221,6 @@ OSCEngineSender::ping()
send("/ping", "i", next_id(), LO_ARGS_END);
}
-
void
OSCEngineSender::get(const URI& uri)
{
@@ -252,7 +230,6 @@ OSCEngineSender::get(const URI& uri)
LO_ARGS_END);
}
-
void
OSCEngineSender::request_property(const URI& object_path, const URI& key)
{
@@ -263,7 +240,6 @@ OSCEngineSender::request_property(const URI& object_path, const URI& key)
LO_ARGS_END);
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp
index fddfdbce..f39b975e 100644
--- a/src/client/OSCEngineSender.hpp
+++ b/src/client/OSCEngineSender.hpp
@@ -27,7 +27,6 @@
namespace Ingen {
namespace Client {
-
/* OSC (via liblo) interface to the engine.
*
* Clients can use this opaquely as an EngineInterface* to control the engine
@@ -54,7 +53,6 @@ public:
void attach(int32_t ping_id, bool block);
-
/* *** EngineInterface implementation below here *** */
void enable() { _enabled = true; }
@@ -114,7 +112,6 @@ protected:
int32_t _id;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 16859216..69776c2c 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -26,7 +26,6 @@ using namespace Raul;
namespace Ingen {
namespace Client {
-
ObjectModel::ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path)
: ResourceImpl(uris, path)
, _meta(uris, Raul::URI("http://example.org/FIXME"))
@@ -35,7 +34,6 @@ ObjectModel::ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path)
{
}
-
ObjectModel::ObjectModel(const ObjectModel& copy)
: ResourceImpl(copy)
, _meta(copy._meta)
@@ -45,12 +43,10 @@ ObjectModel::ObjectModel(const ObjectModel& copy)
{
}
-
ObjectModel::~ObjectModel()
{
}
-
Raul::Atom&
ObjectModel::set_property(const Raul::URI& key, const Raul::Atom& value)
{
@@ -58,14 +54,12 @@ ObjectModel::set_property(const Raul::URI& key, const Raul::Atom& value)
return ResourceImpl::set_property(key, value);
}
-
Raul::Atom&
ObjectModel::set_meta_property(const Raul::URI& key, const Raul::Atom& value)
{
return set_property(key, Resource::Property(value, Resource::INTERNAL));
}
-
void
ObjectModel::add_property(const Raul::URI& key, const Raul::Atom& value)
{
@@ -73,7 +67,6 @@ ObjectModel::add_property(const Raul::URI& key, const Raul::Atom& value)
signal_property.emit(key, value);
}
-
const Atom&
ObjectModel::get_property(const Raul::URI& key) const
{
@@ -82,7 +75,6 @@ ObjectModel::get_property(const Raul::URI& key) const
return (i != properties().end()) ? i->second : null_atom;
}
-
bool
ObjectModel::polyphonic() const
{
@@ -90,7 +82,6 @@ ObjectModel::polyphonic() const
return (polyphonic.is_valid() && polyphonic.get_bool());
}
-
/** Merge the data of @a model with self, as much as possible.
*
* This will merge the two models, but with any conflict take the value in
@@ -110,7 +101,6 @@ ObjectModel::set(SharedPtr<ObjectModel> o)
}
}
-
void
ObjectModel::set_path(const Raul::Path& p)
{
@@ -119,7 +109,6 @@ ObjectModel::set_path(const Raul::Path& p)
signal_moved.emit();
}
-
void
ObjectModel::set_parent(SharedPtr<ObjectModel> p)
{
@@ -127,7 +116,6 @@ ObjectModel::set_parent(SharedPtr<ObjectModel> p)
_parent = p;
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp
index 0ee11ba1..18a136cb 100644
--- a/src/client/ObjectModel.hpp
+++ b/src/client/ObjectModel.hpp
@@ -38,7 +38,6 @@ namespace Client {
class ClientStore;
-
/** Base class for all GraphObject models (NodeModel, PatchModel, PortModel).
*
* There are no non-const public methods intentionally, models are not allowed
@@ -81,7 +80,7 @@ protected:
ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path);
ObjectModel(const ObjectModel& copy);
-
+
virtual void set_path(const Raul::Path& p);
virtual void set_parent(SharedPtr<ObjectModel> p);
virtual void add_child(SharedPtr<ObjectModel> c) {}
@@ -97,7 +96,6 @@ private:
Raul::Symbol _symbol;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp
index 2a722293..9a8fd994 100644
--- a/src/client/PatchModel.cpp
+++ b/src/client/PatchModel.cpp
@@ -29,7 +29,6 @@ using namespace Raul;
namespace Ingen {
namespace Client {
-
void
PatchModel::add_child(SharedPtr<ObjectModel> c)
{
@@ -46,7 +45,6 @@ PatchModel::add_child(SharedPtr<ObjectModel> c)
signal_new_node.emit(nm);
}
-
bool
PatchModel::remove_child(SharedPtr<ObjectModel> o)
{
@@ -83,7 +81,6 @@ PatchModel::remove_child(SharedPtr<ObjectModel> o)
return true;
}
-
void
PatchModel::clear()
{
@@ -95,7 +92,6 @@ PatchModel::clear()
assert(_ports.empty());
}
-
SharedPtr<ConnectionModel>
PatchModel::get_connection(const Shared::Port* src_port, const Shared::Port* dst_port)
{
@@ -106,7 +102,6 @@ PatchModel::get_connection(const Shared::Port* src_port, const Shared::Port* dst
return SharedPtr<ConnectionModel>();
}
-
/** Add a connection to this patch.
*
* A reference to @a cm is taken, released on deletion or removal.
@@ -141,7 +136,6 @@ PatchModel::add_connection(SharedPtr<ConnectionModel> cm)
}
}
-
void
PatchModel::remove_connection(const Shared::Port* src_port, const Shared::Port* dst_port)
{
@@ -156,7 +150,6 @@ PatchModel::remove_connection(const Shared::Port* src_port, const Shared::Port*
}
}
-
bool
PatchModel::enabled() const
{
@@ -164,7 +157,6 @@ PatchModel::enabled() const
return (enabled.is_valid() && enabled.get_bool());
}
-
uint32_t
PatchModel::internal_poly() const
{
@@ -172,7 +164,6 @@ PatchModel::internal_poly() const
return poly.is_valid() ? poly.get_int32() : 1;
}
-
bool
PatchModel::polyphonic() const
{
@@ -180,6 +171,5 @@ PatchModel::polyphonic() const
return poly.is_valid() && poly.get_bool();
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp
index 91719df3..a62ae1bd 100644
--- a/src/client/PatchModel.hpp
+++ b/src/client/PatchModel.hpp
@@ -34,7 +34,6 @@ namespace Client {
class ClientStore;
-
/** Client's model of a patch.
*
* \ingroup IngenClient
@@ -95,7 +94,6 @@ private:
bool _editable;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index aa8e2e1d..d1733b59 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -42,7 +42,6 @@ SLV2Plugins PluginModel::_slv2_plugins = NULL;
Sord::World* PluginModel::_rdf_world = NULL;
-
PluginModel::PluginModel(Shared::LV2URIMap& uris,
const URI& uri, const URI& type_uri, const Resource::Properties& properties)
: ResourceImpl(uris, uri)
@@ -62,7 +61,6 @@ PluginModel::PluginModel(Shared::LV2URIMap& uris,
Atom(uri.substr(uri.find_last_of('#') + 1).c_str()));
}
-
const Atom&
PluginModel::get_property(const URI& key) const
{
@@ -131,7 +129,6 @@ PluginModel::get_property(const URI& key) const
return nil;
}
-
void
PluginModel::set(SharedPtr<PluginModel> p)
{
@@ -151,7 +148,6 @@ PluginModel::set(SharedPtr<PluginModel> p)
signal_changed.emit();
}
-
Symbol
PluginModel::default_node_symbol()
{
@@ -162,7 +158,6 @@ PluginModel::default_node_symbol()
return "_";
}
-
string
PluginModel::human_name()
{
@@ -173,7 +168,6 @@ PluginModel::human_name()
return default_node_symbol().c_str();
}
-
string
PluginModel::port_human_name(uint32_t index) const
{
@@ -189,7 +183,6 @@ PluginModel::port_human_name(uint32_t index) const
return "";
}
-
#ifdef HAVE_SLV2
bool
PluginModel::has_ui() const
@@ -198,7 +191,6 @@ PluginModel::has_ui() const
return (slv2_values_size(uis) > 0);
}
-
SharedPtr<PluginUI>
PluginModel::ui(Ingen::Shared::World* world, SharedPtr<NodeModel> node) const
{
@@ -209,7 +201,6 @@ PluginModel::ui(Ingen::Shared::World* world, SharedPtr<NodeModel> node) const
return ret;
}
-
const string&
PluginModel::icon_path() const
{
@@ -220,7 +211,6 @@ PluginModel::icon_path() const
return _icon_path;
}
-
/** RDF world mutex must be held by the caller */
string
PluginModel::get_lv2_icon_path(SLV2Plugin plugin)
@@ -296,6 +286,5 @@ PluginModel::port_documentation(uint32_t index) const
return doc;
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp
index 2776954c..459f9eb7 100644
--- a/src/client/PluginModel.hpp
+++ b/src/client/PluginModel.hpp
@@ -41,7 +41,6 @@ class PatchModel;
class NodeModel;
class PluginUI;
-
/** Model for a plugin available for loading.
*
* \ingroup IngenClient
@@ -117,7 +116,6 @@ private:
static Sord::World* _rdf_world;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index d397f0d8..6d37ff35 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -101,7 +101,6 @@ lv2_ui_write(LV2UI_Controller controller,
}
}
-
PluginUI::PluginUI(Ingen::Shared::World* world,
SharedPtr<NodeModel> node)
: _world(world)
@@ -110,13 +109,11 @@ PluginUI::PluginUI(Ingen::Shared::World* world,
{
}
-
PluginUI::~PluginUI()
{
slv2_ui_instance_free(_instance);
}
-
SharedPtr<PluginUI>
PluginUI::create(Ingen::Shared::World* world,
SharedPtr<NodeModel> node,
diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp
index 9cc6a4db..fc90e629 100644
--- a/src/client/PluginUI.hpp
+++ b/src/client/PluginUI.hpp
@@ -29,7 +29,6 @@ namespace Client {
class NodeModel;
-
/** Model for a plugin available for loading.
*
* \ingroup IngenClient
@@ -49,7 +48,6 @@ public:
uint32_t format,
const void* buffer);
-
Ingen::Shared::World* world() const { return _world; }
SharedPtr<NodeModel> node() const { return _node; }
@@ -66,10 +64,8 @@ private:
SharedPtr<Shared::LV2Features::FeatureArray> _features;
};
-
} // namespace Client
} // namespace Ingen
#endif // INGEN_CLIENT_PLUGINUI_HPP
-
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index 6f21351b..3afbf588 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -19,11 +19,9 @@
#include "PortModel.hpp"
#include "NodeModel.hpp"
-
namespace Ingen {
namespace Client {
-
Raul::Atom&
PortModel::set_property(const Raul::URI& uri,
const Raul::Atom& value)
@@ -34,21 +32,18 @@ PortModel::set_property(const Raul::URI& uri,
return ret;
}
-
bool
PortModel::supports(const Raul::URI& value_type) const
{
return has_property(_uris.atom_supports, value_type);
}
-
bool
PortModel::port_property(const std::string& uri) const
{
return has_property(_uris.lv2_portProperty, Raul::URI(uri));
}
-
void
PortModel::set(SharedPtr<ObjectModel> model)
{
@@ -65,7 +60,6 @@ PortModel::set(SharedPtr<ObjectModel> model)
ObjectModel::set(model);
}
-
bool
PortModel::has_context(const Raul::URI& uri)
{
@@ -76,6 +70,5 @@ PortModel::has_context(const Raul::URI& uri)
return context == uri;
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp
index f41416f2..c05610e7 100644
--- a/src/client/PortModel.hpp
+++ b/src/client/PortModel.hpp
@@ -31,7 +31,6 @@ namespace Raul { class Path; }
namespace Ingen {
namespace Client {
-
/** Model of a port.
*
* \ingroup IngenClient
@@ -114,7 +113,6 @@ private:
size_t _connections;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/SigClientInterface.hpp b/src/client/SigClientInterface.hpp
index 8a53a2cb..a99d409c 100644
--- a/src/client/SigClientInterface.hpp
+++ b/src/client/SigClientInterface.hpp
@@ -26,7 +26,6 @@
namespace Ingen {
namespace Client {
-
/** A LibSigC++ signal emitting interface for clients to use.
*
* This simply emits an sigc signal for every event (eg OSC message) coming from
@@ -118,7 +117,6 @@ protected:
{ EMIT(activity, port_path); }
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/ThreadedSigClientInterface.cpp b/src/client/ThreadedSigClientInterface.cpp
index 50b0b7e7..eb752d9f 100644
--- a/src/client/ThreadedSigClientInterface.cpp
+++ b/src/client/ThreadedSigClientInterface.cpp
@@ -27,7 +27,6 @@ using namespace Raul;
namespace Ingen {
namespace Client {
-
/** Push an event (from the engine, ie 'new patch') on to the queue.
*/
void
@@ -46,7 +45,6 @@ ThreadedSigClientInterface::push_sig(Closure ev)
}
}
-
/** Process all queued events that came from the OSC thread.
*
* This function should be called from the Gtk thread to emit signals and cause
@@ -73,6 +71,5 @@ ThreadedSigClientInterface::emit_signals()
return true;
}
-
} // namespace Client
} // namespace Ingen
diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp
index c852dfd0..08e7956e 100644
--- a/src/client/ThreadedSigClientInterface.hpp
+++ b/src/client/ThreadedSigClientInterface.hpp
@@ -34,7 +34,6 @@ namespace Ingen {
namespace Shared { class EngineInterface; }
namespace Client {
-
/** A LibSigC++ signal emitting interface for clients to use.
*
* This emits signals (possibly) in a different thread than the ClientInterface
@@ -143,7 +142,6 @@ private:
sigc::slot<void, Raul::Path> activity_slot;
};
-
} // namespace Client
} // namespace Ingen
diff --git a/src/engine/AudioBuffer.cpp b/src/engine/AudioBuffer.cpp
index 17cfeca9..7b6b0a02 100644
--- a/src/engine/AudioBuffer.cpp
+++ b/src/engine/AudioBuffer.cpp
@@ -35,7 +35,6 @@ namespace Ingen {
using namespace Shared;
-
AudioBuffer::AudioBuffer(BufferFactory& bufs, Shared::PortType type, size_t size)
: ObjectBuffer(bufs, size)
, _state(OK)
@@ -70,7 +69,6 @@ AudioBuffer::AudioBuffer(BufferFactory& bufs, Shared::PortType type, size_t size
clear();
}
-
void
AudioBuffer::resize(size_t size)
{
@@ -81,7 +79,6 @@ AudioBuffer::resize(size_t size)
clear();
}
-
/** Empty (ie zero) the buffer.
*/
void
@@ -92,7 +89,6 @@ AudioBuffer::clear()
_state = OK;
}
-
/** Set value of buffer to @a val after @a start_sample.
*
* The Buffer will handle setting the intial portion of the buffer to the
@@ -122,7 +118,6 @@ AudioBuffer::set_value(Sample val, FrameTime cycle_start, FrameTime time)
_set_value = val;
}
-
/** Set a block of buffer to @a val.
*
* @a start_sample and @a end_sample define the inclusive range to be set.
@@ -140,7 +135,6 @@ AudioBuffer::set_block(Sample val, size_t start_offset, size_t end_offset)
buf[i] = val;
}
-
/** Copy a block of @a src into buffer.
*
* @a start_sample and @a end_sample define the inclusive range to be set.
@@ -160,7 +154,6 @@ AudioBuffer::copy(const Sample* src, size_t start_sample, size_t end_sample)
buf[i] = src[i];
}
-
void
AudioBuffer::copy(Context& context, const Buffer* src)
{
@@ -193,7 +186,6 @@ AudioBuffer::copy(Context& context, const Buffer* src)
}
}
-
void
AudioBuffer::prepare_read(Context& context)
{
@@ -212,5 +204,4 @@ AudioBuffer::prepare_read(Context& context)
}
}
-
} // namespace Ingen
diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp
index 38623696..f2ed0e7b 100644
--- a/src/engine/AudioBuffer.hpp
+++ b/src/engine/AudioBuffer.hpp
@@ -29,7 +29,6 @@ using namespace std;
namespace Ingen {
-
class AudioBuffer : public ObjectBuffer
{
public:
@@ -75,7 +74,6 @@ private:
FrameTime _set_time; ///< Time _set_value was set (to reset next cycle)
};
-
/** Accumulate a block of @a src into buffer.
*/
inline void
@@ -104,7 +102,6 @@ AudioBuffer::accumulate(Context& context, const AudioBuffer* const src)
}
}
-
} // namespace Ingen
#endif // INGEN_ENGINE_AUDIOBUFFER_HPP
diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp
index 76d47e26..7e1623cb 100644
--- a/src/engine/Buffer.hpp
+++ b/src/engine/Buffer.hpp
@@ -87,11 +87,9 @@ private:
} // namespace Ingen
-
namespace boost {
inline void intrusive_ptr_add_ref(Ingen::Buffer* b) { b->ref(); }
inline void intrusive_ptr_release(Ingen::Buffer* b) { b->deref(); }
}
-
#endif // INGEN_ENGINE_BUFFER_HPP
diff --git a/src/engine/BufferFactory.cpp b/src/engine/BufferFactory.cpp
index 0d2fc76e..c6c9422a 100644
--- a/src/engine/BufferFactory.cpp
+++ b/src/engine/BufferFactory.cpp
@@ -40,7 +40,6 @@ BufferFactory::BufferFactory(Engine& engine, SharedPtr<Shared::LV2URIMap> a_uris
assert(_uris);
}
-
BufferFactory::~BufferFactory()
{
free_list(_free_audio.get());
@@ -49,7 +48,6 @@ BufferFactory::~BufferFactory()
free_list(_free_object.get());
}
-
void
BufferFactory::free_list(Buffer* head)
{
@@ -59,21 +57,18 @@ BufferFactory::free_list(Buffer* head)
free_list(next);
}
-
void
BufferFactory::set_block_length(SampleCount block_length)
{
_silent_buffer = create(PortType::AUDIO, audio_buffer_size(block_length));
}
-
size_t
BufferFactory::audio_buffer_size(SampleCount nframes)
{
return sizeof(LV2_Atom) + sizeof(LV2_Atom_Vector) + (nframes * sizeof(float));
}
-
size_t
BufferFactory::default_buffer_size(PortType type)
{
@@ -89,7 +84,6 @@ BufferFactory::default_buffer_size(PortType type)
}
}
-
BufferFactory::Ref
BufferFactory::get(Shared::PortType type, size_t size, bool force_create)
{
@@ -120,7 +114,6 @@ BufferFactory::get(Shared::PortType type, size_t size, bool force_create)
return Ref(try_head);
}
-
BufferFactory::Ref
BufferFactory::create(Shared::PortType type, size_t size)
{
@@ -153,7 +146,6 @@ BufferFactory::create(Shared::PortType type, size_t size)
return Ref(buffer);
}
-
void
BufferFactory::recycle(Buffer* buf)
{
@@ -165,5 +157,4 @@ BufferFactory::recycle(Buffer* buf)
} while (!head_ptr.compare_and_exchange(try_head, buf));
}
-
} // namespace Ingen
diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp
index f83b56a6..f651d371 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/engine/ClientBroadcaster.cpp
@@ -34,7 +34,6 @@ using Ingen::Shared::ClientInterface;
namespace Ingen {
-
/** Register a client to receive messages over the notification band.
*/
void
@@ -50,7 +49,6 @@ ClientBroadcaster::register_client(const URI& uri, ClientInterface* client)
}
}
-
/** Remove a client from the list of registered clients.
*
* @return true if client was found and removed.
@@ -68,8 +66,6 @@ ClientBroadcaster::unregister_client(const URI& uri)
return (erased > 0);
}
-
-
/** Looks up the client with the given source @a uri (which is used as the
* unique identifier for registered clients).
*/
@@ -84,7 +80,6 @@ ClientBroadcaster::client(const URI& uri)
}
}
-
void
ClientBroadcaster::send_plugins(const NodeFactory::Plugins& plugins)
{
@@ -92,7 +87,6 @@ ClientBroadcaster::send_plugins(const NodeFactory::Plugins& plugins)
send_plugins_to((*c).second, plugins);
}
-
void
ClientBroadcaster::send_plugins_to(ClientInterface* client, const NodeFactory::Plugins& plugins)
{
@@ -106,7 +100,6 @@ ClientBroadcaster::send_plugins_to(ClientInterface* client, const NodeFactory::P
client->transfer_end();
}
-
/** Send an object to all clients.
*
* @param o Object to send
@@ -119,5 +112,4 @@ ClientBroadcaster::send_object(const GraphObjectImpl* o, bool recursive)
ObjectSender::send_object((*i).second, o, recursive);
}
-
} // namespace Ingen
diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp
index 4d1a460d..ff0886a1 100644
--- a/src/engine/ClientBroadcaster.hpp
+++ b/src/engine/ClientBroadcaster.hpp
@@ -37,7 +37,6 @@ class PluginImpl;
class PatchImpl;
class ConnectionImpl;
-
/** Broadcaster for all clients.
*
* This is a ClientInterface that forwards all messages to all registered
@@ -62,7 +61,6 @@ public:
for (Clients::const_iterator i = _clients.begin(); i != _clients.end(); ++i) \
(*i).second->msg(__VA_ARGS__)
-
// CommonInterface
void bundle_begin() { BROADCAST(bundle_begin); }
@@ -122,7 +120,6 @@ private:
Clients _clients;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_CLIENTBROADCASTER_HPP
diff --git a/src/engine/CompiledPatch.hpp b/src/engine/CompiledPatch.hpp
index ab14ba4f..3bb23960 100644
--- a/src/engine/CompiledPatch.hpp
+++ b/src/engine/CompiledPatch.hpp
@@ -51,7 +51,6 @@ private:
std::vector<NodeImpl*> _dependants; ///< Nodes this one's output ports are connected to
};
-
/** A patch ``compiled'' into a flat structure with the correct order so
* the audio thread(s) can execute it without threading problems (since
* the preprocessor thread modifies the graph).
@@ -70,7 +69,6 @@ struct CompiledPatch : public std::vector<CompiledNode>
std::vector<ConnectionImpl*> queued_connections;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_COMPILEDPATCH_HPP
diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp
index f58a8723..13829548 100644
--- a/src/engine/ConnectionImpl.cpp
+++ b/src/engine/ConnectionImpl.cpp
@@ -58,7 +58,6 @@ ConnectionImpl::ConnectionImpl(BufferFactory& bufs, PortImpl* src_port, PortImpl
_queue = new Raul::RingBuffer(src_port->buffer_size() * 2);
}
-
void
ConnectionImpl::dump() const
{
@@ -68,7 +67,6 @@ ConnectionImpl::dump() const
<< "POLY: " << _src_port->poly() << " => " << _dst_port->poly() << endl;
}
-
void
ConnectionImpl::get_sources(Context& context, uint32_t voice,
IntrusivePtr<Buffer>* srcs, uint32_t max_num_srcs, uint32_t& num_srcs)
@@ -95,7 +93,6 @@ ConnectionImpl::get_sources(Context& context, uint32_t voice,
}
}
-
void
ConnectionImpl::queue(Context& context)
{
@@ -122,7 +119,6 @@ ConnectionImpl::queue(Context& context)
}
}
-
bool
ConnectionImpl::can_connect(const OutputPort* src, const InputPort* dst)
{
@@ -143,7 +139,7 @@ ConnectionImpl::can_connect(const OutputPort* src, const InputPort* dst)
// Control => atom:Float32 Value
|| (src->is_a(PortType::CONTROL) && dst->supports(uris.atom_Float32))
- // Audio => atom:Vector Value
+ // Audio => atom:Vector Value
|| (src->is_a(PortType::AUDIO) && dst->supports(uris.atom_Vector))
// atom:Float32 Value => Control
@@ -153,6 +149,5 @@ ConnectionImpl::can_connect(const OutputPort* src, const InputPort* dst)
|| (src->supports(uris.atom_Vector) && dst->is_a(PortType::AUDIO)));
}
-
} // namespace Ingen
diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp
index 09dd208a..74270407 100644
--- a/src/engine/ConnectionImpl.hpp
+++ b/src/engine/ConnectionImpl.hpp
@@ -38,7 +38,6 @@ class InputPort;
class Buffer;
class BufferFactory;
-
/** Represents a single inbound connection for an InputPort.
*
* This can be a group of ports (ie coming from a polyphonic Node) or
@@ -104,7 +103,6 @@ protected:
bool _pending_disconnection;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_CONNECTIONIMPL_HPP
diff --git a/src/engine/Context.hpp b/src/engine/Context.hpp
index 035e2b3f..3dd6ab58 100644
--- a/src/engine/Context.hpp
+++ b/src/engine/Context.hpp
@@ -26,7 +26,6 @@ namespace Ingen {
class Engine;
-
/** Graph execution context.
*
* This is used to pass whatever information a GraphObject might need to
@@ -98,7 +97,6 @@ protected:
bool _realtime; ///< True iff context is hard realtime
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_CONTEXT_HPP
diff --git a/src/engine/ControlBindings.cpp b/src/engine/ControlBindings.cpp
index c201ad30..35001bb6 100644
--- a/src/engine/ControlBindings.cpp
+++ b/src/engine/ControlBindings.cpp
@@ -37,7 +37,6 @@ using namespace Raul;
namespace Ingen {
-
ControlBindings::ControlBindings(Engine& engine)
: _engine(engine)
, _learn_port(NULL)
@@ -46,13 +45,11 @@ ControlBindings::ControlBindings(Engine& engine)
{
}
-
ControlBindings::~ControlBindings()
{
delete _feedback;
}
-
ControlBindings::Key
ControlBindings::port_binding(PortImpl* port)
{
@@ -80,7 +77,6 @@ ControlBindings::port_binding(PortImpl* port)
return key;
}
-
ControlBindings::Key
ControlBindings::midi_event_key(uint16_t size, uint8_t* buf, uint16_t& value)
{
@@ -102,7 +98,6 @@ ControlBindings::midi_event_key(uint16_t size, uint8_t* buf, uint16_t& value)
}
}
-
void
ControlBindings::port_binding_changed(ProcessContext& context, PortImpl* port)
{
@@ -111,7 +106,6 @@ ControlBindings::port_binding_changed(ProcessContext& context, PortImpl* port)
_bindings->insert(make_pair(key, port));
}
-
void
ControlBindings::port_value_changed(ProcessContext& context, PortImpl* port)
{
@@ -159,7 +153,6 @@ ControlBindings::port_value_changed(ProcessContext& context, PortImpl* port)
}
}
-
void
ControlBindings::learn(PortImpl* port)
{
@@ -167,7 +160,6 @@ ControlBindings::learn(PortImpl* port)
_learn_port = port;
}
-
Raul::Atom
ControlBindings::control_to_port_value(PortImpl* port, Type type, int16_t value)
{
@@ -201,7 +193,6 @@ ControlBindings::control_to_port_value(PortImpl* port, Type type, int16_t value)
return Raul::Atom(scaled_value);
}
-
int16_t
ControlBindings::port_value_to_control(PortImpl* port, Type type)
{
@@ -242,7 +233,6 @@ ControlBindings::port_value_to_control(PortImpl* port, Type type)
}
}
-
void
ControlBindings::set_port_value(ProcessContext& context, PortImpl* port, Type type, int16_t value)
{
@@ -260,7 +250,6 @@ ControlBindings::set_port_value(ProcessContext& context, PortImpl* port, Type ty
context.event_sink().write(sizeof(ev), &ev);
}
-
bool
ControlBindings::bind(ProcessContext& context, Key key)
{
@@ -281,7 +270,6 @@ ControlBindings::bind(ProcessContext& context, Key key)
return true;
}
-
SharedPtr<ControlBindings::Bindings>
ControlBindings::remove(const Raul::Path& path)
{
@@ -304,7 +292,6 @@ ControlBindings::remove(const Raul::Path& path)
return old_bindings;
}
-
SharedPtr<ControlBindings::Bindings>
ControlBindings::remove(PortImpl* port)
{
@@ -327,7 +314,6 @@ ControlBindings::remove(PortImpl* port)
return old_bindings;
}
-
void
ControlBindings::pre_process(ProcessContext& context, EventBuffer* buffer)
{
@@ -383,7 +369,6 @@ ControlBindings::pre_process(ProcessContext& context, EventBuffer* buffer)
}
}
-
void
ControlBindings::post_process(ProcessContext& context, EventBuffer* buffer)
{
@@ -394,5 +379,4 @@ ControlBindings::post_process(ProcessContext& context, EventBuffer* buffer)
}
}
-
} // namespace Ingen
diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp
index 6951d357..8ff5b13a 100644
--- a/src/engine/Driver.hpp
+++ b/src/engine/Driver.hpp
@@ -32,7 +32,6 @@ namespace Ingen {
class DuplexPort;
class ProcessContext;
-
/** Representation of a "system" (eg outside Ingen) port.
*
* This is the class through which the rest of the engine manages everything
@@ -63,7 +62,6 @@ protected:
DuplexPort* _patch_port;
};
-
/** Driver abstract base class.
*
* A Driver is, from the perspective of GraphObjects (nodes, patches, ports) an
@@ -121,7 +119,6 @@ public:
virtual ProcessContext& context() = 0;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_DRIVER_HPP
diff --git a/src/engine/DuplexPort.cpp b/src/engine/DuplexPort.cpp
index 315583f0..3cae06d1 100644
--- a/src/engine/DuplexPort.cpp
+++ b/src/engine/DuplexPort.cpp
@@ -35,7 +35,6 @@ namespace Ingen {
using namespace Shared;
-
DuplexPort::DuplexPort(
BufferFactory& bufs,
NodeImpl* parent,
@@ -56,7 +55,6 @@ DuplexPort::DuplexPort(
set_property(bufs.uris().ingen_polyphonic, polyphonic);
}
-
bool
DuplexPort::get_buffers(BufferFactory& bufs, Raul::Array<BufferFactory::Ref>* buffers, uint32_t poly)
{
@@ -66,7 +64,6 @@ DuplexPort::get_buffers(BufferFactory& bufs, Raul::Array<BufferFactory::Ref>* bu
return OutputPort::get_buffers(bufs, buffers, poly);
}
-
/** Prepare for the execution of parent patch */
void
DuplexPort::pre_process(Context& context)
@@ -84,7 +81,6 @@ DuplexPort::pre_process(Context& context)
}
}
-
/** Finalize after the execution of parent patch (deliver outputs) */
void
DuplexPort::post_process(Context& context)
@@ -99,6 +95,5 @@ DuplexPort::post_process(Context& context)
}
}
-
} // namespace Ingen
diff --git a/src/engine/DuplexPort.hpp b/src/engine/DuplexPort.hpp
index 3c7ad421..3127c7d7 100644
--- a/src/engine/DuplexPort.hpp
+++ b/src/engine/DuplexPort.hpp
@@ -27,7 +27,6 @@ namespace Ingen {
class NodeImpl;
-
/** A duplex port (which is both an InputPort and an OutputPort)
*
* This is used for Patch ports, since they need to appear as both an input
@@ -64,7 +63,6 @@ protected:
bool _is_output;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_DUPLEXPORT_HPP
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 538b967f..76b63233 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -74,7 +74,6 @@ Engine::Engine(Ingen::Shared::World* a_world)
}
}
-
Engine::~Engine()
{
deactivate();
@@ -94,14 +93,12 @@ Engine::~Engine()
munlockall();
}
-
SharedPtr<EngineStore>
Engine::engine_store() const
{
return PtrCast<EngineStore>(_world->store());
}
-
void
Engine::quit()
{
@@ -116,21 +113,18 @@ Engine::main_iteration()
return !_quit_flag;
}
-
void
Engine::add_event_source(SharedPtr<EventSource> source)
{
_event_sources.insert(source);
}
-
void
Engine::set_driver(SharedPtr<Driver> driver)
{
_driver = driver;
}
-
static void
execute_and_delete_event(ProcessContext& context, QueuedEvent* ev)
{
@@ -140,7 +134,6 @@ execute_and_delete_event(ProcessContext& context, QueuedEvent* ev)
delete ev;
}
-
bool
Engine::activate()
{
@@ -211,7 +204,6 @@ Engine::activate()
return true;
}
-
void
Engine::deactivate()
{
@@ -224,7 +216,6 @@ Engine::deactivate()
ThreadManager::single_threaded = true;
}
-
void
Engine::process_events(ProcessContext& context)
{
@@ -234,5 +225,4 @@ Engine::process_events(ProcessContext& context)
(*i)->process(*_post_processor, context);
}
-
} // namespace Ingen
diff --git a/src/engine/EngineStore.cpp b/src/engine/EngineStore.cpp
index ff8786a3..9905bd55 100644
--- a/src/engine/EngineStore.cpp
+++ b/src/engine/EngineStore.cpp
@@ -34,7 +34,6 @@ using namespace Raul;
namespace Ingen {
-
/** Find the Patch at the given path.
*/
PatchImpl*
@@ -44,7 +43,6 @@ EngineStore::find_patch(const Path& path)
return dynamic_cast<PatchImpl*>(object);
}
-
/** Find the Node at the given path.
*/
NodeImpl*
@@ -54,7 +52,6 @@ EngineStore::find_node(const Path& path)
return dynamic_cast<NodeImpl*>(object);
}
-
/** Find the Port at the given path.
*/
PortImpl*
@@ -64,7 +61,6 @@ EngineStore::find_port(const Path& path)
return dynamic_cast<PortImpl*>(object);
}
-
/** Find the Object at the given path.
*/
GraphObjectImpl*
@@ -74,7 +70,6 @@ EngineStore::find_object(const Path& path)
return ((i == end()) ? NULL : dynamic_cast<GraphObjectImpl*>(i->second.get()));
}
-
/** Add an object to the store. Not realtime safe.
*/
void
@@ -84,7 +79,6 @@ EngineStore::add(Shared::GraphObject* obj)
Store::add(obj);
}
-
/** Add a family of objects to the store. Not realtime safe.
*/
void
@@ -94,7 +88,6 @@ EngineStore::add(const Objects& table)
cram(table);
}
-
/** Remove an object from the store.
*
* Returned is a vector containing all descendants of the object removed
@@ -106,7 +99,6 @@ EngineStore::remove(const Path& path)
return remove(find(path));
}
-
/** Remove an object from the store.
*
* Returned is a vector containing all descendants of the object removed
@@ -129,7 +121,6 @@ EngineStore::remove(iterator object)
}
}
-
/** Remove all children of an object from the store.
*
* Returned is a vector containing all descendants of the object removed
@@ -141,7 +132,6 @@ EngineStore::remove_children(const Path& path)
return remove_children(find(path));
}
-
/** Remove all children of an object from the store.
*
* Returned is a vector containing all descendants of the object removed
@@ -165,5 +155,4 @@ EngineStore::remove_children(iterator object)
return SharedPtr<EngineStore::Objects>();
}
-
} // namespace Ingen
diff --git a/src/engine/EngineStore.hpp b/src/engine/EngineStore.hpp
index 0e30f9cb..cb853c2a 100644
--- a/src/engine/EngineStore.hpp
+++ b/src/engine/EngineStore.hpp
@@ -31,7 +31,6 @@ class NodeImpl;
class PortImpl;
class GraphObjectImpl;
-
/** Storage for all GraphObjects (tree of GraphObject's sorted by path).
*
* All looking up in pre_process() methods (and anything else that isn't in-band
@@ -58,7 +57,6 @@ public:
SharedPtr<Objects> remove_children(Objects::iterator i);
};
-
} // namespace Ingen
#endif // OBJECTSTORE
diff --git a/src/engine/Event.cpp b/src/engine/Event.cpp
index 1f005a65..cec4e671 100644
--- a/src/engine/Event.cpp
+++ b/src/engine/Event.cpp
@@ -30,7 +30,6 @@
namespace Ingen {
-
void
Event::execute(ProcessContext& context)
{
@@ -45,13 +44,11 @@ Event::execute(ProcessContext& context)
_executed = true;
}
-
void
Event::post_process()
{
ThreadManager::assert_not_thread(THREAD_PROCESS);
}
-
} // namespace Ingen
diff --git a/src/engine/Event.hpp b/src/engine/Event.hpp
index 66acd4ac..934720c9 100644
--- a/src/engine/Event.hpp
+++ b/src/engine/Event.hpp
@@ -30,7 +30,6 @@ class Engine;
class Request;
class ProcessContext;
-
/** Base class for all events (both realtime and QueuedEvent).
*
* This is for time-critical events like note ons. There is no non-realtime
@@ -74,7 +73,6 @@ protected:
bool _executed;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_EVENT_HPP
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp
index 7dc6b179..b9086dc1 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/engine/EventBuffer.cpp
@@ -66,20 +66,17 @@ EventBuffer::EventBuffer(BufferFactory& bufs, size_t capacity)
clear();
}
-
EventBuffer::~EventBuffer()
{
free(_data);
}
-
void
EventBuffer::prepare_read(Context& context)
{
rewind();
}
-
void
EventBuffer::prepare_write(Context& context)
{
@@ -87,7 +84,6 @@ EventBuffer::prepare_write(Context& context)
clear();
}
-
void
EventBuffer::copy(Context& context, const Buffer* src_buf)
{
@@ -111,7 +107,6 @@ EventBuffer::copy(Context& context, const Buffer* src_buf)
assert(event_count() == src->event_count());
}
-
/** Increment the read position by one event.
*
* \return true if increment was successful, or false if end of buffer reached.
@@ -127,7 +122,6 @@ EventBuffer::increment() const
}
}
-
/** \return true iff the cursor is valid (ie get_event is safe)
*/
bool
@@ -136,7 +130,6 @@ EventBuffer::is_valid() const
return lv2_event_is_valid(&_iter);
}
-
/** Read an event from the current position in the buffer
*
* \return true if read was successful, or false if end of buffer reached
@@ -160,7 +153,6 @@ EventBuffer::get_event(uint32_t* frames,
}
}
-
/** Get the object currently pointed to, or NULL if invalid.
*/
LV2_Atom*
@@ -174,7 +166,6 @@ EventBuffer::get_atom() const
return NULL;
}
-
/** Get the event currently pointed to, or NULL if invalid.
*/
LV2_Event*
@@ -187,7 +178,6 @@ EventBuffer::get_event() const
return NULL;
}
-
/** Append an event to the buffer.
*
* \a timestamp must be >= the latest event in the buffer.
@@ -222,5 +212,4 @@ EventBuffer::append(uint32_t frames,
}
}
-
} // namespace Ingen
diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp
index 9757ace7..18a2afb6 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/engine/EventBuffer.hpp
@@ -26,7 +26,6 @@
namespace Ingen {
-
class EventBuffer : public Buffer {
public:
EventBuffer(BufferFactory& bufs, size_t capacity);
@@ -80,7 +79,6 @@ private:
uint32_t _latest_subframes; ///< Latest time of all events (subframes)
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_EVENTBUFFER_HPP
diff --git a/src/engine/EventSink.cpp b/src/engine/EventSink.cpp
index 790f9795..10057a48 100644
--- a/src/engine/EventSink.cpp
+++ b/src/engine/EventSink.cpp
@@ -22,7 +22,6 @@ using namespace std;
namespace Ingen {
-
/** \a size is not size_t because an event will never be even remotely close
* to UINT32_MAX in size, so uint32_t saves wasted space on 64-bit.
*/
@@ -38,7 +37,6 @@ EventSink::write(uint32_t size, const Event* ev)
return true;
}
-
/** Read the next event into event_buffer.
*
* \a event_buffer can be casted to Event* and virtual methods called.
@@ -59,5 +57,4 @@ EventSink::read(uint32_t event_buffer_size, uint8_t* event_buffer)
return false;
}
-
} // namespace Ingen
diff --git a/src/engine/EventSink.hpp b/src/engine/EventSink.hpp
index 1040df6b..a097c6e6 100644
--- a/src/engine/EventSink.hpp
+++ b/src/engine/EventSink.hpp
@@ -29,7 +29,6 @@ class PortImpl;
class Engine;
class Event;
-
/** Sink for events generated in the audio thread.
*
* Implemented as a flat ringbuffer of events, which are constructed directly
@@ -52,8 +51,6 @@ private:
Raul::RingBuffer _events;
};
-
-
} // namespace Ingen
#endif // INGEN_ENGINE_EVENTSINK_HPP
diff --git a/src/engine/EventSource.cpp b/src/engine/EventSource.cpp
index ebc12052..a3664d92 100644
--- a/src/engine/EventSource.cpp
+++ b/src/engine/EventSource.cpp
@@ -26,7 +26,6 @@ using namespace std;
namespace Ingen {
-
EventSource::EventSource(size_t queue_size)
: _blocking_semaphore(0)
{
@@ -34,13 +33,11 @@ EventSource::EventSource(size_t queue_size)
set_name("EventSource");
}
-
EventSource::~EventSource()
{
Thread::stop();
}
-
/** Push an unprepared event onto the queue.
*/
void
@@ -55,7 +52,6 @@ EventSource::push_queued(QueuedEvent* const ev)
whip();
}
-
/** Process all events for a cycle.
*
* Executed events will be pushed to @a dest.
@@ -81,7 +77,7 @@ EventSource::process(PostProcessor& dest, ProcessContext& context, bool limit)
if (!head)
return;
-
+
QueuedEvent* ev = (QueuedEvent*)head->elem();
while (ev && ev->is_prepared() && ev->time() < context.end()) {
@@ -101,7 +97,6 @@ EventSource::process(PostProcessor& dest, ProcessContext& context, bool limit)
}
}
-
/** Pre-process a single event */
void
EventSource::_whipped()
@@ -126,6 +121,5 @@ EventSource::_whipped()
_blocking_semaphore.wait();
}
-
} // namespace Ingen
diff --git a/src/engine/EventSource.hpp b/src/engine/EventSource.hpp
index 05f7ef0c..38bf58c1 100644
--- a/src/engine/EventSource.hpp
+++ b/src/engine/EventSource.hpp
@@ -29,7 +29,6 @@ class QueuedEvent;
class PostProcessor;
class ProcessContext;
-
/** Source for events to run in the audio thread.
*
* The Driver gets events from an EventSource in the process callback
@@ -69,7 +68,6 @@ private:
Raul::Semaphore _blocking_semaphore;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_EVENTSOURCE_HPP
diff --git a/src/engine/GraphObjectImpl.cpp b/src/engine/GraphObjectImpl.cpp
index c257b319..6ee89478 100644
--- a/src/engine/GraphObjectImpl.cpp
+++ b/src/engine/GraphObjectImpl.cpp
@@ -28,7 +28,6 @@ namespace Ingen {
using namespace Shared;
-
GraphObjectImpl::GraphObjectImpl(Shared::LV2URIMap& uris,
GraphObjectImpl* parent, const Symbol& symbol)
: ResourceImpl(uris, parent ? parent->path().child(symbol) : Raul::Path::root())
@@ -38,21 +37,18 @@ GraphObjectImpl::GraphObjectImpl(Shared::LV2URIMap& uris,
{
}
-
void
GraphObjectImpl::add_meta_property(const Raul::URI& key, const Atom& value)
{
add_property(key, Resource::Property(value, Resource::INTERNAL));
}
-
void
GraphObjectImpl::set_meta_property(const Raul::URI& key, const Atom& value)
{
set_property(key, Resource::Property(value, Resource::INTERNAL));
}
-
const Atom&
GraphObjectImpl::get_property(const Raul::URI& key) const
{
@@ -61,19 +57,16 @@ GraphObjectImpl::get_property(const Raul::URI& key) const
return (i != properties().end()) ? i->second : null_atom;
}
-
PatchImpl*
GraphObjectImpl::parent_patch() const
{
return dynamic_cast<PatchImpl*>((NodeImpl*)_parent);
}
-
SharedPtr<GraphObject>
GraphObjectImpl::find_child(const string& name) const
{
throw;
}
-
} // namespace Ingen
diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp
index 251559f3..a7ff7482 100644
--- a/src/engine/GraphObjectImpl.hpp
+++ b/src/engine/GraphObjectImpl.hpp
@@ -39,7 +39,6 @@ class Context;
class ProcessContext;
class BufferFactory;
-
/** An object on the audio graph - Patch, Node, Port, etc.
*
* Each of these is a Raul::Deletable and so can be deleted in a realtime safe
@@ -105,7 +104,6 @@ protected:
Raul::Symbol _symbol;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_GRAPHOBJECTIMPL_HPP
diff --git a/src/engine/HTTPClientSender.cpp b/src/engine/HTTPClientSender.cpp
index 7f92144f..412539b9 100644
--- a/src/engine/HTTPClientSender.cpp
+++ b/src/engine/HTTPClientSender.cpp
@@ -37,21 +37,18 @@ HTTPClientSender::response_ok(int32_t id)
{
}
-
void
HTTPClientSender::response_error(int32_t id, const std::string& msg)
{
warn << "HTTP Error " << id << " (" << msg << ")" << endl;
}
-
void
HTTPClientSender::error(const std::string& msg)
{
warn << "HTTP send error " << msg << endl;
}
-
void
HTTPClientSender::put(const URI& uri,
const Resource::Properties& properties,
@@ -71,7 +68,6 @@ HTTPClientSender::put(const URI& uri,
send_chunk(str);
}
-
void
HTTPClientSender::delta(const URI& uri,
const Resource::Properties& remove,
@@ -79,7 +75,6 @@ HTTPClientSender::delta(const URI& uri,
{
}
-
void
HTTPClientSender::del(const Path& path)
{
@@ -87,7 +82,6 @@ HTTPClientSender::del(const Path& path)
send_chunk(string("<").append(path.str()).append("> a <http://www.w3.org/2002/07/owl#Nothing> ."));
}
-
void
HTTPClientSender::connect(const Path& src_path, const Path& dst_path)
{
@@ -100,14 +94,12 @@ HTTPClientSender::connect(const Path& src_path, const Path& dst_path)
send_chunk(msg);
}
-
void
HTTPClientSender::disconnect(const Path& src_path, const Path& dst_path)
{
//send("/ingen/disconnection", "ss", src_path.c_str(), dst_path.c_str(), LO_ARGS_END);
}
-
void
HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& value)
{
@@ -124,7 +116,6 @@ HTTPClientSender::set_property(const URI& subject, const URI& key, const Atom& v
#endif
}
-
void
HTTPClientSender::activity(const Path& path)
{
@@ -134,7 +125,6 @@ HTTPClientSender::activity(const Path& path)
send_chunk(msg);
}
-
void
HTTPClientSender::move(const Path& old_path, const Path& new_path)
{
@@ -145,5 +135,4 @@ HTTPClientSender::move(const Path& old_path, const Path& new_path)
send_chunk(msg);
}
-
} // namespace Ingen
diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp
index 4d74358f..1bef2405 100644
--- a/src/engine/HTTPClientSender.hpp
+++ b/src/engine/HTTPClientSender.hpp
@@ -31,7 +31,6 @@ class Engine;
namespace Shared { class EngineInterface; }
-
/** Implements ClientInterface for HTTP clients.
* Sends changes as RDF deltas over an HTTP stream
* (a single message with chunked encoding response).
@@ -98,7 +97,6 @@ private:
bool _enabled;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_HTTPCLIENTSENDER_HPP
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp
index d24c661b..a56e4161 100644
--- a/src/engine/HTTPEngineReceiver.cpp
+++ b/src/engine/HTTPEngineReceiver.cpp
@@ -49,7 +49,6 @@ namespace Ingen {
using namespace Shared;
using namespace Serialisation;
-
HTTPEngineReceiver::HTTPEngineReceiver(Engine& engine, uint16_t port)
: QueuedEngineInterface(engine, 64) // FIXME
, _server(soup_server_new(SOUP_SERVER_PORT, port, NULL))
@@ -66,7 +65,6 @@ HTTPEngineReceiver::HTTPEngineReceiver(Engine& engine, uint16_t port)
Thread::set_name("HTTPEngineReceiver");
}
-
HTTPEngineReceiver::~HTTPEngineReceiver()
{
deactivate();
@@ -80,7 +78,6 @@ HTTPEngineReceiver::~HTTPEngineReceiver()
}
}
-
void
HTTPEngineReceiver::activate_source()
{
@@ -89,7 +86,6 @@ HTTPEngineReceiver::activate_source()
_receive_thread->start();
}
-
void
HTTPEngineReceiver::deactivate_source()
{
@@ -97,7 +93,6 @@ HTTPEngineReceiver::deactivate_source()
EventSource::deactivate_source();
}
-
void
HTTPEngineReceiver::message_callback(SoupServer* server,
SoupMessage* msg,
@@ -229,7 +224,6 @@ HTTPEngineReceiver::message_callback(SoupServer* server,
#endif
}
-
/** Override the semaphore driven _run method of QueuedEngineInterface
* to wait on HTTP requests and process them immediately in this thread.
*/
diff --git a/src/engine/InputPort.cpp b/src/engine/InputPort.cpp
index f65b9a5a..02947aa7 100644
--- a/src/engine/InputPort.cpp
+++ b/src/engine/InputPort.cpp
@@ -61,7 +61,6 @@ InputPort::InputPort(BufferFactory& bufs,
}
}
-
bool
InputPort::apply_poly(Maid& maid, uint32_t poly)
{
@@ -74,7 +73,6 @@ InputPort::apply_poly(Maid& maid, uint32_t poly)
return true;
}
-
/** Set \a buffers appropriately if this port has \a num_connections connections.
* \return true iff buffers are locally owned by the port
*/
@@ -109,7 +107,6 @@ InputPort::get_buffers(BufferFactory& bufs, Raul::Array<BufferFactory::Ref>* buf
return true;
}
-
/** Add a connection. Realtime safe.
*
* The buffer of this port will be set directly to the connection's buffer
@@ -130,7 +127,6 @@ InputPort::add_connection(Connections::Node* const c)
_broadcast = true;
}
-
/** Remove a connection. Realtime safe.
*
* Note that setup_buffers must be called after this before the change
@@ -166,7 +162,6 @@ InputPort::remove_connection(ProcessContext& context, const OutputPort* src_port
return connection;
}
-
/** Prepare buffer for access, mixing if necessary. Realtime safe.
*/
void
@@ -206,7 +201,6 @@ InputPort::pre_process(Context& context)
broadcast_value(context, false);
}
-
void
InputPort::post_process(Context& context)
{
@@ -221,7 +215,6 @@ InputPort::post_process(Context& context)
}
}
-
bool
InputPort::direct_connect() const
{
@@ -231,6 +224,5 @@ InputPort::direct_connect() const
&& !_connections.front()->must_queue();
}
-
} // namespace Ingen
diff --git a/src/engine/InputPort.hpp b/src/engine/InputPort.hpp
index 92d8d2d2..6f691a9c 100644
--- a/src/engine/InputPort.hpp
+++ b/src/engine/InputPort.hpp
@@ -33,7 +33,6 @@ class NodeImpl;
class OutputPort;
class ProcessContext;
-
/** An input port on a Node or Patch.
*
* All ports have a Buffer, but the actual contents (data) of that buffer may be
@@ -85,7 +84,6 @@ protected:
Connections _connections;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_INPUTPORT_HPP
diff --git a/src/engine/InternalPlugin.cpp b/src/engine/InternalPlugin.cpp
index 30202e4c..359dc8c7 100644
--- a/src/engine/InternalPlugin.cpp
+++ b/src/engine/InternalPlugin.cpp
@@ -41,7 +41,6 @@ InternalPlugin::InternalPlugin(Shared::LV2URIMap& uris,
set_property(uris.rdf_type, uris.ingen_Internal);
}
-
NodeImpl*
InternalPlugin::instantiate(BufferFactory& bufs,
const string& name,
@@ -68,5 +67,4 @@ InternalPlugin::instantiate(BufferFactory& bufs,
}
}
-
} // namespace Ingen
diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp
index dcadd4aa..b3d365e4 100644
--- a/src/engine/InternalPlugin.hpp
+++ b/src/engine/InternalPlugin.hpp
@@ -35,7 +35,6 @@ namespace Ingen {
class NodeImpl;
class BufferFactory;
-
/** Implementation of an Internal plugin.
*/
class InternalPlugin : public PluginImpl
@@ -56,7 +55,6 @@ private:
const std::string _symbol;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_INTERNALPLUGIN_HPP
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index e3c89ca6..d60a0ec2 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -62,7 +62,6 @@ typedef jack_default_audio_sample_t jack_sample_t;
namespace Ingen {
-
//// JackPort ////
JackPort::JackPort(JackDriver* driver, DuplexPort* patch_port)
@@ -75,13 +74,11 @@ JackPort::JackPort(JackDriver* driver, DuplexPort* patch_port)
create();
}
-
JackPort::~JackPort()
{
assert(_jack_port == NULL);
}
-
void
JackPort::create()
{
@@ -100,7 +97,6 @@ JackPort::create()
}
}
-
void
JackPort::destroy()
{
@@ -110,14 +106,12 @@ JackPort::destroy()
_jack_port = NULL;
}
-
void
JackPort::move(const Raul::Path& path)
{
jack_port_set_name(_jack_port, ingen_jack_port_name(path).c_str());
}
-
void
JackPort::pre_process(ProcessContext& context)
{
@@ -153,7 +147,6 @@ JackPort::pre_process(ProcessContext& context)
}
}
-
void
JackPort::post_process(ProcessContext& context)
{
@@ -189,7 +182,6 @@ JackPort::post_process(ProcessContext& context)
}
}
-
//// JackDriver ////
JackDriver::JackDriver(Engine& engine)
@@ -208,7 +200,6 @@ JackDriver::JackDriver(Engine& engine)
LV2_EVENT_URI, "http://lv2plug.in/ns/ext/midi#MidiEvent");
}
-
JackDriver::~JackDriver()
{
deactivate();
@@ -217,7 +208,6 @@ JackDriver::~JackDriver()
jack_client_close(_client);
}
-
bool
JackDriver::supports(Shared::PortType port_type, Shared::EventType event_type)
{
@@ -225,7 +215,6 @@ JackDriver::supports(Shared::PortType port_type, Shared::EventType event_type)
|| (port_type == PortType::EVENTS && event_type == EventType::MIDI));
}
-
bool
JackDriver::attach(const std::string& server_name,
const std::string& client_name,
@@ -252,7 +241,7 @@ JackDriver::attach(const std::string& server_name,
LOG(info) << "Connected to JACK server `" << server_name << "'" << endl;
}
}
-
+
// Either server name not specified, or supplied server name does not exist
// Connect to default server
if (!_client) {
@@ -287,7 +276,6 @@ JackDriver::attach(const std::string& server_name,
return true;
}
-
void
JackDriver::activate()
{
@@ -317,7 +305,6 @@ JackDriver::activate()
}
}
-
void
JackDriver::deactivate()
{
@@ -340,7 +327,6 @@ JackDriver::deactivate()
}
}
-
/** Add a Jack port.
*
* Realtime safe, this is to be called at the beginning of a process cycle to
@@ -356,7 +342,6 @@ JackDriver::add_port(DriverPort* port)
_ports.push_back((JackPort*)port);
}
-
/** Remove a Jack port.
*
* Realtime safe. This is to be called at the beginning of a process cycle to
@@ -383,7 +368,6 @@ JackDriver::remove_port(const Path& path, DriverPort** port)
return NULL;
}
-
DriverPort*
JackDriver::port(const Path& path)
{
@@ -394,7 +378,6 @@ JackDriver::port(const Path& path)
return NULL;
}
-
DriverPort*
JackDriver::create_port(DuplexPort* patch_port)
{
@@ -409,7 +392,6 @@ JackDriver::create_port(DuplexPort* patch_port)
}
}
-
DriverPort*
JackDriver::driver_port(const Path& path)
{
@@ -422,10 +404,8 @@ JackDriver::driver_port(const Path& path)
return NULL;
}
-
/**** Jack Callbacks ****/
-
/** Jack process callback, drives entire audio thread.
*
* \callgraph
@@ -500,7 +480,6 @@ JackDriver::_process_cb(jack_nframes_t nframes)
return 0;
}
-
void
JackDriver::_thread_init_cb()
{
@@ -511,7 +490,6 @@ JackDriver::_thread_init_cb()
ThreadManager::assert_thread(THREAD_PROCESS);
}
-
void
JackDriver::_shutdown_cb()
{
@@ -522,7 +500,6 @@ JackDriver::_shutdown_cb()
_client = NULL;
}
-
int
JackDriver::_sample_rate_cb(jack_nframes_t nframes)
{
@@ -535,7 +512,6 @@ JackDriver::_sample_rate_cb(jack_nframes_t nframes)
return 0;
}
-
int
JackDriver::_block_length_cb(jack_nframes_t nframes)
{
@@ -547,7 +523,6 @@ JackDriver::_block_length_cb(jack_nframes_t nframes)
return 0;
}
-
#ifdef INGEN_JACK_SESSION
void
JackDriver::_session_cb(jack_session_event_t* event)
diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp
index 278a5477..5b26e4f1 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/engine/JackDriver.hpp
@@ -47,7 +47,6 @@ class PortImpl;
class DuplexPort;
class JackDriver;
-
/** Used internally by JackDriver to represent a Jack port.
*
* A Jack port always has a one-to-one association with a Patch port.
@@ -73,8 +72,6 @@ private:
jack_port_t* _jack_port;
};
-
-
/** The Jack Driver.
*
* The process callback here drives the entire audio thread by "pulling"
@@ -180,7 +177,6 @@ private:
PatchImpl* _root_patch;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_JACKAUDIODRIVER_HPP
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index ff502265..0a61d479 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -54,7 +54,6 @@ private:
Ingen::Shared::World* _world;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_LV2INFO_HPP
diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp
index b6109d7f..67f19bf4 100644
--- a/src/engine/LV2Node.cpp
+++ b/src/engine/LV2Node.cpp
@@ -43,7 +43,6 @@ namespace Ingen {
using namespace Shared;
-
/** Partially construct a LV2Node.
*
* Object is not usable until instantiate() is called with success.
@@ -63,13 +62,11 @@ LV2Node::LV2Node(LV2Plugin* plugin,
assert(_lv2_plugin);
}
-
LV2Node::~LV2Node()
{
delete _instances;
}
-
bool
LV2Node::prepare_poly(BufferFactory& bufs, uint32_t poly)
{
@@ -114,7 +111,6 @@ LV2Node::prepare_poly(BufferFactory& bufs, uint32_t poly)
return true;
}
-
bool
LV2Node::apply_poly(Raul::Maid& maid, uint32_t poly)
{
@@ -131,7 +127,6 @@ LV2Node::apply_poly(Raul::Maid& maid, uint32_t poly)
return NodeImpl::apply_poly(maid, poly);
}
-
/** Instantiate self from LV2 plugin descriptor.
*
* Implemented as a seperate function (rather than in the constructor) to
@@ -357,7 +352,6 @@ LV2Node::instantiate(BufferFactory& bufs)
return ret;
}
-
void
LV2Node::activate(BufferFactory& bufs)
{
@@ -367,7 +361,6 @@ LV2Node::activate(BufferFactory& bufs)
slv2_instance_activate(instance(i));
}
-
void
LV2Node::deactivate()
{
@@ -377,7 +370,6 @@ LV2Node::deactivate()
slv2_instance_deactivate(instance(i));
}
-
void
LV2Node::message_run(MessageContext& context)
{
@@ -394,7 +386,6 @@ LV2Node::message_run(MessageContext& context)
(*_message_funcs->run)(instance(0)->lv2_handle, _valid_ports, _valid_ports);
}
-
void
LV2Node::process(ProcessContext& context)
{
@@ -406,7 +397,6 @@ LV2Node::process(ProcessContext& context)
NodeImpl::post_process(context);
}
-
void
LV2Node::set_port_buffer(uint32_t voice, uint32_t port_num,
IntrusivePtr<Buffer> buf, SampleCount offset)
@@ -416,6 +406,5 @@ LV2Node::set_port_buffer(uint32_t voice, uint32_t port_num,
buf ? buf->port_data(_ports->at(port_num)->buffer_type(), offset) : NULL);
}
-
} // namespace Ingen
diff --git a/src/engine/LV2Node.hpp b/src/engine/LV2Node.hpp
index 74f3a922..4065e01c 100644
--- a/src/engine/LV2Node.hpp
+++ b/src/engine/LV2Node.hpp
@@ -30,7 +30,6 @@ namespace Ingen {
class LV2Plugin;
-
/** An instance of a LV2 plugin.
*
* \ingroup engine
@@ -75,7 +74,6 @@ protected:
SharedPtr<Shared::LV2Features::FeatureArray> _features;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_LV2NODE_HPP
diff --git a/src/engine/LV2Plugin.cpp b/src/engine/LV2Plugin.cpp
index faa10e97..b076ef16 100644
--- a/src/engine/LV2Plugin.cpp
+++ b/src/engine/LV2Plugin.cpp
@@ -33,7 +33,6 @@ using namespace Raul;
namespace Ingen {
-
LV2Plugin::LV2Plugin(SharedPtr<LV2Info> lv2_info, const std::string& uri)
: PluginImpl(*lv2_info->world().uris().get(), Plugin::LV2, uri)
, _slv2_plugin(NULL)
@@ -42,7 +41,6 @@ LV2Plugin::LV2Plugin(SharedPtr<LV2Info> lv2_info, const std::string& uri)
set_property(_uris.rdf_type, _uris.lv2_Plugin);
}
-
const string
LV2Plugin::symbol() const
{
@@ -63,7 +61,6 @@ LV2Plugin::symbol() const
return "lv2_symbol";
}
-
NodeImpl*
LV2Plugin::instantiate(BufferFactory& bufs,
const string& name,
@@ -85,14 +82,12 @@ LV2Plugin::instantiate(BufferFactory& bufs,
return n;
}
-
void
LV2Plugin::slv2_plugin(SLV2Plugin p)
{
_slv2_plugin = p;
}
-
const std::string&
LV2Plugin::library_path() const
{
@@ -110,5 +105,4 @@ LV2Plugin::library_path() const
return _library_path;
}
-
} // namespace Ingen
diff --git a/src/engine/LV2Plugin.hpp b/src/engine/LV2Plugin.hpp
index 31a8770b..808a9103 100644
--- a/src/engine/LV2Plugin.hpp
+++ b/src/engine/LV2Plugin.hpp
@@ -41,7 +41,6 @@ namespace Ingen {
class PatchImpl;
class NodeImpl;
-
/** Implementation of an LV2 plugin (loaded shared library).
*/
class LV2Plugin : public PluginImpl
@@ -69,7 +68,6 @@ private:
SharedPtr<LV2Info> _lv2_info;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_LV2PLUGIN_HPP
diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp
index c1fbe5c5..5c8a6aff 100644
--- a/src/engine/MessageContext.cpp
+++ b/src/engine/MessageContext.cpp
@@ -32,7 +32,6 @@ using namespace Raul;
namespace Ingen {
-
void
MessageContext::run(NodeImpl* node, FrameTime time)
{
@@ -49,7 +48,6 @@ MessageContext::run(NodeImpl* node, FrameTime time)
}
}
-
void
MessageContext::_run()
{
@@ -97,7 +95,6 @@ MessageContext::_run()
}
}
-
void
MessageContext::execute(const Request& req)
{
diff --git a/src/engine/MessageContext.hpp b/src/engine/MessageContext.hpp
index 1eb92ff5..fbf38b77 100644
--- a/src/engine/MessageContext.hpp
+++ b/src/engine/MessageContext.hpp
@@ -107,7 +107,6 @@ protected:
FrameTime _end_time;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_MESSAGECONTEXT_HPP
diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index 8ed1dc81..8d4ce082 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -48,7 +48,6 @@ namespace Ingen {
using namespace Internals;
-
NodeFactory::NodeFactory(Ingen::Shared::World* world)
: _world(world)
, _has_loaded(false)
@@ -58,7 +57,6 @@ NodeFactory::NodeFactory(Ingen::Shared::World* world)
{
}
-
NodeFactory::~NodeFactory()
{
for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i)
@@ -67,7 +65,6 @@ NodeFactory::~NodeFactory()
_plugins.clear();
}
-
PluginImpl*
NodeFactory::plugin(const Raul::URI& uri)
{
@@ -75,7 +72,6 @@ NodeFactory::plugin(const Raul::URI& uri)
return ((i != _plugins.end()) ? i->second : NULL);
}
-
void
NodeFactory::load_plugins()
{
@@ -97,7 +93,6 @@ NodeFactory::load_plugins()
}
}
-
void
NodeFactory::load_internal_plugins()
{
@@ -115,7 +110,6 @@ NodeFactory::load_internal_plugins()
_plugins.insert(make_pair(trigger_plug->uri(), trigger_plug));
}
-
#ifdef HAVE_SLV2
/** Loads information about all LV2 plugins into internal plugin database.
*/
diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp
index 7a464e3b..87224529 100644
--- a/src/engine/NodeFactory.hpp
+++ b/src/engine/NodeFactory.hpp
@@ -37,7 +37,6 @@ class PluginImpl;
class LV2Info;
#endif
-
/** Discovers and loads plugin libraries.
*
* \ingroup engine
@@ -70,7 +69,6 @@ private:
#endif
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_NODEFACTORY_HPP
diff --git a/src/engine/NodeImpl.cpp b/src/engine/NodeImpl.cpp
index 7c1e185a..4d8afe2d 100644
--- a/src/engine/NodeImpl.cpp
+++ b/src/engine/NodeImpl.cpp
@@ -34,7 +34,6 @@ using namespace std;
namespace Ingen {
-
NodeImpl::NodeImpl(PluginImpl* plugin, const Raul::Symbol& symbol, bool polyphonic, PatchImpl* parent, SampleRate srate)
: GraphObjectImpl(plugin->uris(), parent, symbol)
, _plugin(plugin)
@@ -56,7 +55,6 @@ NodeImpl::NodeImpl(PluginImpl* plugin, const Raul::Symbol& symbol, bool polyphon
assert(_parent == NULL || (_polyphony == parent->internal_poly() || _polyphony == 1));
}
-
NodeImpl::~NodeImpl()
{
if (_activated)
@@ -69,21 +67,18 @@ NodeImpl::~NodeImpl()
free(_valid_ports);
}
-
Shared::Port*
NodeImpl::port(uint32_t index) const
{
return (*_ports)[index];
}
-
const Shared::Plugin*
NodeImpl::plugin() const
{
return _plugin;
}
-
void
NodeImpl::activate(BufferFactory& bufs)
{
@@ -106,7 +101,6 @@ NodeImpl::activate(BufferFactory& bufs)
}
}
-
void
NodeImpl::deactivate()
{
@@ -121,7 +115,6 @@ NodeImpl::deactivate()
}
}
-
bool
NodeImpl::prepare_poly(BufferFactory& bufs, uint32_t poly)
{
@@ -137,7 +130,6 @@ NodeImpl::prepare_poly(BufferFactory& bufs, uint32_t poly)
return true;
}
-
bool
NodeImpl::apply_poly(Raul::Maid& maid, uint32_t poly)
{
@@ -155,7 +147,6 @@ NodeImpl::apply_poly(Raul::Maid& maid, uint32_t poly)
return true;
}
-
void
NodeImpl::set_buffer_size(Context& context, BufferFactory& bufs, PortType type, size_t size)
{
@@ -165,7 +156,6 @@ NodeImpl::set_buffer_size(Context& context, BufferFactory& bufs, PortType type,
_ports->at(i)->set_buffer_size(context, bufs, size);
}
-
void
NodeImpl::reset_input_ready()
{
@@ -174,21 +164,18 @@ NodeImpl::reset_input_ready()
_input_ready.reset(0);
}
-
bool
NodeImpl::process_lock()
{
return _process_lock.compare_and_exchange(0, 1);
}
-
void
NodeImpl::process_unlock()
{
_process_lock = 0;
}
-
void
NodeImpl::wait_for_input(size_t num_providers)
{
@@ -199,7 +186,6 @@ NodeImpl::wait_for_input(size_t num_providers)
_input_ready.wait();
}
-
void
NodeImpl::signal_input_ready()
{
@@ -208,7 +194,6 @@ NodeImpl::signal_input_ready()
_input_ready.post();
}
-
/** Prepare to run a cycle (in the audio thread)
*/
void
@@ -226,7 +211,6 @@ NodeImpl::pre_process(Context& context)
}
}
-
/** Prepare to run a cycle (in the audio thread)
*/
void
@@ -242,7 +226,6 @@ NodeImpl::post_process(Context& context)
}
}
-
/** Flag a port as set (for message context)
*/
void
@@ -254,14 +237,12 @@ NodeImpl::set_port_valid(uint32_t port_index)
lv2_contexts_set_port_valid(_valid_ports, port_index);
}
-
void*
NodeImpl::valid_ports()
{
return _valid_ports;
}
-
void
NodeImpl::reset_valid_ports()
{
@@ -269,7 +250,6 @@ NodeImpl::reset_valid_ports()
memset(_valid_ports, '\0', num_ports() / 8);
}
-
void
NodeImpl::set_port_buffer(uint32_t voice, uint32_t port_num,
BufferFactory::Ref buf, SampleCount offset)
@@ -278,6 +258,5 @@ NodeImpl::set_port_buffer(uint32_t voice, uint32_t port_num,
<< " buffer " << buf << " offset " << offset << std::endl;*/
}
-
} // namespace Ingen
diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp
index 4d98bb2a..bf9c2ff5 100644
--- a/src/engine/NodeImpl.hpp
+++ b/src/engine/NodeImpl.hpp
@@ -42,7 +42,6 @@ class PluginImpl;
class PortImpl;
class ProcessContext;
-
/** A Node (or "module") in a Patch (which is also a Node).
*
* A Node is a unit with input/output ports, a process() method, and some other
@@ -215,7 +214,6 @@ protected:
bool _traversed; ///< Flag for process order algorithm
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_NODEIMPL_HPP
diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp
index 786f9ee9..9efbc5e4 100644
--- a/src/engine/OSCClientSender.cpp
+++ b/src/engine/OSCClientSender.cpp
@@ -37,14 +37,12 @@ using namespace Raul;
namespace Ingen {
-
/*! \page client_osc_namespace Client OSC Namespace Documentation
*
* <p>These are the commands the client recognizes. All monitoring of
* changes in the engine happens via these commands.</p>
*/
-
/** \page client_osc_namespace
* <h2>/ok</h2>
* \arg \b response-id (int) - Request ID this is a response to
@@ -63,7 +61,6 @@ OSCClientSender::response_ok(int32_t id)
}
}
-
/** \page client_osc_namespace
* <h2>/error</h2>
* \arg \b response-id (int) - Request ID this is a response to
@@ -83,7 +80,6 @@ OSCClientSender::response_error(int32_t id, const std::string& msg)
}
}
-
/** \page client_osc_namespace
* <h2>/error</h2>
* \arg \b message (string) - Error message (natural language text)
@@ -98,7 +94,6 @@ OSCClientSender::error(const std::string& msg)
send("/error", "s", msg.c_str(), LO_ARGS_END);
}
-
/** \page client_osc_namespace
* <h2>/put</h2>
* \arg \b path (string) - Path of object
@@ -123,7 +118,6 @@ OSCClientSender::put(const Raul::URI& path,
send_message("/put", m);
}
-
void
OSCClientSender::delta(const Raul::URI& path,
const Shared::Resource::Properties& remove,
@@ -132,7 +126,6 @@ OSCClientSender::delta(const Raul::URI& path,
warn << "FIXME: OSC DELTA" << endl;
}
-
/** \page client_osc_namespace
* <h2>/move</h2>
* \arg \b old-path (string) - Old path of object
@@ -147,8 +140,6 @@ OSCClientSender::move(const Path& old_path, const Path& new_path)
send("/move", "ss", old_path.c_str(), new_path.c_str(), LO_ARGS_END);
}
-
-
/** \page client_osc_namespace
* <h2>/delete</h2>
* \arg \b path (string) - Path of object (which no longer exists)
@@ -161,7 +152,6 @@ OSCClientSender::del(const Path& path)
send("/delete", "s", path.c_str(), LO_ARGS_END);
}
-
/** \page client_osc_namespace
* <h2>/connect</h2>
* \arg \b src-path (string) - Path of the source port
@@ -175,7 +165,6 @@ OSCClientSender::connect(const Path& src_port_path, const Path& dst_port_path)
send("/connect", "ss", src_port_path.c_str(), dst_port_path.c_str(), LO_ARGS_END);
}
-
/** \page client_osc_namespace
* <h2>/disconnect</h2>
* \arg \b src-path (string) - Path of the source port
@@ -189,7 +178,6 @@ OSCClientSender::disconnect(const Path& src_port_path, const Path& dst_port_path
send("/disconnect", "ss", src_port_path.c_str(), dst_port_path.c_str(), LO_ARGS_END);
}
-
/** \page client_osc_namespace
* <h2>/set_property</h2>
* \arg \b path (string) - Path of the object associated with property (node, patch, or port)
@@ -208,7 +196,6 @@ OSCClientSender::set_property(const URI& path, const URI& key, const Atom& value
send_message("/set_property", m);
}
-
/** \page client_osc_namespace
* <h2>/activity</h2>
* \arg \b path (string) - Path of object
@@ -224,5 +211,4 @@ OSCClientSender::activity(const Path& path)
lo_send(_address, "/activity", "s", path.c_str(), LO_ARGS_END);
}
-
} // namespace Ingen
diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp
index 5b775846..492a509a 100644
--- a/src/engine/OSCClientSender.hpp
+++ b/src/engine/OSCClientSender.hpp
@@ -30,7 +30,6 @@ namespace Ingen {
namespace Shared { class EngineInterface; }
-
/** Implements ClientInterface for OSC clients (sends OSC messages).
*
* \ingroup engine
@@ -95,7 +94,6 @@ private:
Raul::URI _url;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_OSCCLIENTSENDER_HPP
diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp
index 60cf483e..4a8ac58d 100644
--- a/src/engine/OSCEngineReceiver.cpp
+++ b/src/engine/OSCEngineReceiver.cpp
@@ -47,7 +47,6 @@ namespace Ingen {
using namespace Shared;
-
/*! \page engine_osc_namespace Engine OSC Namespace Documentation
*
* <p>These are the commands the engine recognizes. A client can control every
@@ -58,7 +57,6 @@ using namespace Shared;
* See the "Client OSC Namespace Documentation" for details.
*/
-
OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t port)
: QueuedEngineInterface(engine, queue_size) // FIXME
, _server(NULL)
@@ -124,7 +122,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t
Thread::set_name("OSCEngineReceiver");
}
-
OSCEngineReceiver::~OSCEngineReceiver()
{
deactivate();
@@ -141,7 +138,6 @@ OSCEngineReceiver::~OSCEngineReceiver()
}
}
-
void
OSCEngineReceiver::activate_source()
{
@@ -151,7 +147,6 @@ OSCEngineReceiver::activate_source()
_receive_thread->set_scheduling(SCHED_FIFO, 5); // Jack default appears to be 10
}
-
void
OSCEngineReceiver::deactivate_source()
{
@@ -159,7 +154,6 @@ OSCEngineReceiver::deactivate_source()
EventSource::deactivate_source();
}
-
/** Override the semaphore driven _run method of QueuedEngineInterface
* to wait on OSC messages and prepare them right away in the same thread.
*/
@@ -185,7 +179,6 @@ OSCEngineReceiver::ReceiveThread::_run()
}
}
-
/** Create a new request for this message, if necessary.
*
* This is based on the fact that the current request is stored in a ref
@@ -235,7 +228,6 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types,
return 1;
}
-
#ifdef LIBLO_BUNDLES
int
OSCEngineReceiver::_bundle_start_cb(lo_timetag time)
@@ -244,7 +236,6 @@ OSCEngineReceiver::_bundle_start_cb(lo_timetag time)
return 0;
}
-
int
OSCEngineReceiver::_bundle_end_cb()
{
@@ -253,7 +244,6 @@ OSCEngineReceiver::_bundle_end_cb()
}
#endif
-
void
OSCEngineReceiver::error_cb(int num, const char* msg, const char* path)
{
@@ -264,7 +254,6 @@ OSCEngineReceiver::error_cb(int num, const char* msg, const char* path)
error << " (" << msg << ")" << endl;
}
-
/** \page engine_osc_namespace
* <h2>/ping</h2>
* \arg \b response-id (integer)
@@ -280,7 +269,6 @@ OSCEngineReceiver::_ping_cb(const char* path, const char* types, lo_arg** argv,
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/ping_queued</h2>
* \arg \b response-id (integer)
@@ -297,7 +285,6 @@ OSCEngineReceiver::_ping_slow_cb(const char* path, const char* types, lo_arg** a
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/quit</h2>
* \arg \b response-id (integer)
@@ -314,7 +301,6 @@ OSCEngineReceiver::_quit_cb(const char* path, const char* types, lo_arg** argv,
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/register_client</h2>
* \arg \b response-id (integer)
@@ -336,7 +322,6 @@ OSCEngineReceiver::_register_client_cb(const char* path, const char* types, lo_a
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/unregister_client</h2>
* \arg \b response-id (integer)
@@ -355,7 +340,6 @@ OSCEngineReceiver::_unregister_client_cb(const char* path, const char* types, lo
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/load_plugins</h2>
* \arg \b response-id (integer)
@@ -369,7 +353,6 @@ OSCEngineReceiver::_load_plugins_cb(const char* path, const char* types, lo_arg*
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/activate</h2>
* \arg \b response-id (integer)
@@ -385,7 +368,6 @@ OSCEngineReceiver::_engine_activate_cb(const char* path, const char* types, lo_a
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/deactivate</h2>
* \arg \b response-id (integer)
@@ -399,7 +381,6 @@ OSCEngineReceiver::_engine_deactivate_cb(const char* path, const char* types, lo
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/get</h2>
* \arg \b response-id (integer)
@@ -414,7 +395,6 @@ OSCEngineReceiver::_get_cb(const char* path, const char* types, lo_arg** argv, i
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/put</h2>
* \arg \b response-id (integer)
@@ -436,7 +416,6 @@ OSCEngineReceiver::_put_cb(const char* path, const char* types, lo_arg** argv, i
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/move</h2>
* \arg \b response-id (integer)
@@ -455,7 +434,6 @@ OSCEngineReceiver::_move_cb(const char* path, const char* types, lo_arg** argv,
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/del</h2>
* \arg \b response-id (integer)
@@ -472,7 +450,6 @@ OSCEngineReceiver::_del_cb(const char* path, const char* types, lo_arg** argv, i
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/connect</h2>
* \arg \b response-id (integer)
@@ -491,7 +468,6 @@ OSCEngineReceiver::_connect_cb(const char* path, const char* types, lo_arg** arg
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/disconnect</h2>
* \arg \b response-id (integer)
@@ -510,7 +486,6 @@ OSCEngineReceiver::_disconnect_cb(const char* path, const char* types, lo_arg**
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/disconnect_all</h2>
* \arg \b response-id (integer)
@@ -529,7 +504,6 @@ OSCEngineReceiver::_disconnect_all_cb(const char* path, const char* types, lo_ar
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/note_on</h2>
* \arg \b response-id (integer)
@@ -552,7 +526,6 @@ OSCEngineReceiver::_note_on_cb(const char* path, const char* types, lo_arg** arg
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/note_off</h2>
* \arg \b response-id (integer)
@@ -573,7 +546,6 @@ OSCEngineReceiver::_note_off_cb(const char* path, const char* types, lo_arg** ar
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/all_notes_off</h2>
* \arg \b response-id (integer)
@@ -593,7 +565,6 @@ OSCEngineReceiver::_all_notes_off_cb(const char* path, const char* types, lo_arg
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/set_property</h2>
* \arg \b response-id (integer)
@@ -618,7 +589,6 @@ OSCEngineReceiver::_set_property_cb(const char* path, const char* types, lo_arg*
return 0;
}
-
/** \page engine_osc_namespace
* <h2>/request_property</h2>
* \arg \b response-id (integer)
@@ -637,10 +607,8 @@ OSCEngineReceiver::_request_property_cb(const char* path, const char* types, lo_
return 0;
}
-
// Static Callbacks //
-
// Display incoming OSC messages (for debugging purposes)
int
OSCEngineReceiver::generic_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg, void* user_data)
@@ -656,7 +624,6 @@ OSCEngineReceiver::generic_cb(const char* path, const char* types, lo_arg** argv
return 1; // not handled
}
-
int
OSCEngineReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg, void* user_data)
{
@@ -674,5 +641,4 @@ OSCEngineReceiver::unknown_cb(const char* path, const char* types, lo_arg** argv
return 0;
}
-
} // namespace Ingen
diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp
index 02fdfe00..e143448b 100644
--- a/src/engine/OSCEngineReceiver.hpp
+++ b/src/engine/OSCEngineReceiver.hpp
@@ -30,7 +30,6 @@ class JackDriver;
class NodeFactory;
class PatchImpl;
-
/* Some boilerplate killing macros... */
#define LO_HANDLER_ARGS const char* path, const char* types, lo_arg** argv, int argc, lo_message msg
@@ -42,10 +41,8 @@ int _##name##_cb (LO_HANDLER_ARGS);\
inline static int name##_cb(LO_HANDLER_ARGS, void* myself)\
{ return ((OSCEngineReceiver*)myself)->_##name##_cb(path, types, argv, argc, msg); }
-
/* FIXME: Make this receive and preprocess in the same thread? */
-
/** Receives OSC messages from liblo.
*
* This inherits from QueuedEngineInterface and calls it's own functions
@@ -120,7 +117,6 @@ private:
lo_server _server;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_OSCENGINERECEIVER_HPP
diff --git a/src/engine/ObjectBuffer.cpp b/src/engine/ObjectBuffer.cpp
index 4e1f459a..7f4d4270 100644
--- a/src/engine/ObjectBuffer.cpp
+++ b/src/engine/ObjectBuffer.cpp
@@ -34,7 +34,6 @@ namespace Ingen {
using namespace Shared;
-
/** Allocate a new object buffer.
* \a capacity is in bytes, including LV2_Atom header
*/
@@ -58,13 +57,11 @@ ObjectBuffer::ObjectBuffer(BufferFactory& bufs, size_t capacity)
clear();
}
-
ObjectBuffer::~ObjectBuffer()
{
free(_buf);
}
-
void
ObjectBuffer::clear()
{
@@ -73,7 +70,6 @@ ObjectBuffer::clear()
_buf->size = 0;
}
-
void
ObjectBuffer::copy(Context& context, const Buffer* src_buf)
{
@@ -86,7 +82,6 @@ ObjectBuffer::copy(Context& context, const Buffer* src_buf)
memcpy(_buf, src->_buf, sizeof(LV2_Atom) + src_buf->size());
}
-
void
ObjectBuffer::resize(size_t size)
{
@@ -100,7 +95,6 @@ ObjectBuffer::resize(size_t size)
clear();
}
-
void*
ObjectBuffer::port_data(PortType port_type, SampleCount offset)
{
@@ -122,7 +116,6 @@ ObjectBuffer::port_data(PortType port_type, SampleCount offset)
}
}
-
const void*
ObjectBuffer::port_data(PortType port_type, SampleCount offset) const
{
@@ -144,13 +137,11 @@ ObjectBuffer::port_data(PortType port_type, SampleCount offset) const
}
}
-
void
ObjectBuffer::prepare_write(Context& context)
{
_buf->size = _size - sizeof(LV2_Atom);
}
-
} // namespace Ingen
diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp
index 7066c025..86cfda59 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/engine/ObjectBuffer.hpp
@@ -49,7 +49,6 @@ private:
LV2_Atom* _buf; ///< Contents
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_OBJECTBUFFER_HPP
diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp
index ee977fdc..bb692021 100644
--- a/src/engine/ObjectSender.cpp
+++ b/src/engine/ObjectSender.cpp
@@ -56,7 +56,6 @@ ObjectSender::send_object(ClientInterface* client, const GraphObjectImpl* object
}
}
-
void
ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool recursive, bool bundle)
{
@@ -95,7 +94,6 @@ ObjectSender::send_patch(ClientInterface* client, const PatchImpl* patch, bool r
client->transfer_end();
}
-
/** Sends a node or a patch */
void
ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recursive, bool bundle)
@@ -127,7 +125,6 @@ ObjectSender::send_node(ClientInterface* client, const NodeImpl* node, bool recu
client->transfer_end();
}
-
void
ObjectSender::send_port(ClientInterface* client, const PortImpl* port, bool bundle)
{
@@ -146,6 +143,5 @@ ObjectSender::send_port(ClientInterface* client, const PortImpl* port, bool bund
client->bundle_end();
}
-
} // namespace Ingen
diff --git a/src/engine/ObjectSender.hpp b/src/engine/ObjectSender.hpp
index ab7884b3..a61f6449 100644
--- a/src/engine/ObjectSender.hpp
+++ b/src/engine/ObjectSender.hpp
@@ -28,7 +28,6 @@ class NodeImpl;
class PortImpl;
class PluginImpl;
-
/** Utility class for sending GraphObjects to clients through ClientInterface.
*
* While ClientInterface is the direct low level message-based interface
diff --git a/src/engine/OutputPort.cpp b/src/engine/OutputPort.cpp
index d647fbdd..f66666fb 100644
--- a/src/engine/OutputPort.cpp
+++ b/src/engine/OutputPort.cpp
@@ -48,7 +48,6 @@ OutputPort::OutputPort(BufferFactory& bufs,
setup_buffers(bufs, poly);
}
-
bool
OutputPort::get_buffers(BufferFactory& bufs, Raul::Array<BufferFactory::Ref>* buffers, uint32_t poly)
{
@@ -58,7 +57,6 @@ OutputPort::get_buffers(BufferFactory& bufs, Raul::Array<BufferFactory::Ref>* bu
return true;
}
-
void
OutputPort::pre_process(Context& context)
{
@@ -66,7 +64,6 @@ OutputPort::pre_process(Context& context)
_buffers->at(v)->prepare_write(context);
}
-
void
OutputPort::post_process(Context& context)
{
@@ -77,5 +74,4 @@ OutputPort::post_process(Context& context)
broadcast_value(context, false);
}
-
} // namespace Ingen
diff --git a/src/engine/OutputPort.hpp b/src/engine/OutputPort.hpp
index eb78bf0a..fc1434af 100644
--- a/src/engine/OutputPort.hpp
+++ b/src/engine/OutputPort.hpp
@@ -24,7 +24,6 @@
namespace Ingen {
-
/** An output port.
*
* Output ports always have a locally allocated buffer, and buffer() will
@@ -59,7 +58,6 @@ public:
bool is_output() const { return true; }
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_OUTPUTPORT_HPP
diff --git a/src/engine/PatchImpl.cpp b/src/engine/PatchImpl.cpp
index a9be238f..a0bf166c 100644
--- a/src/engine/PatchImpl.cpp
+++ b/src/engine/PatchImpl.cpp
@@ -40,7 +40,6 @@ namespace Ingen {
using namespace Shared;
-
PatchImpl::PatchImpl(Engine& engine, const Raul::Symbol& symbol, uint32_t poly, PatchImpl* parent, SampleRate srate, uint32_t internal_poly)
: NodeImpl(new PatchPlugin(*engine.world()->uris().get(),
engine.world()->uris()->ingen_Patch.c_str(), "patch", "Ingen Patch"),
@@ -53,7 +52,6 @@ PatchImpl::PatchImpl(Engine& engine, const Raul::Symbol& symbol, uint32_t poly,
assert(internal_poly >= 1);
}
-
PatchImpl::~PatchImpl()
{
assert(!_activated);
@@ -62,7 +60,6 @@ PatchImpl::~PatchImpl()
delete _plugin;
}
-
void
PatchImpl::activate(BufferFactory& bufs)
{
@@ -74,7 +71,6 @@ PatchImpl::activate(BufferFactory& bufs)
assert(_activated);
}
-
void
PatchImpl::deactivate()
{
@@ -91,7 +87,6 @@ PatchImpl::deactivate()
assert(!_activated);
}
-
void
PatchImpl::disable()
{
@@ -104,7 +99,6 @@ PatchImpl::disable()
(*i)->clear_buffers();
}
-
bool
PatchImpl::prepare_internal_poly(BufferFactory& bufs, uint32_t poly)
{
@@ -122,7 +116,6 @@ PatchImpl::prepare_internal_poly(BufferFactory& bufs, uint32_t poly)
return true;
}
-
bool
PatchImpl::apply_internal_poly(ProcessContext& context, BufferFactory& bufs, Raul::Maid& maid, uint32_t poly)
{
@@ -151,7 +144,6 @@ PatchImpl::apply_internal_poly(ProcessContext& context, BufferFactory& bufs, Rau
return true;
}
-
/** Run the patch for the specified number of frames.
*
* Calls all Nodes in (roughly, if parallel) the order _compiled_patch specifies.
@@ -182,7 +174,6 @@ PatchImpl::process(ProcessContext& context)
NodeImpl::post_process(context);
}
-
void
PatchImpl::process_parallel(ProcessContext& context)
{
@@ -203,7 +194,6 @@ PatchImpl::process_parallel(ProcessContext& context)
context.slaves()[i]->whip(cp, i+1, context);
}
-
/* Process ourself until everything is done
* This is analogous to ProcessSlave::_whipped(), but this is the master
* (i.e. what the main Jack process thread calls). Where ProcessSlave
@@ -249,7 +239,6 @@ PatchImpl::process_parallel(ProcessContext& context)
context.slaves()[i]->finish();
}
-
void
PatchImpl::process_single(ProcessContext& context)
{
@@ -257,7 +246,6 @@ PatchImpl::process_single(ProcessContext& context)
(*_compiled_patch)[i].node()->process(context);
}
-
void
PatchImpl::set_buffer_size(Context& context, BufferFactory& bufs, PortType type, size_t size)
{
@@ -267,10 +255,8 @@ PatchImpl::set_buffer_size(Context& context, BufferFactory& bufs, PortType type,
(*_compiled_patch)[i].node()->set_buffer_size(context, bufs, type, size);
}
-
// Patch specific stuff
-
/** Add a node.
* Preprocessing thread only.
*/
@@ -286,7 +272,6 @@ PatchImpl::add_node(List<NodeImpl*>::Node* ln)
_nodes.push_back(ln);
}
-
/** Remove a node.
* Preprocessing thread only.
*/
@@ -301,7 +286,6 @@ PatchImpl::remove_node(const Raul::Symbol& symbol)
return NULL;
}
-
void
PatchImpl::add_connection(SharedPtr<ConnectionImpl> c)
{
@@ -309,7 +293,6 @@ PatchImpl::add_connection(SharedPtr<ConnectionImpl> c)
_connections.insert(make_pair(make_pair(c->src_port(), c->dst_port()), c));
}
-
/** Remove a connection.
* Preprocessing thread only.
*/
@@ -328,7 +311,6 @@ PatchImpl::remove_connection(const PortImpl* src_port, const PortImpl* dst_port)
}
}
-
bool
PatchImpl::has_connection(const PortImpl* src_port, const PortImpl* dst_port) const
{
@@ -337,7 +319,6 @@ PatchImpl::has_connection(const PortImpl* src_port, const PortImpl* dst_port) co
return (i != _connections.end());
}
-
uint32_t
PatchImpl::num_ports() const
{
@@ -347,7 +328,6 @@ PatchImpl::num_ports() const
return _input_ports.size() + _output_ports.size();
}
-
/** Create a port. Not realtime safe.
*/
PortImpl*
@@ -364,7 +344,6 @@ PatchImpl::create_port(BufferFactory& bufs, const string& name, PortType type, s
type, Raul::Atom(), buffer_size, is_output);
}
-
/** Remove port from ports list used in pre-processing thread.
*
* Port is not removed from ports array for process thread (which could be
@@ -402,7 +381,6 @@ PatchImpl::remove_port(const string& symbol)
return ret;
}
-
/** Remove all ports from ports list used in pre-processing thread.
*
* Ports are not removed from ports array for process thread (which could be
@@ -419,7 +397,6 @@ PatchImpl::clear_ports()
_output_ports.clear();
}
-
Raul::Array<PortImpl*>*
PatchImpl::build_ports_array() const
{
@@ -438,7 +415,6 @@ PatchImpl::build_ports_array() const
return result;
}
-
/** Find the process order for this Patch.
*
* The process order is a flat list that the patch will execute in order
@@ -487,5 +463,4 @@ PatchImpl::compile() const
return compiled_patch;
}
-
} // namespace Ingen
diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp
index 1ecb5bae..4a333812 100644
--- a/src/engine/PatchImpl.hpp
+++ b/src/engine/PatchImpl.hpp
@@ -37,7 +37,6 @@ class Context;
class Engine;
class ProcessContext;
-
/** A group of nodes in a graph, possibly polyphonic.
*
* Note that this is also a Node, just one which contains Nodes.
@@ -141,8 +140,6 @@ private:
bool _process;
};
-
-
/** Private helper for compile */
inline void
PatchImpl::compile_recursive(NodeImpl* n, CompiledPatch* output) const
@@ -160,7 +157,6 @@ PatchImpl::compile_recursive(NodeImpl* n, CompiledPatch* output) const
output->push_back(CompiledNode(n, n->providers()->size(), n->dependants()));
}
-
} // namespace Ingen
#endif // INGEN_ENGINE_PATCHIMPL_HPP
diff --git a/src/engine/PatchPlugin.hpp b/src/engine/PatchPlugin.hpp
index 72f3d4f0..e86e4dd3 100644
--- a/src/engine/PatchPlugin.hpp
+++ b/src/engine/PatchPlugin.hpp
@@ -27,7 +27,6 @@ namespace Ingen {
class NodeImpl;
-
/** Implementation of a Patch plugin.
*
* Patches don't actually work like this yet...
@@ -60,7 +59,6 @@ private:
const std::string _name;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_PATCHPLUGIN_HPP
diff --git a/src/engine/PluginImpl.cpp b/src/engine/PluginImpl.cpp
index 208db373..2cc0db7f 100644
--- a/src/engine/PluginImpl.cpp
+++ b/src/engine/PluginImpl.cpp
@@ -23,7 +23,6 @@ using namespace Raul;
namespace Ingen {
-
void
PluginImpl::load()
{
@@ -35,7 +34,6 @@ PluginImpl::load()
}
}
-
void
PluginImpl::unload()
{
@@ -46,6 +44,5 @@ PluginImpl::unload()
}
}
-
} // namespace Ingen
diff --git a/src/engine/PluginImpl.hpp b/src/engine/PluginImpl.hpp
index fca6320e..d058d046 100644
--- a/src/engine/PluginImpl.hpp
+++ b/src/engine/PluginImpl.hpp
@@ -36,7 +36,6 @@ class NodeImpl;
class Engine;
class BufferFactory;
-
/** Implementation of a plugin (internal code, or a loaded shared library).
*
* Conceptually, a Node is an instance of this.
@@ -78,7 +77,6 @@ protected:
Glib::Module* _module;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_PLUGINIMPL_HPP
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index a2bb594b..198a43b5 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -39,7 +39,6 @@ namespace Ingen {
using namespace Shared;
-
PortImpl::PortImpl(BufferFactory& bufs,
NodeImpl* const node,
const Raul::Symbol& name,
@@ -78,20 +77,17 @@ PortImpl::PortImpl(BufferFactory& bufs,
_broadcast = true; // send activity blips
}
-
PortImpl::~PortImpl()
{
delete _buffers;
}
-
bool
PortImpl::supports(const Raul::URI& value_type) const
{
return has_property(_bufs.uris().atom_supports, value_type);
}
-
Raul::Array<BufferFactory::Ref>*
PortImpl::set_buffers(Raul::Array<BufferFactory::Ref>* buffers)
{
@@ -108,7 +104,6 @@ PortImpl::set_buffers(Raul::Array<BufferFactory::Ref>* buffers)
return ret;
}
-
bool
PortImpl::prepare_poly(BufferFactory& bufs, uint32_t poly)
{
@@ -130,7 +125,6 @@ PortImpl::prepare_poly(BufferFactory& bufs, uint32_t poly)
return true;
}
-
void
PortImpl::prepare_poly_buffers(BufferFactory& bufs)
{
@@ -138,7 +132,6 @@ PortImpl::prepare_poly_buffers(BufferFactory& bufs)
get_buffers(bufs, _prepared_buffers, _prepared_buffers->size());
}
-
bool
PortImpl::apply_poly(Maid& maid, uint32_t poly)
{
@@ -171,7 +164,6 @@ PortImpl::apply_poly(Maid& maid, uint32_t poly)
return true;
}
-
void
PortImpl::set_buffer_size(Context& context, BufferFactory& bufs, size_t size)
{
@@ -183,7 +175,6 @@ PortImpl::set_buffer_size(Context& context, BufferFactory& bufs, size_t size)
connect_buffers();
}
-
void
PortImpl::connect_buffers(SampleCount offset)
{
@@ -191,7 +182,6 @@ PortImpl::connect_buffers(SampleCount offset)
PortImpl::parent_node()->set_port_buffer(v, _index, buffer(v), offset);
}
-
void
PortImpl::recycle_buffers()
{
@@ -199,7 +189,6 @@ PortImpl::recycle_buffers()
_buffers->at(v) = NULL;
}
-
void
PortImpl::clear_buffers()
{
@@ -207,7 +196,6 @@ PortImpl::clear_buffers()
buffer(v)->clear();
}
-
void
PortImpl::broadcast_value(Context& context, bool force)
{
@@ -238,7 +226,6 @@ PortImpl::broadcast_value(Context& context, bool force)
}
}
-
void
PortImpl::set_context(Context::ID c)
{
@@ -254,7 +241,6 @@ PortImpl::set_context(Context::ID c)
}
}
-
PortType
PortImpl::buffer_type() const
{
@@ -262,5 +248,4 @@ PortImpl::buffer_type() const
return *_types.begin();
}
-
} // namespace Ingen
diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp
index 58fd6ea5..605dfbed 100644
--- a/src/engine/PortImpl.hpp
+++ b/src/engine/PortImpl.hpp
@@ -38,7 +38,6 @@ class NodeImpl;
class Buffer;
class BufferFactory;
-
/** A port on a Node.
*
* This is a non-template abstract base class, which basically exists so
@@ -166,7 +165,6 @@ protected:
Raul::Array<BufferFactory::Ref>* _prepared_buffers;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_PORTIMPL_HPP
diff --git a/src/engine/PostProcessor.cpp b/src/engine/PostProcessor.cpp
index 5a30ff52..f385e423 100644
--- a/src/engine/PostProcessor.cpp
+++ b/src/engine/PostProcessor.cpp
@@ -31,7 +31,6 @@ using namespace Raul;
namespace Ingen {
-
PostProcessor::PostProcessor(Engine& engine, size_t queue_size)
: _engine(engine)
, _max_time(0)
@@ -41,13 +40,11 @@ PostProcessor::PostProcessor(Engine& engine, size_t queue_size)
{
}
-
PostProcessor::~PostProcessor()
{
free(_event_buffer);
}
-
void
PostProcessor::process()
{
@@ -90,5 +87,4 @@ PostProcessor::process()
}
}
-
} // namespace Ingen
diff --git a/src/engine/PostProcessor.hpp b/src/engine/PostProcessor.hpp
index 30002d9c..e436b5d3 100644
--- a/src/engine/PostProcessor.hpp
+++ b/src/engine/PostProcessor.hpp
@@ -27,7 +27,6 @@ namespace Ingen {
class Event;
class Engine;
-
/** Processor for Events after leaving the audio thread.
*
* The audio thread pushes events to this when it is done with them (which
@@ -62,7 +61,6 @@ private:
uint8_t* _event_buffer;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_POSTPROCESSOR_HPP
diff --git a/src/engine/ProcessContext.hpp b/src/engine/ProcessContext.hpp
index 9e43cc3d..9faf967e 100644
--- a/src/engine/ProcessContext.hpp
+++ b/src/engine/ProcessContext.hpp
@@ -47,8 +47,6 @@ private:
Slaves _slaves;
};
-
-
} // namespace Ingen
#endif // INGEN_ENGINE_PROCESSCONTEXT_HPP
diff --git a/src/engine/ProcessSlave.cpp b/src/engine/ProcessSlave.cpp
index a02d1140..17744696 100644
--- a/src/engine/ProcessSlave.cpp
+++ b/src/engine/ProcessSlave.cpp
@@ -23,10 +23,8 @@ using namespace std;
namespace Ingen {
-
uint32_t ProcessSlave::_next_id = 0;
-
void
ProcessSlave::_whipped()
{
@@ -70,5 +68,4 @@ ProcessSlave::_whipped()
_state = STATE_FINISHED;
}
-
} // namespace Ingen
diff --git a/src/engine/ProcessSlave.hpp b/src/engine/ProcessSlave.hpp
index 1d3c169d..f69d75c5 100644
--- a/src/engine/ProcessSlave.hpp
+++ b/src/engine/ProcessSlave.hpp
@@ -33,7 +33,6 @@ namespace Ingen {
class NodeImpl;
class CompiledPatch;
-
class ProcessSlave : protected Raul::Slave {
public:
ProcessSlave(Engine& engine, bool realtime)
@@ -98,7 +97,6 @@ private:
ProcessContext* _context;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_PROCESSSLAVE_HPP
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp
index eea27126..f19ef551 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/engine/QueuedEngineInterface.cpp
@@ -43,7 +43,6 @@ QueuedEngineInterface::QueuedEngineInterface(Engine& engine, size_t queue_size)
{
}
-
SampleCount
QueuedEngineInterface::now() const
{
@@ -55,7 +54,6 @@ QueuedEngineInterface::now() const
return 0;
}
-
void
QueuedEngineInterface::set_next_response_id(int32_t id)
{
@@ -63,7 +61,6 @@ QueuedEngineInterface::set_next_response_id(int32_t id)
_request->set_id(id);
}
-
void
QueuedEngineInterface::disable_responses()
{
@@ -71,10 +68,8 @@ QueuedEngineInterface::disable_responses()
_request->set_id(0);
}
-
/* *** EngineInterface implementation below here *** */
-
void
QueuedEngineInterface::register_client(ClientInterface* client)
{
@@ -87,7 +82,6 @@ QueuedEngineInterface::register_client(ClientInterface* client)
}
}
-
void
QueuedEngineInterface::unregister_client(const URI& uri)
{
@@ -98,8 +92,6 @@ QueuedEngineInterface::unregister_client(const URI& uri)
}
}
-
-
// Engine commands
void
QueuedEngineInterface::load_plugins()
@@ -107,7 +99,6 @@ QueuedEngineInterface::load_plugins()
push_queued(new Events::LoadPlugins(_engine, _request, now()));
}
-
void
QueuedEngineInterface::activate()
{
@@ -121,14 +112,12 @@ QueuedEngineInterface::activate()
in_activate = false;
}
-
void
QueuedEngineInterface::deactivate()
{
push_queued(new Events::Deactivate(_engine, _request, now()));
}
-
void
QueuedEngineInterface::quit()
{
@@ -136,7 +125,6 @@ QueuedEngineInterface::quit()
_engine.quit();
}
-
// Bundle commands
void
@@ -145,17 +133,14 @@ QueuedEngineInterface::bundle_begin()
_in_bundle = true;
}
-
void
QueuedEngineInterface::bundle_end()
{
_in_bundle = false;
}
-
// Object commands
-
void
QueuedEngineInterface::put(const URI& uri,
const Resource::Properties& properties,
@@ -164,7 +149,6 @@ QueuedEngineInterface::put(const URI& uri,
push_queued(new Events::SetMetadata(_engine, _request, now(), true, ctx, uri, properties));
}
-
void
QueuedEngineInterface::delta(const URI& uri,
const Shared::Resource::Properties& remove,
@@ -173,7 +157,6 @@ QueuedEngineInterface::delta(const URI& uri,
push_queued(new Events::SetMetadata(_engine, _request, now(), false, Resource::DEFAULT, uri, add, remove));
}
-
void
QueuedEngineInterface::move(const Path& old_path,
const Path& new_path)
@@ -181,14 +164,12 @@ QueuedEngineInterface::move(const Path& old_path,
push_queued(new Events::Move(_engine, _request, now(), old_path, new_path));
}
-
void
QueuedEngineInterface::del(const Path& path)
{
push_queued(new Events::Delete(_engine, _request, now(), path));
}
-
void
QueuedEngineInterface::connect(const Path& src_port_path,
const Path& dst_port_path)
@@ -197,7 +178,6 @@ QueuedEngineInterface::connect(const Path& src_port_path,
}
-
void
QueuedEngineInterface::disconnect(const Path& src_port_path,
const Path& dst_port_path)
@@ -205,7 +185,6 @@ QueuedEngineInterface::disconnect(const Path& src_port_path,
push_queued(new Events::Disconnect(_engine, _request, now(), src_port_path, dst_port_path));
}
-
void
QueuedEngineInterface::disconnect_all(const Path& patch_path,
const Path& path)
@@ -213,7 +192,6 @@ QueuedEngineInterface::disconnect_all(const Path& patch_path,
push_queued(new Events::DisconnectAll(_engine, _request, now(), patch_path, path));
}
-
void
QueuedEngineInterface::set_property(const URI& uri,
const URI& predicate,
@@ -234,19 +212,16 @@ QueuedEngineInterface::ping()
push_queued(new Events::Ping(_engine, _request, now()));
}
-
void
QueuedEngineInterface::get(const URI& uri)
{
push_queued(new Events::Get(_engine, _request, now(), uri));
}
-
void
QueuedEngineInterface::request_property(const URI& uri, const URI& key)
{
push_queued(new Events::RequestMetadata(_engine, _request, now(), Resource::DEFAULT, uri, key));
}
-
} // namespace Ingen
diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp
index 6cdb618d..d80c0e55 100644
--- a/src/engine/QueuedEngineInterface.hpp
+++ b/src/engine/QueuedEngineInterface.hpp
@@ -34,7 +34,6 @@ namespace Ingen {
class Engine;
-
/** A queued (preprocessed) event source / interface.
*
* This is the bridge between the EngineInterface presented to the client, and
@@ -115,7 +114,6 @@ private:
SampleCount now() const;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_QUEUEDENGINEINTERFACE_HPP
diff --git a/src/engine/QueuedEvent.cpp b/src/engine/QueuedEvent.cpp
index 0d73ba00..89549b87 100644
--- a/src/engine/QueuedEvent.cpp
+++ b/src/engine/QueuedEvent.cpp
@@ -21,7 +21,6 @@
namespace Ingen {
-
void
QueuedEvent::pre_process()
{
@@ -30,7 +29,6 @@ QueuedEvent::pre_process()
_pre_processed = true;
}
-
void
QueuedEvent::execute(ProcessContext& context)
{
@@ -45,6 +43,5 @@ QueuedEvent::execute(ProcessContext& context)
Event::execute(context);
}
-
} // namespace Ingen
diff --git a/src/engine/QueuedEvent.hpp b/src/engine/QueuedEvent.hpp
index 3fe75ffb..e846466d 100644
--- a/src/engine/QueuedEvent.hpp
+++ b/src/engine/QueuedEvent.hpp
@@ -22,7 +22,6 @@
namespace Ingen {
-
/** An Event with a not-time-critical preprocessing stage.
*
* These events are events that aren't able to be executed immediately by the
@@ -71,7 +70,6 @@ protected:
bool _blocking;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_QUEUEDEVENT_HPP
diff --git a/src/engine/Request.hpp b/src/engine/Request.hpp
index 17930554..2fbbde27 100644
--- a/src/engine/Request.hpp
+++ b/src/engine/Request.hpp
@@ -25,7 +25,6 @@
namespace Ingen {
-
/** Record of a request (used to respond to clients).
*
* This is a glorified std::pair<ClientInterface*, int32_t> for replying
@@ -72,7 +71,6 @@ private:
int32_t _id;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_REQUEST_HPP
diff --git a/src/engine/ThreadManager.hpp b/src/engine/ThreadManager.hpp
index 45ad410b..a8e913e0 100644
--- a/src/engine/ThreadManager.hpp
+++ b/src/engine/ThreadManager.hpp
@@ -23,14 +23,12 @@
namespace Ingen {
-
enum ThreadID {
THREAD_PRE_PROCESS,
THREAD_PROCESS,
THREAD_MESSAGE,
};
-
class ThreadManager {
public:
inline static bool thread_is(ThreadID id) {
@@ -51,7 +49,6 @@ public:
static bool single_threaded;
};
-
} // namespace Ingen
#endif // INGEN_ENGINE_THREADMANAGER_HPP
diff --git a/src/engine/events/Connect.cpp b/src/engine/events/Connect.cpp
index 61329f03..bd464fc7 100644
--- a/src/engine/events/Connect.cpp
+++ b/src/engine/events/Connect.cpp
@@ -41,7 +41,6 @@ namespace Events {
using namespace Shared;
-
Connect::Connect(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& src_port_path, const Path& dst_port_path)
: QueuedEvent(engine, request, timestamp)
, _src_port_path(src_port_path)
@@ -55,7 +54,6 @@ Connect::Connect(Engine& engine, SharedPtr<Request> request, SampleCount timesta
{
}
-
void
Connect::pre_process()
{
@@ -149,7 +147,6 @@ Connect::pre_process()
QueuedEvent::pre_process();
}
-
void
Connect::execute(ProcessContext& context)
{
@@ -169,7 +166,6 @@ Connect::execute(ProcessContext& context)
}
}
-
void
Connect::post_process()
{
@@ -203,7 +199,6 @@ Connect::post_process()
_request->respond_error(ss.str());
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Connect.hpp b/src/engine/events/Connect.hpp
index 02e914af..75639003 100644
--- a/src/engine/events/Connect.hpp
+++ b/src/engine/events/Connect.hpp
@@ -41,7 +41,6 @@ class CompiledPatch;
namespace Events {
-
/** Make a Connection between two Ports.
*
* \ingroup engine
@@ -81,7 +80,6 @@ private:
Raul::Array<BufferFactory::Ref>* _buffers;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/CreateNode.cpp b/src/engine/events/CreateNode.cpp
index e5f8d721..25ceaa3a 100644
--- a/src/engine/events/CreateNode.cpp
+++ b/src/engine/events/CreateNode.cpp
@@ -66,7 +66,6 @@ CreateNode::CreateNode(
_polyphonic = true;
}
-
void
CreateNode::pre_process()
{
@@ -105,7 +104,6 @@ CreateNode::pre_process()
QueuedEvent::pre_process();
}
-
void
CreateNode::execute(ProcessContext& context)
{
@@ -117,7 +115,6 @@ CreateNode::execute(ProcessContext& context)
}
}
-
void
CreateNode::post_process()
{
@@ -144,7 +141,6 @@ CreateNode::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp
index 1e341c1a..f1a14464 100644
--- a/src/engine/events/CreateNode.hpp
+++ b/src/engine/events/CreateNode.hpp
@@ -31,7 +31,6 @@ class CompiledPatch;
namespace Events {
-
/** An event to load a Node and insert it into a Patch.
*
* \ingroup engine
@@ -64,7 +63,6 @@ private:
Shared::Resource::Properties _properties;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/CreatePatch.cpp b/src/engine/events/CreatePatch.cpp
index f5e07797..cb972cf9 100644
--- a/src/engine/events/CreatePatch.cpp
+++ b/src/engine/events/CreatePatch.cpp
@@ -36,7 +36,6 @@ namespace Events {
using namespace Shared;
-
CreatePatch::CreatePatch(
Engine& engine,
SharedPtr<Request> request,
@@ -54,7 +53,6 @@ CreatePatch::CreatePatch(
{
}
-
void
CreatePatch::pre_process()
{
@@ -108,7 +106,6 @@ CreatePatch::pre_process()
QueuedEvent::pre_process();
}
-
void
CreatePatch::execute(ProcessContext& context)
{
@@ -128,7 +125,6 @@ CreatePatch::execute(ProcessContext& context)
}
}
-
void
CreatePatch::post_process()
{
@@ -163,7 +159,6 @@ CreatePatch::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp
index 84c0c0aa..5a272541 100644
--- a/src/engine/events/CreatePatch.hpp
+++ b/src/engine/events/CreatePatch.hpp
@@ -28,7 +28,6 @@ class CompiledPatch;
namespace Events {
-
/** Creates a new Patch.
*
* \ingroup engine
@@ -60,9 +59,7 @@ private:
Shared::Resource::Properties _properties;
};
-
} // namespace Ingen
} // namespace Events
-
#endif // INGEN_EVENTS_CREATEPATCH_HPP
diff --git a/src/engine/events/CreatePort.cpp b/src/engine/events/CreatePort.cpp
index cb05a020..eda6dedd 100644
--- a/src/engine/events/CreatePort.cpp
+++ b/src/engine/events/CreatePort.cpp
@@ -42,7 +42,6 @@ namespace Events {
using namespace Shared;
-
CreatePort::CreatePort(
Engine& engine,
SharedPtr<Request> request,
@@ -73,7 +72,6 @@ CreatePort::CreatePort(
_error = UNKNOWN_TYPE;
}
-
void
CreatePort::pre_process()
{
@@ -143,7 +141,6 @@ CreatePort::pre_process()
QueuedEvent::pre_process();
}
-
void
CreatePort::execute(ProcessContext& context)
{
@@ -163,7 +160,6 @@ CreatePort::execute(ProcessContext& context)
_request->unblock();
}
-
void
CreatePort::post_process()
{
@@ -191,7 +187,6 @@ CreatePort::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp
index 1bee8be6..cac3c2b6 100644
--- a/src/engine/events/CreatePort.hpp
+++ b/src/engine/events/CreatePort.hpp
@@ -32,7 +32,6 @@ class DriverPort;
namespace Events {
-
/** An event to add a Port to a Patch.
*
* \ingroup engine
@@ -74,7 +73,6 @@ private:
Shared::Resource::Properties _properties;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Deactivate.hpp b/src/engine/events/Deactivate.hpp
index 7f664455..34fdd80b 100644
--- a/src/engine/events/Deactivate.hpp
+++ b/src/engine/events/Deactivate.hpp
@@ -24,7 +24,6 @@
namespace Ingen {
namespace Events {
-
/** Deactivates the engine.
*
* \ingroup engine
@@ -42,7 +41,6 @@ public:
}
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Delete.cpp b/src/engine/events/Delete.cpp
index a628be76..5646b9c5 100644
--- a/src/engine/events/Delete.cpp
+++ b/src/engine/events/Delete.cpp
@@ -37,7 +37,6 @@ namespace Events {
using namespace Shared;
-
Delete::Delete(Engine& engine, SharedPtr<Request> request, FrameTime time, const Raul::Path& path)
: QueuedEvent(engine, request, time, true)
, _path(path)
@@ -54,13 +53,11 @@ Delete::Delete(Engine& engine, SharedPtr<Request> request, FrameTime time, const
assert(request->source());
}
-
Delete::~Delete()
{
delete _disconnect_event;
}
-
void
Delete::pre_process()
{
@@ -127,7 +124,6 @@ Delete::pre_process()
QueuedEvent::pre_process();
}
-
void
Delete::execute(ProcessContext& context)
{
@@ -166,7 +162,6 @@ Delete::execute(ProcessContext& context)
_request->unblock();
}
-
void
Delete::post_process()
{
@@ -207,6 +202,5 @@ Delete::post_process()
_engine.maid()->push(_garbage);
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Delete.hpp b/src/engine/events/Delete.hpp
index c8a6ee96..57dac59b 100644
--- a/src/engine/events/Delete.hpp
+++ b/src/engine/events/Delete.hpp
@@ -40,7 +40,6 @@ namespace Events {
class DisconnectAll;
-
/** \page methods
* <h2>DELETE</h2>
* As per WebDAV (RFC4918 S9.6).
@@ -88,7 +87,6 @@ private:
SharedPtr< Raul::Table<Raul::Path, SharedPtr<Shared::GraphObject> > > _removed_table;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Disconnect.cpp b/src/engine/events/Disconnect.cpp
index a05a2792..633871c3 100644
--- a/src/engine/events/Disconnect.cpp
+++ b/src/engine/events/Disconnect.cpp
@@ -38,7 +38,6 @@ using namespace Raul;
namespace Ingen {
namespace Events {
-
Disconnect::Disconnect(
Engine& engine,
SharedPtr<Request> request,
@@ -59,7 +58,6 @@ Disconnect::Disconnect(
{
}
-
Disconnect::Disconnect(
Engine& engine,
SharedPtr<Request> request,
@@ -81,7 +79,6 @@ Disconnect::Disconnect(
{
}
-
void
Disconnect::pre_process()
{
@@ -166,14 +163,12 @@ Disconnect::pre_process()
_clear_dst_port = true;
}
-
if (!_internal && _patch->enabled())
_compiled_patch = _patch->compile();
QueuedEvent::pre_process();
}
-
void
Disconnect::execute(ProcessContext& context)
{
@@ -221,7 +216,6 @@ Disconnect::execute(ProcessContext& context)
}
}
-
void
Disconnect::post_process()
{
@@ -261,7 +255,6 @@ Disconnect::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Disconnect.hpp b/src/engine/events/Disconnect.hpp
index 28239332..503458be 100644
--- a/src/engine/events/Disconnect.hpp
+++ b/src/engine/events/Disconnect.hpp
@@ -38,7 +38,6 @@ class PortImpl;
namespace Events {
-
/** Make a Connection between two Ports.
*
* \ingroup engine
@@ -96,7 +95,6 @@ private:
bool _clear_dst_port;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/DisconnectAll.cpp b/src/engine/events/DisconnectAll.cpp
index 0fdb0cb8..cc49fb17 100644
--- a/src/engine/events/DisconnectAll.cpp
+++ b/src/engine/events/DisconnectAll.cpp
@@ -40,7 +40,6 @@ using namespace Raul;
namespace Ingen {
namespace Events {
-
DisconnectAll::DisconnectAll(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& parent_path, const Path& node_path)
: QueuedEvent(engine, request, timestamp)
, _parent_path(parent_path)
@@ -53,7 +52,6 @@ DisconnectAll::DisconnectAll(Engine& engine, SharedPtr<Request> request, SampleC
{
}
-
/** Internal version for use by other events.
*/
DisconnectAll::DisconnectAll(Engine& engine, PatchImpl* parent, GraphObjectImpl* object)
@@ -68,14 +66,12 @@ DisconnectAll::DisconnectAll(Engine& engine, PatchImpl* parent, GraphObjectImpl*
{
}
-
DisconnectAll::~DisconnectAll()
{
for (Raul::List<Disconnect*>::iterator i = _disconnect_events.begin(); i != _disconnect_events.end(); ++i)
delete (*i);
}
-
void
DisconnectAll::pre_process()
{
@@ -144,7 +140,6 @@ DisconnectAll::pre_process()
QueuedEvent::pre_process();
}
-
void
DisconnectAll::execute(ProcessContext& context)
{
@@ -160,7 +155,6 @@ DisconnectAll::execute(ProcessContext& context)
_parent->compiled_patch(_compiled_patch);
}
-
void
DisconnectAll::post_process()
{
@@ -191,7 +185,6 @@ DisconnectAll::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/DisconnectAll.hpp b/src/engine/events/DisconnectAll.hpp
index ae114977..57c5c495 100644
--- a/src/engine/events/DisconnectAll.hpp
+++ b/src/engine/events/DisconnectAll.hpp
@@ -33,7 +33,6 @@ namespace Events {
class Disconnect;
-
/** An event to disconnect all connections to a Node.
*
* \ingroup engine
@@ -79,9 +78,7 @@ private:
bool _deleting;
};
-
} // namespace Ingen
} // namespace Events
-
#endif // INGEN_EVENTS_DISCONNECTALL_HPP
diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp
index 17c4699d..9769be86 100644
--- a/src/engine/events/Get.cpp
+++ b/src/engine/events/Get.cpp
@@ -32,7 +32,6 @@ using namespace Raul;
namespace Ingen {
namespace Events {
-
Get::Get(
Engine& engine,
SharedPtr<Request> request,
@@ -45,7 +44,6 @@ Get::Get(
{
}
-
void
Get::pre_process()
{
@@ -60,7 +58,6 @@ Get::pre_process()
QueuedEvent::pre_process();
}
-
void
Get::post_process()
{
@@ -80,7 +77,6 @@ Get::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Get.hpp b/src/engine/events/Get.hpp
index ce5a839d..cb2dd7e4 100644
--- a/src/engine/events/Get.hpp
+++ b/src/engine/events/Get.hpp
@@ -29,7 +29,6 @@ class PluginImpl;
namespace Events {
-
/** A request from a client to send an object.
*
* \ingroup engine
@@ -53,7 +52,6 @@ private:
NodeFactory::Plugins _plugins;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/LoadPlugins.cpp b/src/engine/events/LoadPlugins.cpp
index eb4d2db7..81031e0d 100644
--- a/src/engine/events/LoadPlugins.cpp
+++ b/src/engine/events/LoadPlugins.cpp
@@ -24,7 +24,6 @@
namespace Ingen {
namespace Events {
-
LoadPlugins::LoadPlugins(Engine& engine, SharedPtr<Request> request, SampleCount timestamp)
: QueuedEvent(engine, request, timestamp, bool(request))
{
@@ -47,7 +46,6 @@ LoadPlugins::post_process()
_request->respond_ok();
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/LoadPlugins.hpp b/src/engine/events/LoadPlugins.hpp
index 3756ce7d..01920597 100644
--- a/src/engine/events/LoadPlugins.hpp
+++ b/src/engine/events/LoadPlugins.hpp
@@ -23,7 +23,6 @@
namespace Ingen {
namespace Events {
-
/** Loads all plugins into the internal plugin database (in NodeFactory).
*
* \ingroup engine
@@ -39,7 +38,6 @@ public:
void post_process();
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Move.cpp b/src/engine/events/Move.cpp
index 5a568dd9..b2526101 100644
--- a/src/engine/events/Move.cpp
+++ b/src/engine/events/Move.cpp
@@ -33,7 +33,6 @@ namespace Events {
using namespace Shared;
-
Move::Move(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const Path& path, const Path& new_path)
: QueuedEvent(engine, request, timestamp)
, _old_path(path)
@@ -43,12 +42,10 @@ Move::Move(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, co
{
}
-
Move::~Move()
{
}
-
void
Move::pre_process()
{
@@ -94,7 +91,6 @@ Move::pre_process()
QueuedEvent::pre_process();
}
-
void
Move::execute(ProcessContext& context)
{
@@ -108,7 +104,6 @@ Move::execute(ProcessContext& context)
}
}
-
void
Move::post_process()
{
@@ -131,6 +126,5 @@ Move::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Move.hpp b/src/engine/events/Move.hpp
index 84c180a2..13748144 100644
--- a/src/engine/events/Move.hpp
+++ b/src/engine/events/Move.hpp
@@ -28,7 +28,6 @@ class PatchImpl;
namespace Events {
-
/** \page methods
* <h2>MOVE</h2>
* As per WebDAV (RFC4918 S9.9).
@@ -72,7 +71,6 @@ private:
EngineStore::iterator _store_iterator;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/Ping.hpp b/src/engine/events/Ping.hpp
index e5edc662..271f97f4 100644
--- a/src/engine/events/Ping.hpp
+++ b/src/engine/events/Ping.hpp
@@ -28,7 +28,6 @@ class PortImpl;
namespace Events {
-
/** A ping that travels through the pre-processed event queue before responding
* (useful for the order guarantee).
*
@@ -44,7 +43,6 @@ public:
void post_process() { _request->respond_ok(); }
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/RegisterClient.cpp b/src/engine/events/RegisterClient.cpp
index f3e9ba8a..9eb67806 100644
--- a/src/engine/events/RegisterClient.cpp
+++ b/src/engine/events/RegisterClient.cpp
@@ -25,7 +25,6 @@ using namespace Raul;
namespace Ingen {
namespace Events {
-
RegisterClient::RegisterClient(Engine& engine,
SharedPtr<Request> request,
SampleCount timestamp,
@@ -37,7 +36,6 @@ RegisterClient::RegisterClient(Engine& engine,
{
}
-
void
RegisterClient::pre_process()
{
@@ -46,14 +44,12 @@ RegisterClient::pre_process()
QueuedEvent::pre_process();
}
-
void
RegisterClient::post_process()
{
_request->respond_ok();
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp
index 2703484c..063f0b31 100644
--- a/src/engine/events/RegisterClient.hpp
+++ b/src/engine/events/RegisterClient.hpp
@@ -25,7 +25,6 @@
namespace Ingen {
namespace Events {
-
/** Registers a new client with the OSC system, so it can receive updates.
*
* \ingroup engine
@@ -47,7 +46,6 @@ private:
Shared::ClientInterface* _client;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp
index b8adc34e..ad116474 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -39,7 +39,6 @@ namespace Events {
using namespace Shared;
-
RequestMetadata::RequestMetadata(Engine& engine,
SharedPtr<Request> request,
SampleCount timestamp,
@@ -55,7 +54,6 @@ RequestMetadata::RequestMetadata(Engine& engine,
{
}
-
void
RequestMetadata::pre_process()
{
@@ -85,7 +83,6 @@ RequestMetadata::pre_process()
QueuedEvent::pre_process();
}
-
void
RequestMetadata::execute(ProcessContext& context)
{
@@ -108,7 +105,6 @@ RequestMetadata::execute(ProcessContext& context)
}
}
-
void
RequestMetadata::post_process()
{
@@ -134,7 +130,6 @@ RequestMetadata::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/RequestMetadata.hpp b/src/engine/events/RequestMetadata.hpp
index 96afe6b2..891282f3 100644
--- a/src/engine/events/RequestMetadata.hpp
+++ b/src/engine/events/RequestMetadata.hpp
@@ -29,7 +29,6 @@ class GraphObjectImpl;
namespace Events {
-
/** \page methods
* <h2>GET</h2>
* As per HTTP (RFC2616 S9.3).
@@ -69,7 +68,6 @@ private:
Shared::Resource::Graph _context;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SendBinding.cpp b/src/engine/events/SendBinding.cpp
index 0a28b8b0..64785829 100644
--- a/src/engine/events/SendBinding.cpp
+++ b/src/engine/events/SendBinding.cpp
@@ -27,7 +27,6 @@ using namespace std;
namespace Ingen {
namespace Events {
-
void
SendBinding::post_process()
{
@@ -49,7 +48,6 @@ SendBinding::post_process()
_engine.broadcaster()->set_property(_port->path(), uris.ingen_controlBinding, dict);
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SendBinding.hpp b/src/engine/events/SendBinding.hpp
index c9def7ff..7f2ff91a 100644
--- a/src/engine/events/SendBinding.hpp
+++ b/src/engine/events/SendBinding.hpp
@@ -28,7 +28,6 @@ class PortImpl;
namespace Events {
-
/** A special event used internally to send control bindings from the audio thread.
*
* See SendPortValue documentation for details.
@@ -79,7 +78,6 @@ private:
int16_t _num;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SendPortActivity.cpp b/src/engine/events/SendPortActivity.cpp
index 09978af1..fedebdda 100644
--- a/src/engine/events/SendPortActivity.cpp
+++ b/src/engine/events/SendPortActivity.cpp
@@ -23,14 +23,12 @@
namespace Ingen {
namespace Events {
-
void
SendPortActivity::post_process()
{
_engine.broadcaster()->activity(_port->path());
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp
index 9aa92d94..7b47e761 100644
--- a/src/engine/events/SendPortActivity.hpp
+++ b/src/engine/events/SendPortActivity.hpp
@@ -27,7 +27,6 @@ class PortImpl;
namespace Events {
-
/** A special event used internally to send port activity notification (e.g.
* MIDI event activity) from the audio thread.
*
@@ -62,7 +61,6 @@ private:
PortImpl* _port;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SendPortValue.cpp b/src/engine/events/SendPortValue.cpp
index a2d82ac8..62ed76ec 100644
--- a/src/engine/events/SendPortValue.cpp
+++ b/src/engine/events/SendPortValue.cpp
@@ -27,7 +27,6 @@ using namespace std;
namespace Ingen {
namespace Events {
-
void
SendPortValue::post_process()
{
@@ -36,7 +35,6 @@ SendPortValue::post_process()
_engine.world()->uris()->ingen_value, _value);
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SendPortValue.hpp b/src/engine/events/SendPortValue.hpp
index 847ef741..c7b36c6c 100644
--- a/src/engine/events/SendPortValue.hpp
+++ b/src/engine/events/SendPortValue.hpp
@@ -28,7 +28,6 @@ class PortImpl;
namespace Events {
-
/** A special event used internally to send port values from the audio thread.
*
* This is created in the audio thread (using in-place new on a preallocated
@@ -75,7 +74,6 @@ private:
Raul::Atom _value;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp
index afd4a226..0d5e3f88 100644
--- a/src/engine/events/SetMetadata.cpp
+++ b/src/engine/events/SetMetadata.cpp
@@ -48,7 +48,6 @@ namespace Events {
using namespace Shared;
typedef Shared::Resource::Properties Properties;
-
SetMetadata::SetMetadata(
Engine& engine,
SharedPtr<Request> request,
@@ -88,7 +87,6 @@ SetMetadata::SetMetadata(
*/
}
-
SetMetadata::~SetMetadata()
{
for (SetEvents::iterator i = _set_events.begin(); i != _set_events.end(); ++i)
@@ -97,7 +95,6 @@ SetMetadata::~SetMetadata()
delete _create_event;
}
-
void
SetMetadata::pre_process()
{
@@ -175,7 +172,6 @@ SetMetadata::pre_process()
_object->remove_property(key, value);
}
-
for (Properties::iterator p = _properties.begin(); p != _properties.end(); ++p) {
const Raul::URI& key = p->first;
const Raul::Atom& value = p->second;
@@ -263,7 +259,6 @@ SetMetadata::pre_process()
QueuedEvent::pre_process();
}
-
void
SetMetadata::execute(ProcessContext& context)
{
@@ -343,7 +338,6 @@ SetMetadata::execute(ProcessContext& context)
_request->unblock();
}
-
void
SetMetadata::post_process()
{
@@ -380,7 +374,6 @@ SetMetadata::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp
index 021cb3f4..f1ef9423 100644
--- a/src/engine/events/SetMetadata.hpp
+++ b/src/engine/events/SetMetadata.hpp
@@ -31,7 +31,6 @@ class CompiledPatch;
namespace Events {
-
/** \page methods
* <h2>POST</h2>
* As per HTTP (RFC2616 S9.5).
@@ -117,7 +116,6 @@ private:
SharedPtr<ControlBindings::Bindings> _old_bindings;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index 56285a60..5fdc5da9 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -46,7 +46,6 @@ namespace Events {
using namespace Shared;
-
SetPortValue::SetPortValue(Engine& engine,
SharedPtr<Request> request,
bool queued,
@@ -61,7 +60,6 @@ SetPortValue::SetPortValue(Engine& engine,
{
}
-
/** Internal */
SetPortValue::SetPortValue(Engine& engine,
SharedPtr<Request> request,
@@ -80,7 +78,6 @@ SetPortValue::~SetPortValue()
{
}
-
void
SetPortValue::pre_process()
{
@@ -108,7 +105,6 @@ SetPortValue::pre_process()
QueuedEvent::pre_process();
}
-
void
SetPortValue::execute(ProcessContext& context)
{
@@ -122,7 +118,6 @@ SetPortValue::execute(ProcessContext& context)
_engine.control_bindings()->port_value_changed(context, _port);
}
-
void
SetPortValue::apply(Context& context)
{
@@ -192,7 +187,6 @@ SetPortValue::apply(Context& context)
}
}
-
void
SetPortValue::post_process()
{
@@ -224,7 +218,6 @@ SetPortValue::post_process()
}
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/SetPortValue.hpp b/src/engine/events/SetPortValue.hpp
index c0cbb635..7b483709 100644
--- a/src/engine/events/SetPortValue.hpp
+++ b/src/engine/events/SetPortValue.hpp
@@ -28,7 +28,6 @@ class PortImpl;
namespace Events {
-
/** An event to change the value of a port.
*
* This event can either be queued or immediate, depending on the queued
@@ -76,7 +75,6 @@ private:
PortImpl* _port;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/UnregisterClient.cpp b/src/engine/events/UnregisterClient.cpp
index 6f0b6357..efa20a04 100644
--- a/src/engine/events/UnregisterClient.cpp
+++ b/src/engine/events/UnregisterClient.cpp
@@ -26,14 +26,12 @@ using namespace Raul;
namespace Ingen {
namespace Events {
-
UnregisterClient::UnregisterClient(Engine& engine, SharedPtr<Request> request, SampleCount timestamp, const URI& uri)
: QueuedEvent(engine, request, timestamp)
, _uri(uri)
{
}
-
void
UnregisterClient::post_process()
{
@@ -43,7 +41,6 @@ UnregisterClient::post_process()
_request->respond_error("Unable to unregister client");
}
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/events/UnregisterClient.hpp b/src/engine/events/UnregisterClient.hpp
index e3919b36..e0bebf65 100644
--- a/src/engine/events/UnregisterClient.hpp
+++ b/src/engine/events/UnregisterClient.hpp
@@ -24,7 +24,6 @@
namespace Ingen {
namespace Events {
-
/** Unregisters an OSC client so it no longer receives notifications.
*
* \ingroup engine
@@ -43,7 +42,6 @@ private:
Raul::URI _uri;
};
-
} // namespace Ingen
} // namespace Events
diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp
index 1e0532b7..943b6fe1 100644
--- a/src/engine/ingen_lv2.cpp
+++ b/src/engine/ingen_lv2.cpp
@@ -393,7 +393,7 @@ Lib::Lib()
}
assert(world->parser());
-
+
typedef Serialisation::Parser::PatchRecords Records;
Records records(world->parser()->find_patches(
diff --git a/src/engine/internals/Controller.cpp b/src/engine/internals/Controller.cpp
index e9d282e2..13c01460 100644
--- a/src/engine/internals/Controller.cpp
+++ b/src/engine/internals/Controller.cpp
@@ -81,7 +81,6 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
_ports->at(5) = _audio_port;
}
-
void
ControllerNode::process(ProcessContext& context)
{
@@ -108,7 +107,6 @@ ControllerNode::process(ProcessContext& context)
NodeImpl::post_process(context);
}
-
void
ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t val, FrameTime time)
{
@@ -144,7 +142,6 @@ ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t va
((AudioBuffer*)_audio_port->buffer(0).get())->set_value(scaled_value, context.start(), time);
}
-
} // namespace Internals
} // namespace Ingen
diff --git a/src/engine/internals/Controller.hpp b/src/engine/internals/Controller.hpp
index 16e4df30..d89e3b8b 100644
--- a/src/engine/internals/Controller.hpp
+++ b/src/engine/internals/Controller.hpp
@@ -29,7 +29,6 @@ class InternalPlugin;
namespace Internals {
-
/** MIDI control input node.
*
* Creating one of these nodes is how a user makes "MIDI Bindings". Note that
@@ -67,7 +66,6 @@ private:
OutputPort* _audio_port;
};
-
} // namespace Ingen
} // namespace Internals
diff --git a/src/engine/internals/Delay.cpp b/src/engine/internals/Delay.cpp
index 87aa952e..3b1960fd 100644
--- a/src/engine/internals/Delay.cpp
+++ b/src/engine/internals/Delay.cpp
@@ -92,14 +92,12 @@ DelayNode::DelayNode(
}
-
DelayNode::~DelayNode()
{
//_buffer.reset();
free(_buffer);
}
-
void
DelayNode::activate(BufferFactory& bufs)
{
@@ -118,7 +116,6 @@ DelayNode::activate(BufferFactory& bufs)
_write_phase = 0;
}
-
static inline float f_clamp(float x, float a, float b)
{
const float x1 = fabs(x - a);
@@ -131,7 +128,6 @@ static inline float f_clamp(float x, float a, float b)
return x;
}
-
static inline float cube_interp(const float fr, const float inm1, const float
in, const float inp1, const float inp2)
{
@@ -140,7 +136,6 @@ static inline float cube_interp(const float fr, const float inm1, const float
fr * (3.0f * (in - inp1) - inm1 + inp2)));
}
-
void
DelayNode::process(ProcessContext& context)
{
@@ -208,7 +203,6 @@ DelayNode::process(ProcessContext& context)
NodeImpl::post_process(context);
}
-
} // namespace Internals
} // namespace Ingen
diff --git a/src/engine/internals/Delay.hpp b/src/engine/internals/Delay.hpp
index c3657402..f43a32ae 100644
--- a/src/engine/internals/Delay.hpp
+++ b/src/engine/internals/Delay.hpp
@@ -32,7 +32,6 @@ class BufferFactory;
namespace Internals {
-
class DelayNode : public NodeImpl
{
public:
@@ -71,7 +70,6 @@ private:
float _delay_samples;
};
-
} // namespace Ingen
} // namespace Internals
diff --git a/src/engine/internals/Note.cpp b/src/engine/internals/Note.cpp
index a92e3069..ab2c6508 100644
--- a/src/engine/internals/Note.cpp
+++ b/src/engine/internals/Note.cpp
@@ -87,13 +87,11 @@ NoteNode::NoteNode(
_ports->at(4) = _trig_port;
}
-
NoteNode::~NoteNode()
{
delete _voices;
}
-
bool
NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly)
{
@@ -110,7 +108,6 @@ NoteNode::prepare_poly(BufferFactory& bufs, uint32_t poly)
return true;
}
-
bool
NoteNode::apply_poly(Raul::Maid& maid, uint32_t poly)
{
@@ -128,7 +125,6 @@ NoteNode::apply_poly(Raul::Maid& maid, uint32_t poly)
return true;
}
-
void
NoteNode::process(ProcessContext& context)
{
@@ -204,7 +200,6 @@ NoteNode::process(ProcessContext& context)
NodeImpl::post_process(context);
}
-
void
NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time)
{
@@ -294,7 +289,6 @@ NoteNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, F
assert((*_voices)[key->voice].note == note_num);
}
-
void
NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
{
@@ -333,7 +327,6 @@ NoteNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
key->state = Key::OFF;
}
-
void
NoteNode::free_voice(ProcessContext& context, uint32_t voice, FrameTime time)
{
@@ -374,7 +367,6 @@ NoteNode::free_voice(ProcessContext& context, uint32_t voice, FrameTime time)
}
}
-
void
NoteNode::all_notes_off(ProcessContext& context, FrameTime time)
{
@@ -392,7 +384,6 @@ NoteNode::all_notes_off(ProcessContext& context, FrameTime time)
}
}
-
float
NoteNode::note_to_freq(int num)
{
@@ -402,14 +393,12 @@ NoteNode::note_to_freq(int num)
return 1.0f; // Frequency of zero causes numerical problems...
}
-
void
NoteNode::sustain_on(ProcessContext& context, FrameTime time)
{
_sustain = true;
}
-
void
NoteNode::sustain_off(ProcessContext& context, FrameTime time)
{
@@ -422,7 +411,6 @@ NoteNode::sustain_off(ProcessContext& context, FrameTime time)
free_voice(context, i, time);
}
-
} // namespace Internals
} // namespace Ingen
diff --git a/src/engine/internals/Note.hpp b/src/engine/internals/Note.hpp
index 3c9e6f66..d38adfd8 100644
--- a/src/engine/internals/Note.hpp
+++ b/src/engine/internals/Note.hpp
@@ -30,7 +30,6 @@ class InternalPlugin;
namespace Internals {
-
/** MIDI note input node.
*
* For pitched instruments like keyboard, etc.
@@ -94,7 +93,6 @@ private:
OutputPort* _trig_port;
};
-
} // namespace Ingen
} // namespace Internals
diff --git a/src/engine/internals/Trigger.cpp b/src/engine/internals/Trigger.cpp
index 7461ec3a..2d8e43f9 100644
--- a/src/engine/internals/Trigger.cpp
+++ b/src/engine/internals/Trigger.cpp
@@ -84,7 +84,6 @@ TriggerNode::TriggerNode(
_ports->at(4) = _vel_port;
}
-
void
TriggerNode::process(ProcessContext& context)
{
@@ -129,7 +128,6 @@ TriggerNode::process(ProcessContext& context)
NodeImpl::post_process(context);
}
-
void
TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity, FrameTime time)
{
@@ -157,7 +155,6 @@ TriggerNode::note_on(ProcessContext& context, uint8_t note_num, uint8_t velocity
}
}
-
void
TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
{
@@ -167,6 +164,5 @@ TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time)
((AudioBuffer*)_gate_port->buffer(0).get())->set_value(0.0f, context.start(), time);
}
-
} // namespace Internals
} // namespace Ingen
diff --git a/src/engine/internals/Trigger.hpp b/src/engine/internals/Trigger.hpp
index 5d1eab9f..fc5c0be2 100644
--- a/src/engine/internals/Trigger.hpp
+++ b/src/engine/internals/Trigger.hpp
@@ -29,7 +29,6 @@ class InternalPlugin;
namespace Internals {
-
/** MIDI trigger input node.
*
* Just has a gate, for drums etc. A control port is used to select
@@ -70,7 +69,6 @@ private:
OutputPort* _vel_port;
};
-
} // namespace Ingen
} // namespace Internals
diff --git a/src/engine/tuning.hpp b/src/engine/tuning.hpp
index 1cf6ed1c..de08f5b4 100644
--- a/src/engine/tuning.hpp
+++ b/src/engine/tuning.hpp
@@ -33,7 +33,6 @@ static const size_t message_context_queue_size = 1024;
static const size_t event_bytes_per_frame = 4;
-
} // namespace Ingen
#endif // INGEN_ENGINE_TUNING_HPP
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 23924ded..e4bfc428 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -70,7 +70,6 @@ Gtk::Main* App::_main = 0;
/// Singleton instance
App* App::_instance = 0;
-
App::App(Ingen::Shared::World* world)
: _configuration(new Configuration())
, _about_dialog(NULL)
@@ -97,14 +96,12 @@ App::App(Ingen::Shared::World* world)
#endif
}
-
App::~App()
{
delete _configuration;
delete _window_factory;
}
-
void
App::init(Ingen::Shared::World* world)
{
@@ -151,7 +148,6 @@ App::init(Ingen::Shared::World* world)
break;
}
-
void
App::run()
{
@@ -160,7 +156,6 @@ App::run()
info << "[GUI] Exiting" << endl;
}
-
void
App::attach(SharedPtr<SigClientInterface> client,
SharedPtr<Raul::Deletable> handle)
@@ -182,7 +177,6 @@ App::attach(SharedPtr<SigClientInterface> client,
_client->signal_error.connect(sigc::mem_fun(this, &App::error_message));
}
-
void
App::detach()
{
@@ -198,7 +192,6 @@ App::detach()
}
}
-
SharedPtr<Serialiser>
App::serialiser()
{
@@ -208,14 +201,12 @@ App::serialiser()
return _world->serialiser();
}
-
void
App::error_response(int32_t id, const string& str)
{
error_message(str);
}
-
void
App::error_message(const string& str)
{
@@ -227,7 +218,6 @@ App::error_message(const string& str)
_messages_window->set_urgency_hint(true);
}
-
void
App::port_activity(Port* port)
{
@@ -246,7 +236,6 @@ App::port_activity(Port* port)
port->set_highlighted(true, false, true, false);
}
-
void
App::activity_port_destroyed(Port* port)
{
@@ -257,7 +246,6 @@ App::activity_port_destroyed(Port* port)
return;
}
-
bool
App::animate()
{
@@ -278,10 +266,8 @@ App::animate()
return true;
}
-
/******** Event Handlers ************/
-
void
App::register_callbacks()
{
@@ -292,7 +278,6 @@ App::register_callbacks()
sigc::mem_fun(App::instance(), &App::animate), 50, G_PRIORITY_DEFAULT);
}
-
bool
App::gtk_main_iteration()
{
@@ -313,7 +298,6 @@ App::gtk_main_iteration()
return true;
}
-
void
App::show_about()
{
@@ -321,7 +305,6 @@ App::show_about()
_about_dialog->hide();
}
-
/** Prompt (if necessary) and quit application (if confirmed).
* @return true iff the application quit.
*/
@@ -345,7 +328,6 @@ App::quit(Gtk::Window& dialog_parent)
return quit;
}
-
Glib::RefPtr<Gdk::Pixbuf>
App::icon_from_path(const string& path, int size)
{
@@ -376,7 +358,6 @@ App::icon_from_path(const string& path, int size)
return buf;
}
-
void*
App::icon_destroyed(void* data)
{
@@ -390,7 +371,6 @@ App::icon_destroyed(void* data)
return NULL;
}
-
bool
App::can_control(const Shared::Port* port) const
{
@@ -400,7 +380,6 @@ App::can_control(const Shared::Port* port) const
|| port->supports(uris().atom_String)));
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index e74a6168..efe22839 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -63,7 +63,6 @@ class ThreadedLoader;
class WindowFactory;
class Port;
-
/** Singleton master class most everything is contained within.
*
* This is a horrible god-object, but it's shrinking in size as things are
@@ -167,7 +166,6 @@ protected:
bool _enable_signal;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/BreadCrumbs.cpp b/src/gui/BreadCrumbs.cpp
index 011bf690..416d0178 100644
--- a/src/gui/BreadCrumbs.cpp
+++ b/src/gui/BreadCrumbs.cpp
@@ -35,7 +35,6 @@ BreadCrumbs::BreadCrumbs()
sigc::mem_fun(this, &BreadCrumbs::object_destroyed));
}
-
SharedPtr<PatchView>
BreadCrumbs::view(const Path& path)
{
@@ -46,7 +45,6 @@ BreadCrumbs::view(const Path& path)
return SharedPtr<PatchView>();
}
-
/** Sets up the crumbs to display @a path.
*
* If @a path is already part of the shown path, it will be selected and the
@@ -78,7 +76,6 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view)
_active_path = path;
_enable_signal = old_enable_signal;
-
// Moving to a child of the full path, just append crumbs (preserve view cache)
} else if (_breadcrumbs.size() > 0 && (path.is_child_of(_full_path))) {
@@ -102,7 +99,6 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view)
(*i)->set_active(false);
_breadcrumbs.back()->set_active(true);
-
// Rebuild from scratch
// Getting here is bad unless absolutely necessary, since the PatchView cache is lost
} else {
@@ -143,7 +139,6 @@ BreadCrumbs::build(Path path, SharedPtr<PatchView> view)
_enable_signal = old_enable_signal;
}
-
/** Create a new crumb, assigning it a reference to @a view if their paths
* match, otherwise ignoring @a view.
*/
@@ -160,7 +155,6 @@ BreadCrumbs::create_crumb(const Path& path,
return but;
}
-
void
BreadCrumbs::breadcrumb_clicked(BreadCrumb* crumb)
{
@@ -179,7 +173,6 @@ BreadCrumbs::breadcrumb_clicked(BreadCrumb* crumb)
}
}
-
void
BreadCrumbs::object_destroyed(const Path& path)
{
@@ -196,7 +189,6 @@ BreadCrumbs::object_destroyed(const Path& path)
}
}
-
void
BreadCrumbs::object_moved(const Path& old_path, const Path& new_path)
{
@@ -206,7 +198,6 @@ BreadCrumbs::object_moved(const Path& old_path, const Path& new_path)
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 6cd6e04a..0f5c1db0 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -30,7 +30,6 @@
namespace Ingen {
namespace GUI {
-
/** Collection of breadcrumb buttons forming a path.
* This doubles as a cache for PatchViews.
*
diff --git a/src/gui/Configuration.cpp b/src/gui/Configuration.cpp
index de4ed424..174ffbe5 100644
--- a/src/gui/Configuration.cpp
+++ b/src/gui/Configuration.cpp
@@ -37,7 +37,6 @@ namespace GUI {
using namespace Ingen::Client;
-
Configuration::Configuration()
// Colours from the Tango palette with modified V and alpha
: _name_style(HUMAN)
@@ -49,12 +48,10 @@ Configuration::Configuration()
{
}
-
Configuration::~Configuration()
{
}
-
/** Loads settings from the rc file. Passing no parameter will load from
* the default location.
*/
@@ -64,7 +61,6 @@ Configuration::load_settings(string filename)
/* ... */
}
-
/** Saves settings to rc file. Passing no parameter will save to the
* default location.
*/
@@ -74,7 +70,6 @@ Configuration::save_settings(string filename)
/* ... */
}
-
/** Applies the current loaded settings to whichever parts of the app
* need updating.
*/
@@ -84,7 +79,6 @@ Configuration::apply_settings()
/* ... */
}
-
uint32_t
Configuration::get_port_color(const PortModel* p)
{
@@ -104,6 +98,5 @@ Configuration::get_port_color(const PortModel* p)
return 0x666666FF;
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Configuration.hpp b/src/gui/Configuration.hpp
index be13bcc8..7959d91d 100644
--- a/src/gui/Configuration.hpp
+++ b/src/gui/Configuration.hpp
@@ -72,10 +72,8 @@ private:
uint32_t _value_port_color;
};
-
} // namespace GUI
} // namespace Ingen
#endif // INGEN_GUI_CONFIGURATION_HPP
-
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index a4bf3e43..e314d1aa 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -54,7 +54,6 @@ namespace Raul { class Deletable; }
namespace Ingen {
namespace GUI {
-
ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Dialog(cobject)
, _xml(xml)
@@ -68,7 +67,6 @@ ConnectWindow::ConnectWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
{
}
-
void
ConnectWindow::start(Ingen::Shared::World* world)
{
@@ -85,7 +83,6 @@ ConnectWindow::start(Ingen::Shared::World* world)
connect(true);
}
-
void
ConnectWindow::set_connected_to(SharedPtr<Shared::EngineInterface> engine)
{
@@ -128,7 +125,6 @@ ConnectWindow::set_connected_to(SharedPtr<Shared::EngineInterface> engine)
}
}
-
void
ConnectWindow::set_connecting_widget_states()
{
@@ -145,7 +141,6 @@ ConnectWindow::set_connecting_widget_states()
_port_spinbutton->set_sensitive(false);
}
-
/** Launch (if applicable) and connect to the Engine.
*
* This will create the EngineInterface and ClientInterface and initialize
@@ -264,7 +259,6 @@ ConnectWindow::connect(bool existing)
}
}
-
void
ConnectWindow::disconnect()
{
@@ -285,21 +279,18 @@ ConnectWindow::disconnect()
_disconnect_button->set_sensitive(false);
}
-
void
ConnectWindow::activate()
{
App::instance().engine()->activate();
}
-
void
ConnectWindow::deactivate()
{
App::instance().engine()->deactivate();
}
-
void
ConnectWindow::on_show()
{
@@ -312,7 +303,6 @@ ConnectWindow::on_show()
Gtk::Dialog::on_show();
}
-
void
ConnectWindow::load_widgets()
{
@@ -346,7 +336,6 @@ ConnectWindow::load_widgets()
server_toggled();
}
-
void
ConnectWindow::on_hide()
{
@@ -355,7 +344,6 @@ ConnectWindow::on_hide()
quit();
}
-
void
ConnectWindow::quit_clicked()
{
@@ -363,7 +351,6 @@ ConnectWindow::quit_clicked()
_quit_flag = true;
}
-
void
ConnectWindow::server_toggled()
{
@@ -372,7 +359,6 @@ ConnectWindow::server_toggled()
_mode = CONNECT_REMOTE;
}
-
void
ConnectWindow::launch_toggled()
{
@@ -381,7 +367,6 @@ ConnectWindow::launch_toggled()
_mode = LAUNCH_REMOTE;
}
-
void
ConnectWindow::internal_toggled()
{
@@ -390,7 +375,6 @@ ConnectWindow::internal_toggled()
_mode = INTERNAL;
}
-
bool
ConnectWindow::gtk_callback()
{
@@ -489,7 +473,6 @@ ConnectWindow::gtk_callback()
}
}
-
void
ConnectWindow::quit()
{
@@ -497,6 +480,5 @@ ConnectWindow::quit()
Gtk::Main::quit();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index af75a53c..e7c79fa1 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -39,7 +39,6 @@ namespace GUI {
class App;
-
/** The initially visible "Connect to engine" window.
*
* This handles actually connecting to the engine and making sure everything
@@ -105,7 +104,6 @@ private:
Gtk::Button* _quit_button;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Connection.cpp b/src/gui/Connection.cpp
index a319bbfa..9ff057eb 100644
--- a/src/gui/Connection.cpp
+++ b/src/gui/Connection.cpp
@@ -37,6 +37,5 @@ Connection::Connection(boost::shared_ptr<FlowCanvas::Canvas> canvas,
_bpath.property_dash() = src_port->dash();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp
index 4b899ac6..15af862a 100644
--- a/src/gui/Connection.hpp
+++ b/src/gui/Connection.hpp
@@ -30,7 +30,6 @@ using Client::ConnectionModel;
namespace GUI {
-
/** A Connection in a Patch.
*
* \ingroup GUI
@@ -50,7 +49,6 @@ private:
SharedPtr<ConnectionModel> _connection_model;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 236cb92a..24ab7cc2 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -32,7 +32,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Gtk::HBox(cobject)
, _callback_enabled(true)
@@ -42,14 +41,12 @@ ControlPanel::ControlPanel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
show_all();
}
-
ControlPanel::~ControlPanel()
{
for (vector<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i)
delete (*i);
}
-
void
ControlPanel::init(SharedPtr<NodeModel> node, uint32_t poly)
{
@@ -63,7 +60,6 @@ ControlPanel::init(SharedPtr<NodeModel> node, uint32_t poly)
_callback_enabled = true;
}
-
Control*
ControlPanel::find_port(const Path& path) const
{
@@ -74,7 +70,6 @@ ControlPanel::find_port(const Path& path) const
return NULL;
}
-
/** Add a control to the panel for the given port.
*/
void
@@ -131,7 +126,6 @@ ControlPanel::add_port(SharedPtr<PortModel> pm)
_ideal_size.second = controls_size.height;
}
-
/** Remove the control for the given port.
*/
void
@@ -149,7 +143,6 @@ ControlPanel::remove_port(const Path& path)
}
}
-
/** Callback for Controls to notify this of a change.
*/
void
@@ -163,6 +156,5 @@ ControlPanel::value_changed_atom(SharedPtr<PortModel> port, const Raul::Atom& va
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp
index a5d87dd1..a7ad9e4e 100644
--- a/src/gui/ControlPanel.hpp
+++ b/src/gui/ControlPanel.hpp
@@ -39,7 +39,6 @@ using namespace Ingen::Client;
namespace GUI {
-
/** A group of controls for a node (or patch).
*
* Used by both NodeControlWindow and the main window (for patch controls).
@@ -81,7 +80,6 @@ private:
Gtk::VBox* _control_box;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Controls.cpp b/src/gui/Controls.cpp
index ed16350e..07e9da2c 100644
--- a/src/gui/Controls.cpp
+++ b/src/gui/Controls.cpp
@@ -36,7 +36,6 @@ namespace Ingen {
using namespace Client;
namespace GUI {
-
// ////////////////////// Control ///////////////////////////////// //
Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
@@ -53,7 +52,6 @@ Control::Control(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>&
sigc::mem_fun(this, &Control::menu_properties));
}
-
Control::~Control()
{
_enable_signal = false;
@@ -61,7 +59,6 @@ Control::~Control()
_port_model.reset();
}
-
void
Control::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -81,7 +78,6 @@ Control::init(ControlPanel* panel, SharedPtr<PortModel> pm)
set_label(pm->symbol().c_str());
}
-
void
Control::enable()
{
@@ -90,7 +86,6 @@ Control::enable()
i->get_widget()->set_sensitive(true);
}
-
void
Control::disable()
{
@@ -99,7 +94,6 @@ Control::disable()
i->get_widget()->set_sensitive(false);
}
-
void
Control::set_label(const string& name)
{
@@ -107,7 +101,6 @@ Control::set_label(const string& name)
_name_label->set_markup(name_markup);
}
-
void
Control::menu_properties()
{
@@ -118,10 +111,8 @@ Control::menu_properties()
window->present(_port_model);
}
-
// ////////////////// SliderControl ////////////////////// //
-
SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Control(cobject, xml)
, _enabled(true)
@@ -131,7 +122,6 @@ SliderControl::SliderControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
xml->get_widget("control_strip_spinner", _value_spinner);
}
-
void
SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -181,7 +171,6 @@ SliderControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
show_all();
}
-
bool
SliderControl::clicked(GdkEventButton* ev)
{
@@ -193,7 +182,6 @@ SliderControl::clicked(GdkEventButton* ev)
}
}
-
void
SliderControl::set_value(const Atom& atom)
{
@@ -220,7 +208,6 @@ SliderControl::set_value(const Atom& atom)
}
}
-
void
SliderControl::port_property_changed(const URI& key, const Atom& value)
{
@@ -235,7 +222,6 @@ SliderControl::port_property_changed(const URI& key, const Atom& value)
_enable_signal = true;
}
-
void
SliderControl::set_range(float min, float max)
{
@@ -245,7 +231,6 @@ SliderControl::set_range(float min, float max)
_slider->set_range(min, max);
}
-
void
SliderControl::update_value_from_slider()
{
@@ -270,7 +255,6 @@ SliderControl::update_value_from_slider()
}
}
-
void
SliderControl::update_value_from_spinner()
{
@@ -286,7 +270,6 @@ SliderControl::update_value_from_spinner()
}
}
-
/** Callback for when slider is grabbed so we can ignore set_control
* events for this port (and avoid nasty feedback issues).
*/
@@ -302,10 +285,8 @@ SliderControl::slider_pressed(GdkEvent* ev)
return false;
}
-
// ///////////// ToggleControl ////////////// //
-
ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Control(cobject, xml)
{
@@ -313,7 +294,6 @@ ToggleControl::ToggleControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
xml->get_widget("toggle_control_check", _checkbutton);
}
-
void
ToggleControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -331,7 +311,6 @@ ToggleControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
show_all();
}
-
void
ToggleControl::set_value(const Atom& val)
{
@@ -355,7 +334,6 @@ ToggleControl::set_value(const Atom& val)
_enable_signal = true;
}
-
void
ToggleControl::toggled()
{
@@ -365,10 +343,8 @@ ToggleControl::toggled()
}
}
-
// ///////////// StringControl ////////////// //
-
StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Control(cobject, xml)
{
@@ -376,7 +352,6 @@ StringControl::StringControl(BaseObjectType* cobject, const Glib::RefPtr<Gnome::
xml->get_widget("string_control_entry", _entry);
}
-
void
StringControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
{
@@ -394,7 +369,6 @@ StringControl::init(ControlPanel* panel, SharedPtr<PortModel> pm)
show_all();
}
-
void
StringControl::set_value(const Atom& val)
{
@@ -406,7 +380,6 @@ StringControl::set_value(const Atom& val)
_enable_signal = true;
}
-
void
StringControl::activated()
{
@@ -415,6 +388,5 @@ StringControl::activated()
Raul::Atom(_entry->get_text().c_str()));
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp
index 1818cc75..e9e6ab56 100644
--- a/src/gui/Controls.hpp
+++ b/src/gui/Controls.hpp
@@ -32,7 +32,6 @@ namespace GUI {
class ControlPanel;
-
/** A group of controls (for a single Port) in a ControlPanel.
*
* \ingroup GUI
@@ -67,7 +66,6 @@ protected:
Gtk::Label* _name_label;
};
-
/** A slider for a continuous control.
*
* \ingroup GUI
@@ -100,7 +98,6 @@ private:
Gtk::HScale* _slider;
};
-
/** A radio button for toggle controls.
*
* \ingroup GUI
@@ -119,7 +116,6 @@ private:
Gtk::CheckButton* _checkbutton;
};
-
/** A text entry for string controls.
*
* \ingroup GUI
@@ -138,7 +134,6 @@ private:
Gtk::Entry* _entry;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/GladeFactory.cpp b/src/gui/GladeFactory.cpp
index 6036d359..7a147383 100644
--- a/src/gui/GladeFactory.cpp
+++ b/src/gui/GladeFactory.cpp
@@ -27,7 +27,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
Glib::ustring GladeFactory::glade_filename = "";
inline static bool
@@ -63,7 +62,6 @@ GladeFactory::find_glade_file()
throw std::runtime_error("Unable to find glade file");
}
-
Glib::RefPtr<Gnome::Glade::Xml>
GladeFactory::new_glade_reference(const string& toplevel_widget)
{
@@ -81,6 +79,5 @@ GladeFactory::new_glade_reference(const string& toplevel_widget)
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/GladeFactory.hpp b/src/gui/GladeFactory.hpp
index f7a0dd8a..b3aec640 100644
--- a/src/gui/GladeFactory.hpp
+++ b/src/gui/GladeFactory.hpp
@@ -24,7 +24,6 @@
namespace Ingen {
namespace GUI {
-
/** Creates glade references, so various objects can create widgets.
* Purely static.
*
@@ -40,7 +39,6 @@ private:
static Glib::ustring glade_filename;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/LoadPatchWindow.cpp b/src/gui/LoadPatchWindow.cpp
index c4229f61..7d1f62bb 100644
--- a/src/gui/LoadPatchWindow.cpp
+++ b/src/gui/LoadPatchWindow.cpp
@@ -40,7 +40,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Gtk::FileChooserDialog(cobject)
, _merge_ports(false)
@@ -95,7 +94,6 @@ LoadPatchWindow::LoadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gno
}
}
-
void
LoadPatchWindow::present(SharedPtr<PatchModel> patch, bool import, GraphObject::Properties data)
{
@@ -110,7 +108,6 @@ LoadPatchWindow::present(SharedPtr<PatchModel> patch, bool import, GraphObject::
Gtk::Window::present();
}
-
/** Sets the patch model for this window and initializes everything.
*
* This function MUST be called before using the window in any way!
@@ -124,7 +121,6 @@ LoadPatchWindow::set_patch(SharedPtr<PatchModel> patch)
_poly_spinbutton->set_value(patch->internal_poly());
}
-
void
LoadPatchWindow::on_show()
{
@@ -133,21 +129,18 @@ LoadPatchWindow::on_show()
Gtk::FileChooserDialog::on_show();
}
-
void
LoadPatchWindow::merge_ports_selected()
{
_merge_ports = true;
}
-
void
LoadPatchWindow::insert_ports_selected()
{
_merge_ports = false;
}
-
void
LoadPatchWindow::ok_clicked()
{
@@ -202,7 +195,6 @@ LoadPatchWindow::ok_clicked()
hide();
}
-
void
LoadPatchWindow::cancel_clicked()
{
@@ -210,7 +202,6 @@ LoadPatchWindow::cancel_clicked()
hide();
}
-
Raul::Symbol
LoadPatchWindow::symbol_from_filename(const Glib::ustring& filename)
{
@@ -219,7 +210,6 @@ LoadPatchWindow::symbol_from_filename(const Glib::ustring& filename)
return Raul::Symbol::symbolify(symbol_str);
}
-
Raul::Symbol
LoadPatchWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
{
@@ -235,7 +225,6 @@ LoadPatchWindow::avoid_symbol_clash(const Raul::Symbol& symbol)
}
}
-
void
LoadPatchWindow::selection_changed()
{
@@ -252,6 +241,5 @@ LoadPatchWindow::selection_changed()
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp
index 51a21332..0483d817 100644
--- a/src/gui/LoadPatchWindow.hpp
+++ b/src/gui/LoadPatchWindow.hpp
@@ -31,7 +31,6 @@ using Ingen::Client::PatchModel;
namespace GUI {
-
/** 'Add Subpatch' window.
*
* Loaded by glade as a derived object.
@@ -80,7 +79,6 @@ private:
bool _merge_ports;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index 080520c4..8008ed87 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -106,7 +106,6 @@ LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<G
//m_add_button->grab_default();
}
-
void
LoadPluginWindow::present(SharedPtr<PatchModel> patch, GraphObject::Properties data)
{
@@ -115,7 +114,6 @@ LoadPluginWindow::present(SharedPtr<PatchModel> patch, GraphObject::Properties d
Gtk::Window::present();
}
-
/** Called every time the user types into the name input box.
* Used to display warning messages, and enable/disable the OK button.
*/
@@ -137,7 +135,6 @@ LoadPluginWindow::name_changed()
}
}
-
#ifdef HAVE_NEW_GTKMM
void
LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton* event)
@@ -146,7 +143,6 @@ LoadPluginWindow::name_cleared(Gtk::EntryIconPosition pos, const GdkEventButton*
}
#endif // HAVE_NEW_GTKMM
-
/** Sets the patch controller for this window and initializes everything.
*
* This function MUST be called before using the window in any way!
@@ -167,7 +163,6 @@ LoadPluginWindow::set_patch(SharedPtr<PatchModel> patch)
_polyphonic_checkbutton->property_sensitive() = true;*/
}
-
/** Populates the plugin list on the first show.
*
* This is done here instead of construction time as the list population is
@@ -192,7 +187,6 @@ LoadPluginWindow::on_show()
Gtk::Window::on_show();
}
-
void
LoadPluginWindow::set_plugins(SharedPtr<const ClientStore::Plugins> m)
{
@@ -210,7 +204,6 @@ LoadPluginWindow::set_plugins(SharedPtr<const ClientStore::Plugins> m)
_plugins_treeview->columns_autosize();
}
-
void
LoadPluginWindow::new_plugin(SharedPtr<PluginModel> pm)
{
@@ -220,7 +213,6 @@ LoadPluginWindow::new_plugin(SharedPtr<PluginModel> pm)
_refresh_list = true;
}
-
void
LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr<PluginModel> plugin)
{
@@ -248,7 +240,6 @@ LoadPluginWindow::set_row(Gtk::TreeModel::Row& row, SharedPtr<PluginModel> plugi
row[_plugins_columns._col_plugin] = plugin;
}
-
void
LoadPluginWindow::add_plugin(SharedPtr<PluginModel> plugin)
{
@@ -267,18 +258,14 @@ LoadPluginWindow::add_plugin(SharedPtr<PluginModel> plugin)
plugin->uri()));
}
-
-
///// Event Handlers //////
-
void
LoadPluginWindow::plugin_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col)
{
add_clicked();
}
-
void
LoadPluginWindow::plugin_selection_changed()
{
@@ -308,7 +295,6 @@ LoadPluginWindow::plugin_selection_changed()
}
}
-
/** Generate an automatic name for this Node.
*
* Offset is an offset of the number that will be appended to the plugin's
@@ -325,7 +311,6 @@ LoadPluginWindow::generate_module_name(SharedPtr<PluginModel> plugin, int offset
return ss.str();
}
-
void
LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
{
@@ -365,7 +350,6 @@ LoadPluginWindow::load_plugin(const Gtk::TreeModel::iterator& iter)
}
}
-
void
LoadPluginWindow::add_clicked()
{
@@ -373,7 +357,6 @@ LoadPluginWindow::add_clicked()
sigc::mem_fun(*this, &LoadPluginWindow::load_plugin));
}
-
void
LoadPluginWindow::filter_changed()
{
@@ -429,7 +412,6 @@ LoadPluginWindow::filter_changed()
}
}
-
bool
LoadPluginWindow::on_key_press_event(GdkEventKey* event)
{
@@ -441,7 +423,6 @@ LoadPluginWindow::on_key_press_event(GdkEventKey* event)
}
}
-
void
LoadPluginWindow::plugin_property_changed(const URI& plugin,
const URI& predicate,
@@ -455,7 +436,6 @@ LoadPluginWindow::plugin_property_changed(const URI& plugin,
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index f04ed903..344a6c1f 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -39,7 +39,6 @@ using Ingen::Client::PatchModel;
namespace GUI {
-
/** 'Load Plugin' window.
*
* Loaded by glade as a derived object.
@@ -144,7 +143,6 @@ private:
Gtk::Entry* _search_entry;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp
index 809bea42..4e73690a 100644
--- a/src/gui/LoadRemotePatchWindow.cpp
+++ b/src/gui/LoadRemotePatchWindow.cpp
@@ -33,7 +33,6 @@ using namespace std;
namespace Ingen {
namespace GUI {
-
LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Dialog(cobject)
{
@@ -56,7 +55,6 @@ LoadRemotePatchWindow::LoadRemotePatchWindow(BaseObjectType* cobject, const Glib
_uri_entry->signal_changed().connect(sigc::mem_fun(this, &LoadRemotePatchWindow::uri_changed));
}
-
void
LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, GraphObject::Properties data)
{
@@ -90,7 +88,6 @@ LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, GraphObject::Propert
#endif
}
-
/** Sets the patch controller for this window and initializes everything.
*
* This function MUST be called before using the window in any way!
@@ -101,21 +98,18 @@ LoadRemotePatchWindow::set_patch(SharedPtr<PatchModel> patch)
_patch = patch;
}
-
void
LoadRemotePatchWindow::uri_changed()
{
_open_button->property_sensitive() = (_uri_entry->get_text().length() > 0);
}
-
void
LoadRemotePatchWindow::patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* col)
{
open_clicked();
}
-
void
LoadRemotePatchWindow::patch_selected()
{
@@ -127,7 +121,6 @@ LoadRemotePatchWindow::patch_selected()
}
}
-
void
LoadRemotePatchWindow::open_clicked()
{
@@ -146,13 +139,11 @@ LoadRemotePatchWindow::open_clicked()
hide();
}
-
void
LoadRemotePatchWindow::cancel_clicked()
{
hide();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp
index 32ff32b6..a61cb48b 100644
--- a/src/gui/LoadRemotePatchWindow.hpp
+++ b/src/gui/LoadRemotePatchWindow.hpp
@@ -32,7 +32,6 @@ using Ingen::Client::PatchModel;
namespace GUI {
-
/** Columns for the remote patch list.
*
* \ingroup GUI
@@ -49,8 +48,6 @@ public:
Gtk::TreeModelColumn<Glib::ustring> _col_uri;
};
-
-
/* Load remote patch ("import location") dialog.
*
* \ingroup GUI
@@ -85,7 +82,6 @@ private:
Gtk::Button* _cancel_button;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp
index 1fb46c35..72d71aca 100644
--- a/src/gui/MessagesWindow.cpp
+++ b/src/gui/MessagesWindow.cpp
@@ -22,7 +22,6 @@ namespace Ingen {
namespace GUI {
using std::string;
-
MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
: Window(cobject)
{
@@ -34,7 +33,6 @@ MessagesWindow::MessagesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome
_close_button->signal_clicked().connect(sigc::mem_fun(this, &Window::hide));
}
-
void
MessagesWindow::post(const string& msg)
{
@@ -46,7 +44,6 @@ MessagesWindow::post(const string& msg)
_clear_button->set_sensitive(true);
}
-
void
MessagesWindow::clear_clicked()
{
@@ -55,6 +52,5 @@ MessagesWindow::clear_clicked()
_clear_button->set_sensitive(false);
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index f91b5f88..90b7b5b4 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -26,7 +26,6 @@
namespace Ingen {
namespace GUI {
-
/** Messages Window.
*
* Loaded by libglade as a derived object.
@@ -49,7 +48,6 @@ private:
Gtk::Button* _close_button;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NewSubpatchWindow.cpp b/src/gui/NewSubpatchWindow.cpp
index b91bf306..60134dc5 100644
--- a/src/gui/NewSubpatchWindow.cpp
+++ b/src/gui/NewSubpatchWindow.cpp
@@ -29,7 +29,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
NewSubpatchWindow::NewSubpatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Window(cobject)
{
@@ -64,7 +63,6 @@ NewSubpatchWindow::set_patch(SharedPtr<PatchModel> patch)
_patch = patch;
}
-
/** Called every time the user types into the name input box.
* Used to display warning messages, and enable/disable the OK button.
*/
@@ -88,7 +86,6 @@ NewSubpatchWindow::name_changed()
}
}
-
void
NewSubpatchWindow::ok_clicked()
{
@@ -111,13 +108,11 @@ NewSubpatchWindow::ok_clicked()
hide();
}
-
void
NewSubpatchWindow::cancel_clicked()
{
hide();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp
index 2375d5d9..ee59ded2 100644
--- a/src/gui/NewSubpatchWindow.hpp
+++ b/src/gui/NewSubpatchWindow.hpp
@@ -33,7 +33,6 @@ using Ingen::Client::PatchModel;
namespace GUI {
-
/** 'New Subpatch' window.
*
* Loaded by glade as a derived object.
@@ -64,7 +63,6 @@ private:
Gtk::Button* _cancel_button;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index 64c8371a..99cd948a 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -31,7 +31,6 @@ using namespace std;
namespace Ingen {
namespace GUI {
-
/** Create a node control window and load a new ControlPanel for it.
*/
NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, uint32_t poly)
@@ -61,7 +60,6 @@ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, uint32_t poly)
_callback_enabled = true;
}
-
/** Create a node control window and with an existing ControlPanel.
*/
NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, ControlPanel* panel)
@@ -83,13 +81,11 @@ NodeControlWindow::NodeControlWindow(SharedPtr<NodeModel> node, ControlPanel* pa
_callback_enabled = true;
}
-
NodeControlWindow::~NodeControlWindow()
{
delete _control_panel;
}
-
void
NodeControlWindow::resize()
{
@@ -105,7 +101,6 @@ NodeControlWindow::resize()
Gtk::Window::resize(width, height);
}
-
void
NodeControlWindow::on_show()
{
@@ -121,7 +116,6 @@ NodeControlWindow::on_show()
Gtk::Window::on_show();
}
-
void
NodeControlWindow::on_hide()
{
@@ -130,6 +124,5 @@ NodeControlWindow::on_hide()
Gtk::Window::on_hide();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp
index 27172a6d..90cf65f6 100644
--- a/src/gui/NodeControlWindow.hpp
+++ b/src/gui/NodeControlWindow.hpp
@@ -35,7 +35,6 @@ namespace GUI {
class ControlGroup;
class ControlPanel;
-
/** Window with controls (sliders) for all control-rate ports on a Node.
*
* \ingroup GUI
@@ -67,7 +66,6 @@ private:
int _y;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index 3eb361e3..8bedfb2d 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -31,7 +31,6 @@ using namespace Ingen::Client;
namespace Ingen {
namespace GUI {
-
NodeMenu::NodeMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: ObjectMenu(cobject, xml)
, _controls_menuitem(NULL)
@@ -59,7 +58,6 @@ NodeMenu::NodeMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml
insert(*_controls_menuitem, 0);
}
-
void
NodeMenu::init(SharedPtr<NodeModel> node)
{
@@ -146,14 +144,12 @@ NodeMenu::init(SharedPtr<NodeModel> node)
_enable_signal = true;
}
-
void
NodeMenu::on_menu_embed_gui()
{
signal_embed_gui.emit(_embed_gui_menuitem->get_active());
}
-
void
NodeMenu::on_menu_randomize()
{
@@ -173,14 +169,12 @@ NodeMenu::on_menu_randomize()
App::instance().engine()->bundle_end();
}
-
void
NodeMenu::on_menu_disconnect()
{
App::instance().engine()->disconnect_all(_object->parent()->path(), _object->path());
}
-
void
NodeMenu::on_preset_activated(const std::string& uri)
{
@@ -226,7 +220,6 @@ NodeMenu::on_preset_activated(const std::string& uri)
#endif
}
-
bool
NodeMenu::on_preset_clicked(const std::string& uri, GdkEventButton* ev)
{
@@ -234,7 +227,6 @@ NodeMenu::on_preset_clicked(const std::string& uri, GdkEventButton* ev)
return false;
}
-
bool
NodeMenu::has_control_inputs()
{
@@ -246,21 +238,18 @@ NodeMenu::has_control_inputs()
return false;
}
-
void
NodeMenu::enable_controls_menuitem()
{
_controls_menuitem->property_sensitive() = true;
}
-
void
NodeMenu::disable_controls_menuitem()
{
_controls_menuitem->property_sensitive() = false;
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index cfdd84ef..ad7546ce 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -29,7 +29,6 @@ using Ingen::Client::NodeModel;
namespace Ingen {
namespace GUI {
-
/** Menu for a Node.
*
* \ingroup GUI
@@ -63,7 +62,6 @@ protected:
Gtk::Menu* _presets_menu;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index f85ad2f4..5c90704f 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -44,7 +44,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeModel> node)
: FlowCanvas::Module(canvas, node->path().symbol(), 0, 0, true, canvas->show_port_names())
, _node(node)
@@ -68,14 +67,12 @@ NodeModule::NodeModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<NodeMode
}
}
-
NodeModule::~NodeModule()
{
NodeControlWindow* win = App::instance().window_factory()->control_window(_node);
delete win; // Will be removed from window factory via signal
}
-
void
NodeModule::create_menu()
{
@@ -89,7 +86,6 @@ NodeModule::create_menu()
set_menu(_menu);
}
-
boost::shared_ptr<NodeModule>
NodeModule::create(boost::shared_ptr<PatchCanvas> canvas,
SharedPtr<NodeModel> node,
@@ -121,7 +117,6 @@ NodeModule::create(boost::shared_ptr<PatchCanvas> canvas,
return ret;
}
-
void
NodeModule::show_human_names(bool b)
{
@@ -158,7 +153,6 @@ NodeModule::show_human_names(bool b)
resize();
}
-
void
NodeModule::value_changed(uint32_t index, const Atom& value)
{
@@ -180,7 +174,6 @@ NodeModule::value_changed(uint32_t index, const Atom& value)
}
}
-
void
NodeModule::plugin_changed()
{
@@ -188,7 +181,6 @@ NodeModule::plugin_changed()
PtrCast<Ingen::GUI::Port>(*p)->update_metadata();
}
-
void
NodeModule::embed_gui(bool embed)
{
@@ -249,7 +241,6 @@ NodeModule::embed_gui(bool embed)
resize();
}
-
void
NodeModule::rename()
{
@@ -259,7 +250,6 @@ NodeModule::rename()
}
}
-
void
NodeModule::add_port(SharedPtr<PortModel> port, bool resize_to_fit)
{
@@ -273,7 +263,6 @@ NodeModule::add_port(SharedPtr<PortModel> port, bool resize_to_fit)
resize();
}
-
boost::shared_ptr<Port>
NodeModule::port(boost::shared_ptr<PortModel> model)
{
@@ -285,7 +274,6 @@ NodeModule::port(boost::shared_ptr<PortModel> model)
return boost::shared_ptr<Port>();
}
-
void
NodeModule::remove_port(SharedPtr<PortModel> model)
{
@@ -298,7 +286,6 @@ NodeModule::remove_port(SharedPtr<PortModel> model)
}
}
-
bool
NodeModule::popup_gui()
{
@@ -338,7 +325,6 @@ NodeModule::popup_gui()
return false;
}
-
void
NodeModule::on_gui_window_close()
{
@@ -348,7 +334,6 @@ NodeModule::on_gui_window_close()
_gui_widget = NULL;
}
-
void
NodeModule::set_control_values()
{
@@ -361,14 +346,12 @@ NodeModule::set_control_values()
}
}
-
void
NodeModule::show_control_window()
{
App::instance().window_factory()->present_controls(_node);
}
-
void
NodeModule::on_double_click(GdkEventButton* ev)
{
@@ -376,7 +359,6 @@ NodeModule::on_double_click(GdkEventButton* ev)
show_control_window();
}
-
void
NodeModule::store_location()
{
@@ -401,7 +383,6 @@ NodeModule::store_location()
}
}
-
void
NodeModule::property_changed(const URI& key, const Atom& value)
{
@@ -435,7 +416,6 @@ NodeModule::property_changed(const URI& key, const Atom& value)
}
}
-
void
NodeModule::set_selected(bool b)
{
@@ -460,6 +440,5 @@ NodeModule::set_selected(bool b)
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp
index 0aa1e43e..a382a280 100644
--- a/src/gui/NodeModule.hpp
+++ b/src/gui/NodeModule.hpp
@@ -39,7 +39,6 @@ class PatchCanvas;
class Port;
class NodeMenu;
-
/** A module in a patch.
*
* This base class is extended for various types of modules.
@@ -94,7 +93,6 @@ protected:
Gtk::Window* _gui_window; ///< iff popped up
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index e821e846..f12334ac 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -29,7 +29,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Gtk::Menu(cobject)
, _enable_signal(false)
@@ -48,7 +47,6 @@ ObjectMenu::ObjectMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade:
xml->get_widget("object_properties_menuitem", _properties_menuitem);
}
-
void
ObjectMenu::init(SharedPtr<ObjectModel> object)
{
@@ -88,7 +86,6 @@ ObjectMenu::init(SharedPtr<ObjectModel> object)
_enable_signal = true;
}
-
void
ObjectMenu::on_menu_learn()
{
@@ -97,7 +94,6 @@ ObjectMenu::on_menu_learn()
App::instance().uris().wildcard);
}
-
void
ObjectMenu::on_menu_unlearn()
{
@@ -108,7 +104,6 @@ ObjectMenu::on_menu_unlearn()
App::instance().engine()->delta(_object->path(), remove, Resource::Properties());
}
-
void
ObjectMenu::on_menu_polyphonic()
{
@@ -118,7 +113,6 @@ ObjectMenu::on_menu_polyphonic()
bool(_polyphonic_menuitem->get_active()));
}
-
void
ObjectMenu::property_changed(const URI& predicate, const Atom& value)
{
@@ -129,21 +123,18 @@ ObjectMenu::property_changed(const URI& predicate, const Atom& value)
_enable_signal = true;
}
-
void
ObjectMenu::on_menu_destroy()
{
App::instance().engine()->del(_object->path());
}
-
void
ObjectMenu::on_menu_properties()
{
App::instance().window_factory()->present_properties(_object);
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index fbcc81bb..4af8c94d 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -64,7 +64,6 @@ protected:
Gtk::MenuItem* _properties_menuitem;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp
index b0e8491d..d9fccc0c 100644
--- a/src/gui/PatchCanvas.hpp
+++ b/src/gui/PatchCanvas.hpp
@@ -49,7 +49,6 @@ namespace GUI {
class NodeModule;
-
/** Patch canvas widget.
*
* \ingroup GUI
@@ -172,7 +171,6 @@ private:
Gtk::CheckMenuItem* _menu_edit;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp
index ba243b75..8427d49d 100644
--- a/src/gui/PatchPortModule.cpp
+++ b/src/gui/PatchPortModule.cpp
@@ -38,7 +38,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortModel> model)
: FlowCanvas::Module(canvas, "", 0, 0, false) // FIXME: coords?
, _model(model)
@@ -53,7 +52,6 @@ PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, SharedPt
model->signal_property.connect(sigc::mem_fun(this, &PatchPortModule::property_changed));
}
-
boost::shared_ptr<PatchPortModule>
PatchPortModule::create(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortModel> model, bool human)
{
@@ -72,7 +70,6 @@ PatchPortModule::create(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PortMod
return ret;
}
-
void
PatchPortModule::create_menu()
{
@@ -83,7 +80,6 @@ PatchPortModule::create_menu()
set_menu(_menu);
}
-
void
PatchPortModule::store_location()
{
@@ -104,7 +100,6 @@ PatchPortModule::store_location()
}
}
-
void
PatchPortModule::show_human_names(bool b)
{
@@ -118,7 +113,6 @@ PatchPortModule::show_human_names(bool b)
resize();
}
-
void
PatchPortModule::set_name(const std::string& n)
{
@@ -126,7 +120,6 @@ PatchPortModule::set_name(const std::string& n)
Module::resize();
}
-
void
PatchPortModule::property_changed(const URI& key, const Atom& value)
{
@@ -164,7 +157,6 @@ PatchPortModule::property_changed(const URI& key, const Atom& value)
}
}
-
void
PatchPortModule::set_selected(bool b)
{
@@ -176,7 +168,5 @@ PatchPortModule::set_selected(bool b)
}
}
-
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp
index 19b400d1..160289ae 100644
--- a/src/gui/PatchPortModule.hpp
+++ b/src/gui/PatchPortModule.hpp
@@ -40,7 +40,6 @@ class PatchCanvas;
class Port;
class PortMenu;
-
/** A "module" to represent a patch's port on its own canvas.
*
* Translation: This is the nameless single port pseudo module thingy.
@@ -76,7 +75,6 @@ protected:
PortMenu* _menu;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp
index b1462459..637c41f6 100644
--- a/src/gui/PatchTreeWindow.cpp
+++ b/src/gui/PatchTreeWindow.cpp
@@ -34,7 +34,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Window(cobject)
@@ -68,14 +67,12 @@ PatchTreeWindow::PatchTreeWindow(BaseObjectType* cobject,
_patches_treeview->columns_autosize();
}
-
void
PatchTreeWindow::init(ClientStore& store)
{
store.signal_new_object.connect(sigc::mem_fun(this, &PatchTreeWindow::new_object));
}
-
void
PatchTreeWindow::new_object(SharedPtr<ObjectModel> object)
{
@@ -84,7 +81,6 @@ PatchTreeWindow::new_object(SharedPtr<ObjectModel> object)
add_patch(patch);
}
-
void
PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm)
{
@@ -126,7 +122,6 @@ PatchTreeWindow::add_patch(SharedPtr<PatchModel> pm)
pm));
}
-
void
PatchTreeWindow::remove_patch(SharedPtr<PatchModel> pm)
{
@@ -135,7 +130,6 @@ PatchTreeWindow::remove_patch(SharedPtr<PatchModel> pm)
_patch_treestore->erase(i);
}
-
Gtk::TreeModel::iterator
PatchTreeWindow::find_patch(
Gtk::TreeModel::Children root,
@@ -154,7 +148,6 @@ PatchTreeWindow::find_patch(
return root.end();
}
-
/** Show the context menu for the selected patch in the patches treeview.
*/
void
@@ -169,7 +162,6 @@ PatchTreeWindow::show_patch_menu(GdkEventButton* ev)
}
}
-
void
PatchTreeWindow::event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::TreeView::Column* col)
{
@@ -180,7 +172,6 @@ PatchTreeWindow::event_patch_activated(const Gtk::TreeModel::Path& path, Gtk::Tr
App::instance().window_factory()->present_patch(pm);
}
-
void
PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str)
{
@@ -196,7 +187,6 @@ PatchTreeWindow::event_patch_enabled_toggled(const Glib::ustring& path_str)
App::instance().uris().ingen_enabled, (bool)!pm->enabled());
}
-
void
PatchTreeWindow::patch_property_changed(const URI& key, const Atom& value,
SharedPtr<PatchModel> patch)
@@ -215,7 +205,6 @@ PatchTreeWindow::patch_property_changed(const URI& key, const Atom& value,
_enable_signal = true;
}
-
void
PatchTreeWindow::patch_moved(SharedPtr<PatchModel> patch)
{
@@ -234,6 +223,5 @@ PatchTreeWindow::patch_moved(SharedPtr<PatchModel> patch)
_enable_signal = true;
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp
index 5b005e40..9f2c480e 100644
--- a/src/gui/PatchTreeWindow.hpp
+++ b/src/gui/PatchTreeWindow.hpp
@@ -33,7 +33,6 @@ namespace GUI {
class PatchWindow;
class PatchTreeView;
-
/** Window with a TreeView of all loaded patches.
*
* \ingroup GUI
@@ -82,7 +81,6 @@ protected:
Glib::RefPtr<Gtk::TreeSelection> _patch_tree_selection;
};
-
/** Derived TreeView class to support context menus for patches */
class PatchTreeView : public Gtk::TreeView
{
@@ -108,7 +106,6 @@ private:
}; // struct PatchTreeView
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchView.cpp b/src/gui/PatchView.cpp
index 5fd643a2..3048a46b 100644
--- a/src/gui/PatchView.cpp
+++ b/src/gui/PatchView.cpp
@@ -36,7 +36,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Gtk::Box(cobject)
, _breadcrumb_container(NULL)
@@ -61,7 +60,6 @@ PatchView::PatchView(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::X
}
-
void
PatchView::set_patch(SharedPtr<PatchModel> patch)
{
@@ -112,7 +110,6 @@ PatchView::set_patch(SharedPtr<PatchModel> patch)
_canvas->grab_focus();
}
-
SharedPtr<PatchView>
PatchView::create(SharedPtr<PatchModel> patch)
{
@@ -124,7 +121,6 @@ PatchView::create(SharedPtr<PatchModel> patch)
return SharedPtr<PatchView>(result);
}
-
void
PatchView::on_editable_sig(bool editable)
{
@@ -132,7 +128,6 @@ PatchView::on_editable_sig(bool editable)
_canvas->lock(!editable);
}
-
void
PatchView::editable_toggled()
{
@@ -140,7 +135,6 @@ PatchView::editable_toggled()
set_editable(editable);
}
-
void
PatchView::set_editable(bool editable)
{
@@ -148,7 +142,6 @@ PatchView::set_editable(bool editable)
_canvas->lock(!editable);
}
-
void
PatchView::canvas_item_entered(Gnome::Canvas::Item* item)
{
@@ -161,7 +154,6 @@ PatchView::canvas_item_entered(Gnome::Canvas::Item* item)
signal_object_entered.emit(p->model().get());
}
-
void
PatchView::canvas_item_left(Gnome::Canvas::Item* item)
{
@@ -176,7 +168,6 @@ PatchView::canvas_item_left(Gnome::Canvas::Item* item)
signal_object_left.emit(p->model().get());
}
-
void
PatchView::process_toggled()
{
@@ -188,7 +179,6 @@ PatchView::process_toggled()
(bool)_process_but->get_active());
}
-
void
PatchView::poly_changed()
{
@@ -197,14 +187,12 @@ PatchView::poly_changed()
_poly_spin->get_value_as_int());
}
-
void
PatchView::refresh_clicked()
{
App::instance().engine()->get(_patch->path());
}
-
void
PatchView::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
{
@@ -218,6 +206,5 @@ PatchView::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
_enable_signal = true;
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp
index 4bf11d46..a2b76c3c 100644
--- a/src/gui/PatchView.hpp
+++ b/src/gui/PatchView.hpp
@@ -47,7 +47,6 @@ class PatchCanvas;
class PatchDescriptionWindow;
class SubpatchModule;
-
/** The patch specific contents of a PatchWindow (ie the canvas and whatever else).
*
* \ingroup GUI
@@ -103,7 +102,6 @@ private:
bool _enable_signal;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchWindow.cpp b/src/gui/PatchWindow.cpp
index ca045f2f..a91b2961 100644
--- a/src/gui/PatchWindow.cpp
+++ b/src/gui/PatchWindow.cpp
@@ -172,7 +172,6 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
clipboard->signal_owner_change().connect(sigc::mem_fun(this, &PatchWindow::event_clipboard_changed));
}
-
PatchWindow::~PatchWindow()
{
// Prevents deletion
@@ -181,7 +180,6 @@ PatchWindow::~PatchWindow()
delete _breadcrumbs;
}
-
/** Set the patch controller from a Path (for use by eg. BreadCrumbs)
*/
void
@@ -197,7 +195,6 @@ PatchWindow::set_patch_from_path(const Path& path, SharedPtr<PatchView> view)
}
}
-
/** Sets the patch controller for this window and initializes everything.
*
* If @a view is NULL, a new view will be created.
@@ -236,7 +233,6 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view)
_viewport->remove();
_viewport->add(*_view.get());
-
if (_breadcrumbs->get_parent())
_breadcrumbs->get_parent()->remove(*_breadcrumbs);
@@ -274,7 +270,6 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view)
_enable_signal = true;
}
-
void
PatchWindow::patch_port_added(SharedPtr<PortModel> port)
{
@@ -283,7 +278,6 @@ PatchWindow::patch_port_added(SharedPtr<PortModel> port)
}
}
-
void
PatchWindow::patch_port_removed(SharedPtr<PortModel> port)
{
@@ -301,7 +295,6 @@ PatchWindow::patch_port_removed(SharedPtr<PortModel> port)
_menu_view_control_window->property_sensitive() = false;
}
-
void
PatchWindow::show_status(ObjectModel* model)
{
@@ -322,7 +315,6 @@ PatchWindow::show_status(ObjectModel* model)
}
}
-
void
PatchWindow::show_port_status(PortModel* port, const Raul::Atom& value)
{
@@ -347,28 +339,24 @@ PatchWindow::show_port_status(PortModel* port, const Raul::Atom& value)
_status_bar->push(msg.str(), STATUS_CONTEXT_HOVER);
}
-
void
PatchWindow::object_entered(ObjectModel* model)
{
show_status(model);
}
-
void
PatchWindow::object_left(ObjectModel* model)
{
_status_bar->pop(STATUS_CONTEXT_HOVER);
}
-
void
PatchWindow::editable_changed(bool editable)
{
_menu_edit_controls->set_active(editable);
}
-
void
PatchWindow::event_show_engine()
{
@@ -376,7 +364,6 @@ PatchWindow::event_show_engine()
App::instance().connect_window()->show();
}
-
void
PatchWindow::event_clipboard_changed(GdkEventOwnerChange* ev)
{
@@ -384,35 +371,30 @@ PatchWindow::event_clipboard_changed(GdkEventOwnerChange* ev)
_menu_paste->set_sensitive(clipboard->wait_is_text_available());
}
-
void
PatchWindow::event_show_controls()
{
App::instance().window_factory()->present_controls(_patch);
}
-
void
PatchWindow::event_show_properties()
{
App::instance().window_factory()->present_properties(_patch);
}
-
void
PatchWindow::event_import()
{
App::instance().window_factory()->present_load_patch(_patch);
}
-
void
PatchWindow::event_import_location()
{
App::instance().window_factory()->present_load_remote_patch(_patch);
}
-
void
PatchWindow::event_save()
{
@@ -428,7 +410,6 @@ PatchWindow::event_save()
}
}
-
void
PatchWindow::event_save_as()
{
@@ -526,14 +507,12 @@ more files and/or directories, recursively. Existing files will be overwritten.
}
}
-
void
PatchWindow::event_upload()
{
App::instance().window_factory()->present_upload_patch(_patch);
}
-
void
PatchWindow::event_draw()
{
@@ -568,7 +547,6 @@ PatchWindow::event_draw()
}
}
-
void
PatchWindow::event_edit_controls()
{
@@ -576,7 +554,6 @@ PatchWindow::event_edit_controls()
_view->set_editable(_menu_edit_controls->get_active());
}
-
void
PatchWindow::event_copy()
{
@@ -584,7 +561,6 @@ PatchWindow::event_copy()
_view->canvas()->copy_selection();
}
-
void
PatchWindow::event_paste()
{
@@ -592,7 +568,6 @@ PatchWindow::event_paste()
_view->canvas()->paste();
}
-
void
PatchWindow::event_delete()
{
@@ -600,7 +575,6 @@ PatchWindow::event_delete()
_view->canvas()->destroy_selection();
}
-
void
PatchWindow::event_select_all()
{
@@ -608,7 +582,6 @@ PatchWindow::event_select_all()
_view->canvas()->select_all();
}
-
void
PatchWindow::on_show()
{
@@ -618,7 +591,6 @@ PatchWindow::on_show()
Gtk::Window::on_show();
}
-
void
PatchWindow::on_hide()
{
@@ -627,7 +599,6 @@ PatchWindow::on_hide()
Gtk::Window::on_hide();
}
-
bool
PatchWindow::on_event(GdkEvent* event)
{
@@ -639,21 +610,18 @@ PatchWindow::on_event(GdkEvent* event)
}
}
-
void
PatchWindow::event_close()
{
App::instance().window_factory()->remove_patch_window(this);
}
-
void
PatchWindow::event_quit()
{
App::instance().quit(*this);
}
-
void
PatchWindow::event_zoom_in()
{
@@ -666,21 +634,18 @@ PatchWindow::event_zoom_out()
_view->canvas()->set_font_size(_view->canvas()->get_font_size() - 1.0);
}
-
void
PatchWindow::event_zoom_normal()
{
_view->canvas()->set_zoom_and_font_size(1.0, _view->canvas()->get_default_font_size());
}
-
void
PatchWindow::event_arrange()
{
_view->canvas()->arrange(false, false);
}
-
void
PatchWindow::event_fullscreen_toggled()
{
@@ -696,7 +661,6 @@ PatchWindow::event_fullscreen_toggled()
}
}
-
void
PatchWindow::event_status_bar_toggled()
{
@@ -706,8 +670,6 @@ PatchWindow::event_status_bar_toggled()
_status_bar->hide();
}
-
-
void
PatchWindow::event_human_names_toggled()
{
@@ -718,7 +680,6 @@ PatchWindow::event_human_names_toggled()
App::instance().configuration()->set_name_style(Configuration::PATH);
}
-
void
PatchWindow::event_port_names_toggled()
{
@@ -731,6 +692,5 @@ PatchWindow::event_port_names_toggled()
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp
index 096343bd..2e5cca4d 100644
--- a/src/gui/PatchWindow.hpp
+++ b/src/gui/PatchWindow.hpp
@@ -46,7 +46,6 @@ class PatchDescriptionWindow;
class PatchView;
class SubpatchModule;
-
/** A window for a patch.
*
* \ingroup GUI
@@ -162,7 +161,6 @@ private:
Gtk::Alignment _breadcrumb_bin;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Port.cpp b/src/gui/Port.cpp
index 14769ee0..596c72c8 100644
--- a/src/gui/Port.cpp
+++ b/src/gui/Port.cpp
@@ -40,7 +40,6 @@ namespace GUI {
ArtVpathDash* Port::_dash;
-
SharedPtr<Port>
Port::create(
boost::shared_ptr<FlowCanvas::Module> module,
@@ -62,7 +61,6 @@ Port::create(
return SharedPtr<Port>(new Port(module, pm, label, flip));
}
-
/** @a flip Make an input port appear as an output port, and vice versa.
*/
Port::Port(
@@ -103,13 +101,11 @@ Port::Port(
value_changed(pm->value());
}
-
Port::~Port()
{
App::instance().activity_port_destroyed(this);
}
-
void
Port::update_metadata()
{
@@ -126,7 +122,6 @@ Port::update_metadata()
}
}
-
void
Port::create_menu()
{
@@ -137,7 +132,6 @@ Port::create_menu()
set_menu(menu);
}
-
void
Port::moved()
{
@@ -146,7 +140,6 @@ Port::moved()
module().lock()->resize();
}
-
void
Port::value_changed(const Atom& value)
{
@@ -156,7 +149,6 @@ Port::value_changed(const Atom& value)
FlowCanvas::Port::set_control(value.get_float());
}
-
bool
Port::on_event(GdkEvent* ev)
{
@@ -175,14 +167,12 @@ Port::on_event(GdkEvent* ev)
return false;
}
-
void
Port::activity()
{
App::instance().port_activity(this);
}
-
void
Port::set_control(float value, bool signal)
{
@@ -203,7 +193,6 @@ Port::set_control(float value, bool signal)
FlowCanvas::Port::set_control(value);
}
-
void
Port::property_changed(const URI& key, const Atom& value)
{
@@ -230,7 +219,6 @@ Port::property_changed(const URI& key, const Atom& value)
}
}
-
ArtVpathDash*
Port::dash()
{
@@ -277,6 +265,5 @@ Port::set_selected(bool b)
}
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp
index ba2f2f99..9c55398c 100644
--- a/src/gui/Port.hpp
+++ b/src/gui/Port.hpp
@@ -33,7 +33,6 @@ using Ingen::Client::PortModel;
namespace GUI {
-
/** A Port on an Module.
*
* \ingroup GUI
@@ -80,7 +79,6 @@ private:
bool _flipped;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 6b0591dc..3b5bdc8c 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -29,7 +29,6 @@
namespace Ingen {
namespace GUI {
-
PortMenu::PortMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: ObjectMenu(cobject, xml)
, _patch_port(NULL)
@@ -40,7 +39,6 @@ PortMenu::PortMenu(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml
xml->get_widget("port_reset_range_menuitem", _reset_range_menuitem);
}
-
void
PortMenu::init(SharedPtr<PortModel> port, bool patch_port)
{
@@ -84,7 +82,6 @@ PortMenu::init(SharedPtr<PortModel> port, bool patch_port)
_enable_signal = true;
}
-
void
PortMenu::on_menu_disconnect()
{
@@ -97,7 +94,6 @@ PortMenu::on_menu_disconnect()
}
}
-
void
PortMenu::on_menu_set_min()
{
@@ -108,7 +104,6 @@ PortMenu::on_menu_set_min()
App::instance().engine()->set_property(_object->path(), uris.lv2_minimum, value);
}
-
void
PortMenu::on_menu_set_max()
{
@@ -119,7 +114,6 @@ PortMenu::on_menu_set_max()
App::instance().engine()->set_property(_object->path(), uris.lv2_maximum, value);
}
-
void
PortMenu::on_menu_reset_range()
{
@@ -137,7 +131,6 @@ PortMenu::on_menu_reset_range()
App::instance().engine()->set_property(_object->path(), uris.lv2_maximum, max);
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index ce050f5f..4dbde673 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -29,7 +29,6 @@ using Ingen::Client::PortModel;
namespace Ingen {
namespace GUI {
-
/** Menu for a Port.
*
* \ingroup GUI
@@ -55,7 +54,6 @@ private:
Gtk::MenuItem* _reset_range_menuitem;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PortPropertiesWindow.cpp b/src/gui/PortPropertiesWindow.cpp
index 3805dad1..84065687 100644
--- a/src/gui/PortPropertiesWindow.cpp
+++ b/src/gui/PortPropertiesWindow.cpp
@@ -32,7 +32,6 @@ namespace Ingen {
using namespace Client;
namespace GUI {
-
PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Window(cobject)
, _initial_min(0.0f)
@@ -50,7 +49,6 @@ PortPropertiesWindow::PortPropertiesWindow(BaseObjectType* cobject, const Glib::
&PortPropertiesWindow::ok));
}
-
/** Set the port this window is associated with.
* This function MUST be called before using this object in any way.
*/
@@ -90,7 +88,6 @@ PortPropertiesWindow::present(SharedPtr<PortModel> pm)
Gtk::Window::present();
}
-
void
PortPropertiesWindow::property_changed(const URI& key, const Atom& value)
{
@@ -104,7 +101,6 @@ PortPropertiesWindow::property_changed(const URI& key, const Atom& value)
}
}
-
void
PortPropertiesWindow::min_changed()
{
@@ -123,7 +119,6 @@ PortPropertiesWindow::min_changed()
}
}
-
void
PortPropertiesWindow::max_changed()
{
@@ -142,14 +137,12 @@ PortPropertiesWindow::max_changed()
}
}
-
void
PortPropertiesWindow::cancel()
{
hide();
}
-
void
PortPropertiesWindow::ok()
{
@@ -161,7 +154,6 @@ PortPropertiesWindow::ok()
hide();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp
index e5c1e24c..26035e0e 100644
--- a/src/gui/PortPropertiesWindow.hpp
+++ b/src/gui/PortPropertiesWindow.hpp
@@ -27,7 +27,6 @@
namespace Ingen {
namespace GUI {
-
/** Port properties window.
*
* Loaded by libglade as a derived object.
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index 8e00f396..4664796b 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -32,7 +32,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
PropertiesWindow::PropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
: Window(cobject)
{
@@ -62,7 +61,6 @@ PropertiesWindow::PropertiesWindow(BaseObjectType* cobject, const Glib::RefPtr<G
sigc::mem_fun(this, &PropertiesWindow::ok_clicked));
}
-
void
PropertiesWindow::reset()
{
@@ -76,7 +74,6 @@ PropertiesWindow::reset()
_model.reset();
}
-
/** Set the node this window is associated with.
* This function MUST be called before using this object in any way.
*/
@@ -181,7 +178,6 @@ PropertiesWindow::create_value_widget(const Raul::URI& uri, const Raul::Atom& va
return NULL;
}
-
void
PropertiesWindow::on_show()
{
@@ -209,7 +205,6 @@ PropertiesWindow::on_show()
Gtk::Window::on_show();
}
-
void
PropertiesWindow::property_changed(const Raul::URI& predicate, const Raul::Atom& value)
{
@@ -230,7 +225,6 @@ PropertiesWindow::property_changed(const Raul::URI& predicate, const Raul::Atom&
record.value = value;
}
-
void
PropertiesWindow::value_edited(const Raul::URI& predicate)
{
@@ -271,7 +265,6 @@ bad_type:
return;
}
-
void
PropertiesWindow::cancel_clicked()
{
@@ -279,7 +272,6 @@ PropertiesWindow::cancel_clicked()
Gtk::Window::hide();
}
-
void
PropertiesWindow::apply_clicked()
{
@@ -301,7 +293,6 @@ PropertiesWindow::apply_clicked()
LOG(debug) << "}" << endl;
}
-
void
PropertiesWindow::ok_clicked()
{
@@ -309,6 +300,5 @@ PropertiesWindow::ok_clicked()
cancel_clicked();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 1ce4005f..ba53bc4e 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -29,7 +29,6 @@ using namespace Ingen::Client;
namespace Ingen {
namespace GUI {
-
/** Object properties window.
*
* Loaded by libglade as a derived object.
diff --git a/src/gui/RenameWindow.cpp b/src/gui/RenameWindow.cpp
index e9a92dfa..2acda358 100644
--- a/src/gui/RenameWindow.cpp
+++ b/src/gui/RenameWindow.cpp
@@ -30,7 +30,6 @@ using namespace Raul;
namespace Ingen {
namespace GUI {
-
RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& glade_xml)
: Window(cobject)
{
@@ -48,7 +47,6 @@ RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Gl
_ok_button->property_sensitive() = false;
}
-
/** Set the object this window is renaming.
* This function MUST be called before using this object in any way.
*/
@@ -62,7 +60,6 @@ RenameWindow::set_object(SharedPtr<ObjectModel> object)
(name_atom.type() == Atom::STRING) ? name_atom.get_string() : "");
}
-
void
RenameWindow::present(SharedPtr<ObjectModel> object)
{
@@ -71,7 +68,6 @@ RenameWindow::present(SharedPtr<ObjectModel> object)
Gtk::Window::present();
}
-
void
RenameWindow::values_changed()
{
@@ -95,7 +91,6 @@ RenameWindow::values_changed()
}
}
-
void
RenameWindow::cancel_clicked()
{
@@ -103,7 +98,6 @@ RenameWindow::cancel_clicked()
hide();
}
-
/** Rename the object.
*
* It shouldn't be possible for this to be called with an invalid name set
@@ -135,6 +129,5 @@ RenameWindow::ok_clicked()
hide();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index e0454c52..adc50144 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -29,7 +29,6 @@ using Ingen::Client::ObjectModel;
namespace Ingen {
namespace GUI {
-
/** Rename window. Handles renaming of any (Ingen) object.
*
* \ingroup GUI
diff --git a/src/gui/SubpatchModule.cpp b/src/gui/SubpatchModule.cpp
index 695f7459..43ca86f3 100644
--- a/src/gui/SubpatchModule.cpp
+++ b/src/gui/SubpatchModule.cpp
@@ -30,7 +30,6 @@
namespace Ingen {
namespace GUI {
-
SubpatchModule::SubpatchModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<PatchModel> patch)
: NodeModule(canvas, patch)
, _patch(patch)
@@ -39,7 +38,6 @@ SubpatchModule::SubpatchModule(boost::shared_ptr<PatchCanvas> canvas, SharedPtr<
assert(patch);
}
-
void
SubpatchModule::on_double_click(GdkEventButton* event)
{
@@ -54,7 +52,6 @@ SubpatchModule::on_double_click(GdkEventButton* event)
App::instance().window_factory()->present_patch(_patch, preferred);
}
-
/** Browse to this patch in current (parent's) window
* (unless an existing window is displaying it)
*/
@@ -72,7 +69,6 @@ SubpatchModule::browse_to_patch()
App::instance().window_factory()->present_patch(_patch, preferred);
}
-
void
SubpatchModule::menu_remove()
{
diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp
index 74737ae8..f5d3d8c2 100644
--- a/src/gui/SubpatchModule.hpp
+++ b/src/gui/SubpatchModule.hpp
@@ -39,7 +39,6 @@ namespace GUI {
class PatchCanvas;
class NodeControlWindow;
-
/** A module to represent a subpatch
*
* \ingroup GUI
@@ -61,7 +60,6 @@ protected:
SharedPtr<PatchModel> _patch;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp
index b5a4d291..195e2879 100644
--- a/src/gui/UploadPatchWindow.cpp
+++ b/src/gui/UploadPatchWindow.cpp
@@ -40,7 +40,6 @@ using namespace std;
namespace Ingen {
namespace GUI {
-
UploadPatchWindow::UploadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
: Dialog(cobject)
, _thread(NULL)
@@ -53,14 +52,12 @@ UploadPatchWindow::UploadPatchWindow(BaseObjectType* cobject, const Glib::RefPtr
xml->get_widget("upload_patch_cancel_button", _cancel_button);
xml->get_widget("upload_patch_upload_button", _upload_button);
-
_symbol_entry->signal_changed().connect(sigc::mem_fun(this, &UploadPatchWindow::symbol_changed));
_short_name_entry->signal_changed().connect(sigc::mem_fun(this, &UploadPatchWindow::short_name_changed));
_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &UploadPatchWindow::cancel_clicked));
_upload_button->signal_clicked().connect(sigc::mem_fun(this, &UploadPatchWindow::upload_clicked));
}
-
void
UploadPatchWindow::present(SharedPtr<PatchModel> patch)
{
@@ -69,7 +66,6 @@ UploadPatchWindow::present(SharedPtr<PatchModel> patch)
Gtk::Window::present();
}
-
void
UploadPatchWindow::on_show()
{
@@ -85,7 +81,6 @@ UploadPatchWindow::on_show()
_short_name_entry->set_text(atom.get_string());
}
-
void
UploadPatchWindow::on_hide()
{
@@ -95,7 +90,6 @@ UploadPatchWindow::on_hide()
_thread = NULL;
}
-
bool
UploadPatchWindow::is_symbol(const Glib::ustring& s)
{
@@ -112,7 +106,6 @@ UploadPatchWindow::is_symbol(const Glib::ustring& s)
return true;
}
-
void
UploadPatchWindow::symbol_changed()
{
@@ -121,7 +114,6 @@ UploadPatchWindow::symbol_changed()
&& _short_name_entry->get_text().length() > 0);
}
-
void
UploadPatchWindow::short_name_changed()
{
@@ -130,7 +122,6 @@ UploadPatchWindow::short_name_changed()
&& _short_name_entry->get_text().length() > 0);
}
-
size_t
UploadThread::curl_read_cb(void *ptr, size_t size, size_t nmemb, void *data)
{
@@ -141,7 +132,6 @@ UploadThread::curl_read_cb(void *ptr, size_t size, size_t nmemb, void *data)
return ss->readsome((char*)ptr, nmemb);
}
-
int
UploadThread::curl_progress_cb(void *thread,
double dltotal,
@@ -156,7 +146,6 @@ UploadThread::curl_progress_cb(void *thread,
return 0;
}
-
UploadThread::UploadThread(UploadPatchWindow* win, const string& str, const string& url)
: Thread("Upload")
, _curl(NULL)
@@ -180,7 +169,6 @@ UploadThread::UploadThread(UploadPatchWindow* win, const string& str, const stri
curl_easy_setopt(_curl, CURLOPT_PROGRESSDATA, this);
}
-
void
UploadThread::_run()
{
@@ -201,7 +189,6 @@ UploadThread::_run()
_curl = NULL;
}
-
bool
UploadPatchWindow::progress_callback()
{
@@ -230,7 +217,6 @@ UploadPatchWindow::progress_callback()
}
}
-
void
UploadPatchWindow::upload_clicked()
{
@@ -268,7 +254,6 @@ UploadPatchWindow::upload_clicked()
sigc::mem_fun(this, &UploadPatchWindow::progress_callback), 100);
}
-
void
UploadPatchWindow::cancel_clicked()
{
@@ -280,6 +265,5 @@ UploadPatchWindow::cancel_clicked()
hide();
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp
index 9a4ac13a..78a17b54 100644
--- a/src/gui/UploadPatchWindow.hpp
+++ b/src/gui/UploadPatchWindow.hpp
@@ -37,7 +37,6 @@ namespace GUI {
class UploadPatchWindow;
-
class UploadThread : public Raul::Thread {
public:
UploadThread(UploadPatchWindow* win,
@@ -58,7 +57,6 @@ private:
std::string _url;
};
-
/* Upload patch dialog.
*
* \ingroup GUI
@@ -100,7 +98,6 @@ private:
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Window.cpp b/src/gui/Window.cpp
index 3bec747f..ec128197 100644
--- a/src/gui/Window.cpp
+++ b/src/gui/Window.cpp
@@ -20,7 +20,6 @@
namespace Ingen {
namespace GUI {
-
bool
Window::key_press_handler(Gtk::Window* win, GdkEventKey* event)
{
@@ -31,7 +30,6 @@ Window::key_press_handler(Gtk::Window* win, GdkEventKey* event)
return false;
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index f490f13f..c924ba48 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -32,7 +32,6 @@ namespace GUI {
class PatchWindow;
class PatchTreeView;
-
/** Ingen GUI Window
* \ingroup GUI
*/
@@ -52,7 +51,6 @@ public:
static bool key_press_handler(Gtk::Window* win, GdkEventKey* event);
};
-
/** Ingen GUI Dialog
* \ingroup GUI
*/
@@ -70,7 +68,6 @@ public:
}
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/WindowFactory.cpp b/src/gui/WindowFactory.cpp
index 6c48d11d..2ebb66c8 100644
--- a/src/gui/WindowFactory.cpp
+++ b/src/gui/WindowFactory.cpp
@@ -39,7 +39,6 @@ using namespace std;
namespace Ingen {
namespace GUI {
-
WindowFactory::WindowFactory()
: _load_plugin_win(NULL)
, _load_patch_win(NULL)
@@ -62,7 +61,6 @@ WindowFactory::WindowFactory()
#endif
}
-
WindowFactory::~WindowFactory()
{
for (PatchWindowMap::iterator i = _patch_windows.begin(); i != _patch_windows.end(); ++i)
@@ -73,7 +71,6 @@ WindowFactory::~WindowFactory()
}
-
void
WindowFactory::clear()
{
@@ -88,7 +85,6 @@ WindowFactory::clear()
_control_windows.clear();
}
-
/** Returns the number of Patch windows currently visible.
*/
size_t
@@ -102,8 +98,6 @@ WindowFactory::num_open_patch_windows()
return ret;
}
-
-
PatchWindow*
WindowFactory::patch_window(SharedPtr<PatchModel> patch)
{
@@ -115,7 +109,6 @@ WindowFactory::patch_window(SharedPtr<PatchModel> patch)
return (w == _patch_windows.end()) ? NULL : w->second;
}
-
PatchWindow*
WindowFactory::parent_patch_window(SharedPtr<NodeModel> node)
{
@@ -125,7 +118,6 @@ WindowFactory::parent_patch_window(SharedPtr<NodeModel> node)
return patch_window(PtrCast<PatchModel>(node->parent()));
}
-
NodeControlWindow*
WindowFactory::control_window(SharedPtr<NodeModel> node)
{
@@ -134,7 +126,6 @@ WindowFactory::control_window(SharedPtr<NodeModel> node)
return (w == _control_windows.end()) ? NULL : w->second;
}
-
/** Present a PatchWindow for a Patch.
*
* If @a preferred is not NULL, it will be set to display @a patch if the patch
@@ -165,7 +156,6 @@ WindowFactory::present_patch(SharedPtr<PatchModel> patch, PatchWindow* preferred
}
}
-
PatchWindow*
WindowFactory::new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view)
{
@@ -186,7 +176,6 @@ WindowFactory::new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView
return win;
}
-
bool
WindowFactory::remove_patch_window(PatchWindow* win, GdkEventAny* ignored)
{
@@ -203,7 +192,6 @@ WindowFactory::remove_patch_window(PatchWindow* win, GdkEventAny* ignored)
return false;
}
-
void
WindowFactory::present_controls(SharedPtr<NodeModel> node)
{
@@ -217,7 +205,6 @@ WindowFactory::present_controls(SharedPtr<NodeModel> node)
}
}
-
NodeControlWindow*
WindowFactory::new_control_window(SharedPtr<NodeModel> node)
{
@@ -235,7 +222,6 @@ WindowFactory::new_control_window(SharedPtr<NodeModel> node)
return win;
}
-
bool
WindowFactory::remove_control_window(NodeControlWindow* win, GdkEventAny* ignored)
{
@@ -249,7 +235,6 @@ WindowFactory::remove_control_window(NodeControlWindow* win, GdkEventAny* ignore
return true;
}
-
void
WindowFactory::present_load_plugin(SharedPtr<PatchModel> patch, GraphObject::Properties data)
{
@@ -267,7 +252,6 @@ WindowFactory::present_load_plugin(SharedPtr<PatchModel> patch, GraphObject::Pro
_load_plugin_win->present(patch, data);
}
-
void
WindowFactory::present_load_patch(SharedPtr<PatchModel> patch, GraphObject::Properties data)
{
@@ -279,7 +263,6 @@ WindowFactory::present_load_patch(SharedPtr<PatchModel> patch, GraphObject::Prop
_load_patch_win->present(patch, true, data);
}
-
void
WindowFactory::present_load_subpatch(SharedPtr<PatchModel> patch, GraphObject::Properties data)
{
@@ -291,7 +274,6 @@ WindowFactory::present_load_subpatch(SharedPtr<PatchModel> patch, GraphObject::P
_load_patch_win->present(patch, false, data);
}
-
void
WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, GraphObject::Properties data)
{
@@ -303,7 +285,6 @@ WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, GraphObjec
_load_remote_patch_win->present(patch, data);
}
-
void
WindowFactory::present_upload_patch(SharedPtr<PatchModel> patch)
{
@@ -328,7 +309,6 @@ WindowFactory::present_new_subpatch(SharedPtr<PatchModel> patch, GraphObject::Pr
_new_subpatch_win->present(patch, data);
}
-
void
WindowFactory::present_rename(SharedPtr<ObjectModel> object)
{
@@ -342,7 +322,6 @@ WindowFactory::present_rename(SharedPtr<ObjectModel> object)
_rename_win->present(object);
}
-
void
WindowFactory::present_properties(SharedPtr<ObjectModel> object)
{
@@ -358,6 +337,5 @@ WindowFactory::present_properties(SharedPtr<ObjectModel> object)
_properties_win->present(object);
}
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index e8eb7837..35a4f3b1 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -47,7 +47,6 @@ class PatchWindow;
class RenameWindow;
class UploadPatchWindow;
-
/** Manager/Factory for all windows.
*
* This serves as a nice centralized spot for all window management issues,
@@ -92,7 +91,6 @@ private:
PatchWindow* new_patch_window(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view);
-
NodeControlWindow* new_control_window(SharedPtr<NodeModel> node);
bool remove_control_window(NodeControlWindow* win, GdkEventAny* ignored);
@@ -108,7 +106,6 @@ private:
RenameWindow* _rename_win;
};
-
} // namespace GUI
} // namespace Ingen
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index ae99303f..acadc7e4 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -183,7 +183,7 @@ main(int argc, char** argv)
ingen_try(world->parser(),
"Unable to create parser");
-
+
string uri = conf.option("load").get_string();
if (!serd_uri_string_has_scheme((const uint8_t*)uri.c_str())) {
// Does not start with legal URI scheme, assume path
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index b81cc132..ee47b344 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -280,7 +280,7 @@ Parser::parse(Ingen::Shared::World* world,
parse_properties(world, target, model, subject, path, data);
ret = path;
}
-
+
if (!ret) {
LOG(error) << "Failed to parse " << path << endl;
return boost::optional<Path>();
diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp
index a318e662..79762774 100644
--- a/src/serialisation/Serialiser.cpp
+++ b/src/serialisation/Serialiser.cpp
@@ -214,7 +214,7 @@ Serialiser::start_to_filename(const string& filename)
} else {
_base_uri = filename;
}
-
+
_model = new Sord::Model(*_world.rdf_world(), _base_uri);
_mode = TO_FILE;
}
diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp
index 369be71b..5ea97732 100644
--- a/src/shared/Builder.cpp
+++ b/src/shared/Builder.cpp
@@ -31,14 +31,12 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
Builder::Builder(SharedPtr<Shared::LV2URIMap> uris, CommonInterface& interface)
: _uris(uris)
, _interface(interface)
{
}
-
void
Builder::build(SharedPtr<const GraphObject> object)
{
@@ -78,7 +76,6 @@ Builder::build(SharedPtr<const GraphObject> object)
}
}
-
void
Builder::connect(SharedPtr<const GraphObject> object)
{
@@ -92,7 +89,6 @@ Builder::connect(SharedPtr<const GraphObject> object)
}
}
-
void
Builder::build_object(SharedPtr<const GraphObject> object)
{
@@ -100,6 +96,5 @@ Builder::build_object(SharedPtr<const GraphObject> object)
_interface.put(object->uri(), object->properties());
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp
index f4e5e8c7..e64d1a2f 100644
--- a/src/shared/Builder.hpp
+++ b/src/shared/Builder.hpp
@@ -29,7 +29,6 @@ class CommonInterface;
class GraphObject;
class LV2URIMap;
-
/** Wrapper for CommonInterface to create existing objects/models.
*
* \ingroup interface
@@ -50,7 +49,6 @@ private:
CommonInterface& _interface;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index 9009fe96..8ac78422 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -27,7 +27,6 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
const URI
ClashAvoider::map_uri(const Raul::URI& in)
{
@@ -37,7 +36,6 @@ ClashAvoider::map_uri(const Raul::URI& in)
return in;
}
-
const Path
ClashAvoider::map_path(const Raul::Path& in)
{
@@ -130,7 +128,6 @@ ClashAvoider::map_path(const Raul::Path& in)
}
}
-
bool
ClashAvoider::exists(const Raul::Path& path) const
{
@@ -144,7 +141,6 @@ ClashAvoider::exists(const Raul::Path& path) const
return false;
}
-
void
ClashAvoider::put(const Raul::URI& path,
const Shared::Resource::Properties& properties,
@@ -153,7 +149,6 @@ ClashAvoider::put(const Raul::URI& path,
_target.put(map_uri(path), properties, ctx);
}
-
void
ClashAvoider::delta(const Raul::URI& path,
const Shared::Resource::Properties& remove,
@@ -162,7 +157,6 @@ ClashAvoider::delta(const Raul::URI& path,
_target.delta(map_uri(path), remove, add);
}
-
void
ClashAvoider::move(const Raul::Path& old_path,
const Raul::Path& new_path)
@@ -170,7 +164,6 @@ ClashAvoider::move(const Raul::Path& old_path,
_target.move(map_path(old_path), map_path(new_path));
}
-
void
ClashAvoider::connect(const Raul::Path& src_port_path,
const Raul::Path& dst_port_path)
@@ -178,7 +171,6 @@ ClashAvoider::connect(const Raul::Path& src_port_path,
_target.connect(map_path(src_port_path), map_path(dst_port_path));
}
-
void
ClashAvoider::disconnect(const Raul::Path& src_port_path,
const Raul::Path& dst_port_path)
@@ -186,7 +178,6 @@ ClashAvoider::disconnect(const Raul::Path& src_port_path,
_target.disconnect(map_path(src_port_path), map_path(dst_port_path));
}
-
void
ClashAvoider::set_property(const Raul::URI& subject,
const Raul::URI& predicate,
@@ -195,13 +186,11 @@ ClashAvoider::set_property(const Raul::URI& subject,
_target.set_property(map_uri(subject), predicate, value);
}
-
void
ClashAvoider::del(const Raul::Path& path)
{
_target.del(map_path(path));
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp
index dd5987ca..7ffcf9b9 100644
--- a/src/shared/ClashAvoider.hpp
+++ b/src/shared/ClashAvoider.hpp
@@ -30,7 +30,6 @@ namespace Shared {
class Store;
-
/** A wrapper for a CommonInterface that creates objects but possibly maps
* symbol names to avoid clashes with the existing objects in a store.
*/
@@ -88,7 +87,6 @@ private:
SymbolMap _symbol_map;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/HTTPSender.cpp b/src/shared/HTTPSender.cpp
index 4a3db5d3..66406bdd 100644
--- a/src/shared/HTTPSender.cpp
+++ b/src/shared/HTTPSender.cpp
@@ -34,7 +34,6 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
HTTPSender::HTTPSender()
: _listen_port(-1)
, _listen_sock(-1)
@@ -81,7 +80,6 @@ HTTPSender::HTTPSender()
start();
}
-
HTTPSender::~HTTPSender()
{
stop();
@@ -121,7 +119,6 @@ HTTPSender::_run()
_listen_sock = -1;
}
-
void
HTTPSender::bundle_begin()
{
@@ -130,7 +127,6 @@ HTTPSender::bundle_begin()
_transfer = "";
}
-
void
HTTPSender::bundle_end()
{
@@ -141,7 +137,6 @@ HTTPSender::bundle_end()
_mutex.unlock();
}
-
void
HTTPSender::send_chunk(const std::string& buf)
{
@@ -156,6 +151,5 @@ HTTPSender::send_chunk(const std::string& buf)
}
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/HTTPSender.hpp b/src/shared/HTTPSender.hpp
index 486f84dd..90d03f7d 100644
--- a/src/shared/HTTPSender.hpp
+++ b/src/shared/HTTPSender.hpp
@@ -58,7 +58,6 @@ protected:
std::string _transfer;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp
index aa004f6f..994fe51d 100644
--- a/src/shared/LV2Atom.cpp
+++ b/src/shared/LV2Atom.cpp
@@ -30,7 +30,6 @@ namespace Ingen {
namespace Shared {
namespace LV2Atom {
-
bool
to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom)
{
@@ -50,7 +49,6 @@ to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom)
return false;
}
-
/** Convert an atom to an LV2 object, if possible.
* object->size should be the capacity of the object (not including header)
*/
@@ -89,7 +87,6 @@ from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* objec
return true;
}
-
} // namespace LV2Atom
} // namespace Shared
diff --git a/src/shared/LV2Features.cpp b/src/shared/LV2Features.cpp
index 4b8fa1c5..0842c702 100644
--- a/src/shared/LV2Features.cpp
+++ b/src/shared/LV2Features.cpp
@@ -25,12 +25,10 @@ using namespace std;
namespace Ingen {
namespace Shared {
-
LV2Features::LV2Features()
{
}
-
SharedPtr<LV2Features::Feature>
LV2Features::feature(const std::string& uri)
{
@@ -41,14 +39,12 @@ LV2Features::feature(const std::string& uri)
return SharedPtr<Feature>();
}
-
void
LV2Features::add_feature(const std::string& uri, SharedPtr<Feature> feature)
{
_features.insert(make_pair(uri, feature));
}
-
SharedPtr<LV2Features::FeatureArray>
LV2Features::lv2_features(Shared::World* world, Node* node) const
{
@@ -61,6 +57,5 @@ LV2Features::lv2_features(Shared::World* world, Node* node) const
return SharedPtr<FeatureArray>(new FeatureArray(vec));
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index b7ad7b07..2489bef0 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -37,7 +37,6 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
LV2URIMap::Quark::Quark(const char* c_str)
: Raul::URI(c_str)
, id(g_quark_from_string(c_str))
@@ -130,10 +129,8 @@ LV2URIMap::LV2URIMap()
_unmap_feature = SharedPtr<UnmapFeature>(new UnmapFeature(*this));
}
-
struct null_deleter { void operator()(void const *) const {} };
-
uint32_t
LV2URIMap::uri_to_id(const char* map,
const char* uri)
@@ -159,7 +156,6 @@ LV2URIMap::uri_to_id(const char* map,
}
}
-
const char*
LV2URIMap::id_to_uri(const char* map,
const uint32_t id)
@@ -176,7 +172,6 @@ LV2URIMap::id_to_uri(const char* map,
}
}
-
std::pair<bool, uint32_t>
LV2URIMap::event_to_global(uint16_t event_id) const
{
@@ -187,7 +182,6 @@ LV2URIMap::event_to_global(uint16_t event_id) const
return std::make_pair(true, i->second);
}
-
std::pair<bool, uint16_t>
LV2URIMap::global_to_event(uint32_t global_id) const
{
@@ -198,7 +192,6 @@ LV2URIMap::global_to_event(uint32_t global_id) const
return std::make_pair(true, i->second);
}
-
uint32_t
LV2URIMap::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data,
const char* map,
@@ -208,7 +201,6 @@ LV2URIMap::uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data,
return me->uri_to_id(map, uri);
}
-
const char*
LV2URIMap::uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data,
const char* map,
@@ -218,6 +210,5 @@ LV2URIMap::uri_unmap_id_to_uri(LV2_URI_Map_Callback_Data callback_data,
return me->id_to_uri(map, id);
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp
index 20957a6a..21782b42 100644
--- a/src/shared/LV2URIMap.hpp
+++ b/src/shared/LV2URIMap.hpp
@@ -34,7 +34,6 @@
namespace Ingen {
namespace Shared {
-
/** Implementation of the LV2 URI Map and URI Unmap extensions
*/
class LV2URIMap : public boost::noncopyable, public LV2Features::Feature {
@@ -47,7 +46,7 @@ public:
struct UnmapFeature : public LV2Features::Feature {
UnmapFeature(const LV2URIMap& map) : _feature(map.uri_unmap_feature) {}
-
+
SharedPtr<LV2_Feature> feature(Shared::World*, Node*) {
return SharedPtr<LV2_Feature>(&_feature, NullDeleter<LV2_Feature>);
}
@@ -56,7 +55,7 @@ public:
};
SharedPtr<UnmapFeature> unmap_feature() { return _unmap_feature; }
-
+
virtual uint32_t uri_to_id(const char* map, const char* uri);
virtual const char* id_to_uri(const char* map, uint32_t id);
@@ -85,7 +84,7 @@ private:
EventToGlobal _event_to_global;
GlobalToEvent _global_to_event;
-
+
public:
struct Quark : public Raul::URI {
Quark(const char* str);
@@ -151,7 +150,6 @@ public:
const Quark wildcard;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/Module.hpp b/src/shared/Module.hpp
index af5732af..ce78591a 100644
--- a/src/shared/Module.hpp
+++ b/src/shared/Module.hpp
@@ -42,7 +42,6 @@ struct Module {
SharedPtr<Glib::Module> library;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/OSCSender.cpp b/src/shared/OSCSender.cpp
index bbe4c03e..1f2a0412 100644
--- a/src/shared/OSCSender.cpp
+++ b/src/shared/OSCSender.cpp
@@ -28,7 +28,6 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
OSCSender::OSCSender()
: _send_state(Immediate)
, _transfer(NULL)
@@ -37,7 +36,6 @@ OSCSender::OSCSender()
{
}
-
void
OSCSender::bundle_begin()
{
@@ -48,14 +46,12 @@ OSCSender::bundle_begin()
_send_state = SendingBundle;
}
-
void
OSCSender::bundle_end()
{
transfer_end();
}
-
void
OSCSender::transfer_begin()
{
@@ -66,7 +62,6 @@ OSCSender::transfer_begin()
_send_state = SendingTransfer;
}
-
void
OSCSender::transfer_end()
{
@@ -77,7 +72,6 @@ OSCSender::transfer_end()
_send_state = Immediate;
}
-
int
OSCSender::send(const char *path, const char *types, ...)
{
@@ -104,7 +98,6 @@ OSCSender::send(const char *path, const char *types, ...)
return ret;
}
-
void
OSCSender::send_message(const char* path, lo_message msg)
{
diff --git a/src/shared/OSCSender.hpp b/src/shared/OSCSender.hpp
index 157f4c6a..44c944bf 100644
--- a/src/shared/OSCSender.hpp
+++ b/src/shared/OSCSender.hpp
@@ -51,7 +51,6 @@ protected:
bool _enabled;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp
index 8b8a56ec..8bfa39d3 100644
--- a/src/shared/ResourceImpl.cpp
+++ b/src/shared/ResourceImpl.cpp
@@ -26,7 +26,6 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
void
ResourceImpl::add_property(const Raul::URI& uri, const Raul::Atom& value)
{
@@ -40,7 +39,6 @@ ResourceImpl::add_property(const Raul::URI& uri, const Raul::Atom& value)
_properties.insert(make_pair(uri, value));
}
-
Raul::Atom&
ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value)
{
@@ -48,7 +46,6 @@ ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value)
return _properties.insert(make_pair(uri, value))->second;
}
-
void
ResourceImpl::remove_property(const Raul::URI& uri, const Raul::Atom& value)
{
@@ -65,7 +62,6 @@ ResourceImpl::remove_property(const Raul::URI& uri, const Raul::Atom& value)
}
}
-
bool
ResourceImpl::has_property(const Raul::URI& uri, const Raul::Atom& value) const
{
@@ -78,14 +74,12 @@ ResourceImpl::has_property(const Raul::URI& uri, const Raul::Atom& value) const
return false;
}
-
Raul::Atom&
ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value) const
{
return const_cast<ResourceImpl*>(this)->set_property(uri, value);
}
-
const Raul::Atom&
ResourceImpl::get_property(const Raul::URI& uri) const
{
@@ -94,7 +88,6 @@ ResourceImpl::get_property(const Raul::URI& uri) const
return (i != _properties.end()) ? i->second : nil;
}
-
bool
ResourceImpl::type(
const LV2URIMap& uris,
@@ -156,7 +149,6 @@ ResourceImpl::type(
}
}
-
void
ResourceImpl::set_properties(const Properties& p)
{
@@ -167,7 +159,6 @@ ResourceImpl::set_properties(const Properties& p)
add_property(i->first, i->second);
}
-
void
ResourceImpl::add_properties(const Properties& p)
{
@@ -176,7 +167,6 @@ ResourceImpl::add_properties(const Properties& p)
add_property(i->first, i->second);
}
-
void
ResourceImpl::remove_properties(const Properties& p)
{
@@ -196,7 +186,6 @@ ResourceImpl::remove_properties(const Properties& p)
}
}
-
void
ResourceImpl::dump(std::ostream& os) const
{
@@ -208,7 +197,6 @@ ResourceImpl::dump(std::ostream& os) const
os << "]" << endl;
}
-
Resource::Properties
ResourceImpl::properties(Resource::Graph ctx) const
{
diff --git a/src/shared/ResourceImpl.hpp b/src/shared/ResourceImpl.hpp
index 75b58d21..b9ad655f 100644
--- a/src/shared/ResourceImpl.hpp
+++ b/src/shared/ResourceImpl.hpp
@@ -77,7 +77,6 @@ private:
mutable Properties _properties;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/Store.cpp b/src/shared/Store.cpp
index fc366376..8fd4c578 100644
--- a/src/shared/Store.cpp
+++ b/src/shared/Store.cpp
@@ -29,7 +29,6 @@ using namespace Raul;
namespace Ingen {
namespace Shared {
-
void
Store::add(GraphObject* o)
{
@@ -48,7 +47,6 @@ Store::add(GraphObject* o)
}
}
-
Store::const_iterator
Store::children_begin(SharedPtr<Shared::GraphObject> o) const
{
@@ -58,7 +56,6 @@ Store::children_begin(SharedPtr<Shared::GraphObject> o) const
return parent;
}
-
Store::const_iterator
Store::children_end(SharedPtr<Shared::GraphObject> o) const
{
@@ -67,7 +64,6 @@ Store::children_end(SharedPtr<Shared::GraphObject> o) const
return find_descendants_end(parent);
}
-
SharedPtr<Shared::GraphObject>
Store::find_child(SharedPtr<Shared::GraphObject> parent, const string& child_name) const
{
@@ -81,7 +77,6 @@ Store::find_child(SharedPtr<Shared::GraphObject> parent, const string& child_nam
return SharedPtr<Shared::GraphObject>();
}
-
unsigned
Store::child_name_offset(const Raul::Path& parent,
const Raul::Symbol& symbol,
@@ -105,6 +100,5 @@ Store::child_name_offset(const Raul::Path& parent,
return offset;
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp
index 5a019a5c..8a9f6394 100644
--- a/src/shared/Store.hpp
+++ b/src/shared/Store.hpp
@@ -26,7 +26,6 @@
namespace Ingen {
namespace Shared {
-
class Store : public Raul::PathTable< SharedPtr<Shared::GraphObject> > {
public:
virtual ~Store() {}
@@ -51,7 +50,6 @@ private:
Glib::RWLock _lock;
};
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/World.cpp b/src/shared/World.cpp
index 6667cb9f..a0ba895b 100644
--- a/src/shared/World.cpp
+++ b/src/shared/World.cpp
@@ -75,7 +75,7 @@ load_module(const string& name)
// Try default directory if not found
module = new Glib::Module(Shared::module_path(name), Glib::MODULE_BIND_LAZY);
-
+
// FIXME: SEGV on exit without this
module->make_resident();
@@ -94,7 +94,6 @@ load_module(const string& name)
}
}
-
class WorldImpl : public boost::noncopyable {
public:
WorldImpl(Raul::Configuration* conf, int& a_argc, char**& a_argv)
@@ -181,13 +180,11 @@ public:
std::string jack_uuid;
};
-
World::World(Raul::Configuration* conf, int& argc, char**& argv)
: _impl(new WorldImpl(conf, argc, argv))
{
}
-
World::~World()
{
unload_all();
@@ -217,7 +214,6 @@ SLV2World World::slv2_world() { return _impl->slv2_world; }
Sord::World* World::rdf_world() { return _impl->rdf_world; }
SharedPtr<LV2URIMap> World::uris() { return _impl->uris; }
-
/** Load an Ingen module.
* @return true on success, false on failure
*/
@@ -238,7 +234,6 @@ World::load(const char* name)
}
}
-
/** Unload all loaded Ingen modules.
*/
void
@@ -247,7 +242,6 @@ World::unload_all()
_impl->modules.clear();
}
-
/** Get an interface for a remote engine at @a url
*/
SharedPtr<Ingen::Shared::EngineInterface>
@@ -263,7 +257,6 @@ World::interface(const std::string& url)
return i->second(this, url);
}
-
/** Run a script of type @a mime_type at filename @a filename */
bool
World::run(const std::string& mime_type, const std::string& filename)
@@ -283,20 +276,17 @@ World::add_interface_factory(const std::string& scheme, InterfaceFactory factory
_impl->interface_factories.insert(make_pair(scheme, factory));
}
-
void
World::set_jack_uuid(const std::string& uuid)
{
_impl->jack_uuid = uuid;
}
-
std::string
World::jack_uuid()
{
return _impl->jack_uuid;
}
-
} // namespace Shared
} // namespace Ingen
diff --git a/src/shared/World.hpp b/src/shared/World.hpp
index 29209f9f..0608841d 100644
--- a/src/shared/World.hpp
+++ b/src/shared/World.hpp
@@ -47,7 +47,6 @@ class LV2URIMap;
class Store;
class WorldImpl;
-
/** The "world" all Ingen modules may share.
*
* All loaded components of Ingen, as well as things requiring shared access
@@ -70,7 +69,7 @@ public:
virtual void add_interface_factory(const std::string& scheme,
InterfaceFactory factory);
-
+
virtual SharedPtr<Ingen::Shared::EngineInterface> interface(
const std::string& engine_url);
@@ -109,7 +108,6 @@ private:
WorldImpl* _impl;
};
-
} // namespace Shared
} // namespace Ingen