More juggling

git-svn-id: http://svn.drobilla.net/lad/grauph@15 a436a847-0d15-0410-975c-d299462d15a1

185 files changed, 259 insertions, 0 deletions

diff --git a/src/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp
index decd2471..decd2471 100644
--- a/src/engine/AlsaMidiDriver.cpp
+++ b/src/libs/engine/AlsaMidiDriver.cpp
diff --git a/src/engine/AlsaMidiDriver.h b/src/libs/engine/AlsaMidiDriver.h
index 5acbbfbf..5acbbfbf 100644
--- a/src/engine/AlsaMidiDriver.h
+++ b/src/libs/engine/AlsaMidiDriver.h
diff --git a/src/engine/Array.h b/src/libs/engine/Array.h
index 6b56ecc5..6b56ecc5 100644
--- a/src/engine/Array.h
+++ b/src/libs/engine/Array.h
diff --git a/src/engine/AudioDriver.h b/src/libs/engine/AudioDriver.h
index 056aeab4..056aeab4 100644
--- a/src/engine/AudioDriver.h
+++ b/src/libs/engine/AudioDriver.h
diff --git a/src/engine/AudioInputNode.cpp b/src/libs/engine/AudioInputNode.cpp
index 8a3594cb..8a3594cb 100644
--- a/src/engine/AudioInputNode.cpp
+++ b/src/libs/engine/AudioInputNode.cpp
diff --git a/src/engine/AudioInputNode.h b/src/libs/engine/AudioInputNode.h
index 894ec082..894ec082 100644
--- a/src/engine/AudioInputNode.h
+++ b/src/libs/engine/AudioInputNode.h
diff --git a/src/engine/AudioOutputNode.cpp b/src/libs/engine/AudioOutputNode.cpp
index d9a925f8..d9a925f8 100644
--- a/src/engine/AudioOutputNode.cpp
+++ b/src/libs/engine/AudioOutputNode.cpp
diff --git a/src/engine/AudioOutputNode.h b/src/libs/engine/AudioOutputNode.h
index 6399cfc6..6399cfc6 100644
--- a/src/engine/AudioOutputNode.h
+++ b/src/libs/engine/AudioOutputNode.h
diff --git a/src/engine/BridgeNode.cpp b/src/libs/engine/BridgeNode.cpp
index 776bcc92..776bcc92 100644
--- a/src/engine/BridgeNode.cpp
+++ b/src/libs/engine/BridgeNode.cpp
diff --git a/src/engine/BridgeNode.h b/src/libs/engine/BridgeNode.h
index 99fad912..99fad912 100644
--- a/src/engine/BridgeNode.h
+++ b/src/libs/engine/BridgeNode.h
diff --git a/src/engine/Buffer.cpp b/src/libs/engine/Buffer.cpp
index 963b14a5..963b14a5 100644
--- a/src/engine/Buffer.cpp
+++ b/src/libs/engine/Buffer.cpp
diff --git a/src/engine/Buffer.h b/src/libs/engine/Buffer.h
index 13d62727..13d62727 100644
--- a/src/engine/Buffer.h
+++ b/src/libs/engine/Buffer.h
diff --git a/src/engine/ClientBroadcaster.cpp b/src/libs/engine/ClientBroadcaster.cpp
index f8823233..f8823233 100644
--- a/src/engine/ClientBroadcaster.cpp
+++ b/src/libs/engine/ClientBroadcaster.cpp
diff --git a/src/engine/ClientBroadcaster.h b/src/libs/engine/ClientBroadcaster.h
index b0a60f57..b0a60f57 100644
--- a/src/engine/ClientBroadcaster.h
+++ b/src/libs/engine/ClientBroadcaster.h
diff --git a/src/engine/Connection.cpp b/src/libs/engine/Connection.cpp
index d1592009..d1592009 100644
--- a/src/engine/Connection.cpp
+++ b/src/libs/engine/Connection.cpp
diff --git a/src/engine/Connection.h b/src/libs/engine/Connection.h
index 769c2047..769c2047 100644
--- a/src/engine/Connection.h
+++ b/src/libs/engine/Connection.h
diff --git a/src/engine/ConnectionBase.cpp b/src/libs/engine/ConnectionBase.cpp
index c8936818..c8936818 100644
--- a/src/engine/ConnectionBase.cpp
+++ b/src/libs/engine/ConnectionBase.cpp
diff --git a/src/engine/ConnectionBase.h b/src/libs/engine/ConnectionBase.h
index 72acae2e..72acae2e 100644
--- a/src/engine/ConnectionBase.h
+++ b/src/libs/engine/ConnectionBase.h
diff --git a/src/engine/ControlInputNode.cpp b/src/libs/engine/ControlInputNode.cpp
index d4d83558..d4d83558 100644
--- a/src/engine/ControlInputNode.cpp
+++ b/src/libs/engine/ControlInputNode.cpp
diff --git a/src/engine/ControlInputNode.h b/src/libs/engine/ControlInputNode.h
index 0be82af0..0be82af0 100644
--- a/src/engine/ControlInputNode.h
+++ b/src/libs/engine/ControlInputNode.h
diff --git a/src/engine/ControlOutputNode.cpp b/src/libs/engine/ControlOutputNode.cpp
index 7e1f3e2a..7e1f3e2a 100644
--- a/src/engine/ControlOutputNode.cpp
+++ b/src/libs/engine/ControlOutputNode.cpp
diff --git a/src/engine/ControlOutputNode.h b/src/libs/engine/ControlOutputNode.h
index 64fd9ce6..64fd9ce6 100644
--- a/src/engine/ControlOutputNode.h
+++ b/src/libs/engine/ControlOutputNode.h
diff --git a/src/engine/Controller.h b/src/libs/engine/Controller.h
index facfb4c2..facfb4c2 100644
--- a/src/engine/Controller.h
+++ b/src/libs/engine/Controller.h
diff --git a/src/engine/DSSIPlugin.cpp b/src/libs/engine/DSSIPlugin.cpp
index e8525b7b..e8525b7b 100644
--- a/src/engine/DSSIPlugin.cpp
+++ b/src/libs/engine/DSSIPlugin.cpp
diff --git a/src/engine/DSSIPlugin.cpp.orig b/src/libs/engine/DSSIPlugin.cpp.orig
index 7c8060f0..7c8060f0 100644
--- a/src/engine/DSSIPlugin.cpp.orig
+++ b/src/libs/engine/DSSIPlugin.cpp.orig
diff --git a/src/engine/DSSIPlugin.h b/src/libs/engine/DSSIPlugin.h
index d546a8fe..d546a8fe 100644
--- a/src/engine/DSSIPlugin.h
+++ b/src/libs/engine/DSSIPlugin.h
diff --git a/src/engine/DSSIPlugin.h.orig b/src/libs/engine/DSSIPlugin.h.orig
index 816c65a7..816c65a7 100644
--- a/src/engine/DSSIPlugin.h.orig
+++ b/src/libs/engine/DSSIPlugin.h.orig
diff --git a/src/engine/Driver.h b/src/libs/engine/Driver.h
index be882d8d..be882d8d 100644
--- a/src/engine/Driver.h
+++ b/src/libs/engine/Driver.h
diff --git a/src/engine/Event.cpp b/src/libs/engine/Event.cpp
index 7d590e76..7d590e76 100644
--- a/src/engine/Event.cpp
+++ b/src/libs/engine/Event.cpp
diff --git a/src/engine/Event.h b/src/libs/engine/Event.h
index a6d06f83..a6d06f83 100644
--- a/src/engine/Event.h
+++ b/src/libs/engine/Event.h
diff --git a/src/engine/EventSource.h b/src/libs/engine/EventSource.h
index b038f427..b038f427 100644
--- a/src/engine/EventSource.h
+++ b/src/libs/engine/EventSource.h
diff --git a/src/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp
index 3837da1b..3837da1b 100644
--- a/src/engine/InputPort.cpp
+++ b/src/libs/engine/InputPort.cpp
diff --git a/src/engine/InputPort.h b/src/libs/engine/InputPort.h
index 0e5d9d68..0e5d9d68 100644
--- a/src/engine/InputPort.h
+++ b/src/libs/engine/InputPort.h
diff --git a/src/engine/InternalNode.h b/src/libs/engine/InternalNode.h
index fea2d3ad..fea2d3ad 100644
--- a/src/engine/InternalNode.h
+++ b/src/libs/engine/InternalNode.h
diff --git a/src/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp
index 0f5e3b1a..0f5e3b1a 100644
--- a/src/engine/JackAudioDriver.cpp
+++ b/src/libs/engine/JackAudioDriver.cpp
diff --git a/src/engine/JackAudioDriver.h b/src/libs/engine/JackAudioDriver.h
index c55d392f..c55d392f 100644
--- a/src/engine/JackAudioDriver.h
+++ b/src/libs/engine/JackAudioDriver.h
diff --git a/src/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp
index 40054b8a..40054b8a 100644
--- a/src/engine/JackMidiDriver.cpp
+++ b/src/libs/engine/JackMidiDriver.cpp
diff --git a/src/engine/JackMidiDriver.h b/src/libs/engine/JackMidiDriver.h
index 950d382f..950d382f 100644
--- a/src/engine/JackMidiDriver.h
+++ b/src/libs/engine/JackMidiDriver.h
diff --git a/src/engine/LADSPAPlugin.cpp b/src/libs/engine/LADSPAPlugin.cpp
index ddeb0be4..ddeb0be4 100644
--- a/src/engine/LADSPAPlugin.cpp
+++ b/src/libs/engine/LADSPAPlugin.cpp
diff --git a/src/engine/LADSPAPlugin.h b/src/libs/engine/LADSPAPlugin.h
index dc1ba5e1..dc1ba5e1 100644
--- a/src/engine/LADSPAPlugin.h
+++ b/src/libs/engine/LADSPAPlugin.h
diff --git a/src/engine/LV2Plugin.cpp b/src/libs/engine/LV2Plugin.cpp
index 1c74bca9..1c74bca9 100644
--- a/src/engine/LV2Plugin.cpp
+++ b/src/libs/engine/LV2Plugin.cpp
diff --git a/src/engine/LV2Plugin.h b/src/libs/engine/LV2Plugin.h
index c3d3038a..c3d3038a 100644
--- a/src/engine/LV2Plugin.h
+++ b/src/libs/engine/LV2Plugin.h
diff --git a/src/engine/LashDriver.cpp b/src/libs/engine/LashDriver.cpp
index f42f87f2..f42f87f2 100644
--- a/src/engine/LashDriver.cpp
+++ b/src/libs/engine/LashDriver.cpp
diff --git a/src/engine/LashDriver.h b/src/libs/engine/LashDriver.h
index dedf1c6b..dedf1c6b 100644
--- a/src/engine/LashDriver.h
+++ b/src/libs/engine/LashDriver.h
diff --git a/src/engine/List.h b/src/libs/engine/List.h
index cc51bc5d..cc51bc5d 100644
--- a/src/engine/List.h
+++ b/src/libs/engine/List.h
diff --git a/src/engine/Maid.cpp b/src/libs/engine/Maid.cpp
index 3bebdedb..3bebdedb 100644
--- a/src/engine/Maid.cpp
+++ b/src/libs/engine/Maid.cpp
diff --git a/src/engine/Maid.h b/src/libs/engine/Maid.h
index 75412186..75412186 100644
--- a/src/engine/Maid.h
+++ b/src/libs/engine/Maid.h
diff --git a/src/engine/MaidObject.h b/src/libs/engine/MaidObject.h
index d0060520..d0060520 100644
--- a/src/engine/MaidObject.h
+++ b/src/libs/engine/MaidObject.h
diff --git a/src/engine/Makefile.am b/src/libs/engine/Makefile.am
index ae0b3e53..ae0b3e53 100644
--- a/src/engine/Makefile.am
+++ b/src/libs/engine/Makefile.am
diff --git a/src/engine/MidiControlNode.cpp b/src/libs/engine/MidiControlNode.cpp
index 2116c828..2116c828 100644
--- a/src/engine/MidiControlNode.cpp
+++ b/src/libs/engine/MidiControlNode.cpp
diff --git a/src/engine/MidiControlNode.h b/src/libs/engine/MidiControlNode.h
index b40e7631..b40e7631 100644
--- a/src/engine/MidiControlNode.h
+++ b/src/libs/engine/MidiControlNode.h
diff --git a/src/engine/MidiDriver.h b/src/libs/engine/MidiDriver.h
index b8fd71ca..b8fd71ca 100644
--- a/src/engine/MidiDriver.h
+++ b/src/libs/engine/MidiDriver.h
diff --git a/src/engine/MidiInputNode.cpp b/src/libs/engine/MidiInputNode.cpp
index 25310807..25310807 100644
--- a/src/engine/MidiInputNode.cpp
+++ b/src/libs/engine/MidiInputNode.cpp
diff --git a/src/engine/MidiInputNode.h b/src/libs/engine/MidiInputNode.h
index 0986a267..0986a267 100644
--- a/src/engine/MidiInputNode.h
+++ b/src/libs/engine/MidiInputNode.h
diff --git a/src/engine/MidiMessage.h b/src/libs/engine/MidiMessage.h
index 8dcb3e67..8dcb3e67 100644
--- a/src/engine/MidiMessage.h
+++ b/src/libs/engine/MidiMessage.h
diff --git a/src/engine/MidiNoteNode.cpp b/src/libs/engine/MidiNoteNode.cpp
index 9dc32f4a..9dc32f4a 100644
--- a/src/engine/MidiNoteNode.cpp
+++ b/src/libs/engine/MidiNoteNode.cpp
diff --git a/src/engine/MidiNoteNode.h b/src/libs/engine/MidiNoteNode.h
index bf302144..bf302144 100644
--- a/src/engine/MidiNoteNode.h
+++ b/src/libs/engine/MidiNoteNode.h
diff --git a/src/engine/MidiOutputNode.cpp b/src/libs/engine/MidiOutputNode.cpp
index 33023cc6..33023cc6 100644
--- a/src/engine/MidiOutputNode.cpp
+++ b/src/libs/engine/MidiOutputNode.cpp
diff --git a/src/engine/MidiOutputNode.h b/src/libs/engine/MidiOutputNode.h
index 06d8a892..06d8a892 100644
--- a/src/engine/MidiOutputNode.h
+++ b/src/libs/engine/MidiOutputNode.h
diff --git a/src/engine/MidiTriggerNode.cpp b/src/libs/engine/MidiTriggerNode.cpp
index 4fda80e7..4fda80e7 100644
--- a/src/engine/MidiTriggerNode.cpp
+++ b/src/libs/engine/MidiTriggerNode.cpp
diff --git a/src/engine/MidiTriggerNode.h b/src/libs/engine/MidiTriggerNode.h
index 2f91c631..2f91c631 100644
--- a/src/engine/MidiTriggerNode.h
+++ b/src/libs/engine/MidiTriggerNode.h
diff --git a/src/engine/Node.h b/src/libs/engine/Node.h
index d169e772..d169e772 100644
--- a/src/engine/Node.h
+++ b/src/libs/engine/Node.h
diff --git a/src/engine/NodeBase.cpp b/src/libs/engine/NodeBase.cpp
index b1628539..b1628539 100644
--- a/src/engine/NodeBase.cpp
+++ b/src/libs/engine/NodeBase.cpp
diff --git a/src/engine/NodeBase.h b/src/libs/engine/NodeBase.h
index 796abbca..796abbca 100644
--- a/src/engine/NodeBase.h
+++ b/src/libs/engine/NodeBase.h
diff --git a/src/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 176d3f47..176d3f47 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
diff --git a/src/engine/NodeFactory.h b/src/libs/engine/NodeFactory.h
index ed6a35dc..ed6a35dc 100644
--- a/src/engine/NodeFactory.h
+++ b/src/libs/engine/NodeFactory.h
diff --git a/src/engine/OSCClient.cpp b/src/libs/engine/OSCClient.cpp
index 332a2144..332a2144 100644
--- a/src/engine/OSCClient.cpp
+++ b/src/libs/engine/OSCClient.cpp
diff --git a/src/engine/OSCClient.h b/src/libs/engine/OSCClient.h
index db14c696..db14c696 100644
--- a/src/engine/OSCClient.h
+++ b/src/libs/engine/OSCClient.h
diff --git a/src/engine/OSCReceiver.cpp b/src/libs/engine/OSCReceiver.cpp
index 8edab8b1..8edab8b1 100644
--- a/src/engine/OSCReceiver.cpp
+++ b/src/libs/engine/OSCReceiver.cpp
diff --git a/src/engine/OSCReceiver.h b/src/libs/engine/OSCReceiver.h
index b80c25c3..b80c25c3 100644
--- a/src/engine/OSCReceiver.h
+++ b/src/libs/engine/OSCReceiver.h
diff --git a/src/engine/OSCResponder.cpp b/src/libs/engine/OSCResponder.cpp
index 82e6b55d..82e6b55d 100644
--- a/src/engine/OSCResponder.cpp
+++ b/src/libs/engine/OSCResponder.cpp
diff --git a/src/engine/OSCResponder.h b/src/libs/engine/OSCResponder.h
index f579df98..f579df98 100644
--- a/src/engine/OSCResponder.h
+++ b/src/libs/engine/OSCResponder.h
diff --git a/src/engine/ObjectSender.cpp b/src/libs/engine/ObjectSender.cpp
index 3db6915d..3db6915d 100644
--- a/src/engine/ObjectSender.cpp
+++ b/src/libs/engine/ObjectSender.cpp
diff --git a/src/engine/ObjectSender.h b/src/libs/engine/ObjectSender.h
index f97f1f9e..f97f1f9e 100644
--- a/src/engine/ObjectSender.h
+++ b/src/libs/engine/ObjectSender.h
diff --git a/src/engine/ObjectStore.cpp b/src/libs/engine/ObjectStore.cpp
index a1cf1287..a1cf1287 100644
--- a/src/engine/ObjectStore.cpp
+++ b/src/libs/engine/ObjectStore.cpp
diff --git a/src/engine/ObjectStore.h b/src/libs/engine/ObjectStore.h
index 8c71c002..8c71c002 100644
--- a/src/engine/ObjectStore.h
+++ b/src/libs/engine/ObjectStore.h
diff --git a/src/engine/Om.cpp b/src/libs/engine/Om.cpp
index c04a7464..c04a7464 100644
--- a/src/engine/Om.cpp
+++ b/src/libs/engine/Om.cpp
diff --git a/src/engine/Om.h b/src/libs/engine/Om.h
index 2fe3fd8c..2fe3fd8c 100644
--- a/src/engine/Om.h
+++ b/src/libs/engine/Om.h
diff --git a/src/engine/OmApp.cpp b/src/libs/engine/OmApp.cpp
index ea7df1df..ea7df1df 100644
--- a/src/engine/OmApp.cpp
+++ b/src/libs/engine/OmApp.cpp
diff --git a/src/engine/OmApp.h b/src/libs/engine/OmApp.h
index 0fe49b81..0fe49b81 100644
--- a/src/engine/OmApp.h
+++ b/src/libs/engine/OmApp.h
diff --git a/src/engine/OmInProcess.cpp b/src/libs/engine/OmInProcess.cpp
index 971a1316..971a1316 100644
--- a/src/engine/OmInProcess.cpp
+++ b/src/libs/engine/OmInProcess.cpp
diff --git a/src/engine/OmObject.h b/src/libs/engine/OmObject.h
index 606a3dba..606a3dba 100644
--- a/src/engine/OmObject.h
+++ b/src/libs/engine/OmObject.h
diff --git a/src/engine/OutputPort.cpp b/src/libs/engine/OutputPort.cpp
index bf971919..bf971919 100644
--- a/src/engine/OutputPort.cpp
+++ b/src/libs/engine/OutputPort.cpp
diff --git a/src/engine/OutputPort.h b/src/libs/engine/OutputPort.h
index 90488a7f..90488a7f 100644
--- a/src/engine/OutputPort.h
+++ b/src/libs/engine/OutputPort.h
diff --git a/src/engine/Patch.cpp b/src/libs/engine/Patch.cpp
index be938cae..be938cae 100644
--- a/src/engine/Patch.cpp
+++ b/src/libs/engine/Patch.cpp
diff --git a/src/engine/Patch.h b/src/libs/engine/Patch.h
index e2a1ed48..e2a1ed48 100644
--- a/src/engine/Patch.h
+++ b/src/libs/engine/Patch.h
diff --git a/src/engine/Plugin.h b/src/libs/engine/Plugin.h
index d350b1e8..d350b1e8 100644
--- a/src/engine/Plugin.h
+++ b/src/libs/engine/Plugin.h
diff --git a/src/engine/PluginLibrary.h b/src/libs/engine/PluginLibrary.h
index 53279d8a..53279d8a 100644
--- a/src/engine/PluginLibrary.h
+++ b/src/libs/engine/PluginLibrary.h
diff --git a/src/engine/Port.cpp b/src/libs/engine/Port.cpp
index 987d232d..987d232d 100644
--- a/src/engine/Port.cpp
+++ b/src/libs/engine/Port.cpp
diff --git a/src/engine/Port.h b/src/libs/engine/Port.h
index f51d7382..f51d7382 100644
--- a/src/engine/Port.h
+++ b/src/libs/engine/Port.h
diff --git a/src/engine/PortBase.cpp b/src/libs/engine/PortBase.cpp
index 3d8dbc67..3d8dbc67 100644
--- a/src/engine/PortBase.cpp
+++ b/src/libs/engine/PortBase.cpp
diff --git a/src/engine/PortBase.h b/src/libs/engine/PortBase.h
index 9962538e..9962538e 100644
--- a/src/engine/PortBase.h
+++ b/src/libs/engine/PortBase.h
diff --git a/src/engine/PortInfo.h b/src/libs/engine/PortInfo.h
index 3fa4215a..3fa4215a 100644
--- a/src/engine/PortInfo.h
+++ b/src/libs/engine/PortInfo.h
diff --git a/src/engine/PostProcessor.cpp b/src/libs/engine/PostProcessor.cpp
index 65b92015..65b92015 100644
--- a/src/engine/PostProcessor.cpp
+++ b/src/libs/engine/PostProcessor.cpp
diff --git a/src/engine/PostProcessor.h b/src/libs/engine/PostProcessor.h
index 843569d8..843569d8 100644
--- a/src/engine/PostProcessor.h
+++ b/src/libs/engine/PostProcessor.h
diff --git a/src/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index 0734eb7a..0734eb7a 100644
--- a/src/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
diff --git a/src/engine/QueuedEngineInterface.h b/src/libs/engine/QueuedEngineInterface.h
index cc9c575f..cc9c575f 100644
--- a/src/engine/QueuedEngineInterface.h
+++ b/src/libs/engine/QueuedEngineInterface.h
diff --git a/src/engine/QueuedEvent.h b/src/libs/engine/QueuedEvent.h
index 16560aaa..16560aaa 100644
--- a/src/engine/QueuedEvent.h
+++ b/src/libs/engine/QueuedEvent.h
diff --git a/src/engine/QueuedEventSource.cpp b/src/libs/engine/QueuedEventSource.cpp
index 953eb5b1..953eb5b1 100644
--- a/src/engine/QueuedEventSource.cpp
+++ b/src/libs/engine/QueuedEventSource.cpp
diff --git a/src/engine/QueuedEventSource.h b/src/libs/engine/QueuedEventSource.h
index 002fc642..002fc642 100644
--- a/src/engine/QueuedEventSource.h
+++ b/src/libs/engine/QueuedEventSource.h
diff --git a/src/engine/Responder.h b/src/libs/engine/Responder.h
index cf16a20a..cf16a20a 100644
--- a/src/engine/Responder.h
+++ b/src/libs/engine/Responder.h
diff --git a/src/engine/TransportNode.cpp b/src/libs/engine/TransportNode.cpp
index f5183d56..f5183d56 100644
--- a/src/engine/TransportNode.cpp
+++ b/src/libs/engine/TransportNode.cpp
diff --git a/src/engine/TransportNode.h b/src/libs/engine/TransportNode.h
index 15b1059c..15b1059c 100644
--- a/src/engine/TransportNode.h
+++ b/src/libs/engine/TransportNode.h
diff --git a/src/engine/Tree.h b/src/libs/engine/Tree.h
index 033d48b7..033d48b7 100644
--- a/src/engine/Tree.h
+++ b/src/libs/engine/Tree.h
diff --git a/src/engine/TreeImplementation.h b/src/libs/engine/TreeImplementation.h
index a61ec407..a61ec407 100644
--- a/src/engine/TreeImplementation.h
+++ b/src/libs/engine/TreeImplementation.h
diff --git a/src/engine/cmdline.c b/src/libs/engine/cmdline.c
index 6b7ddf6a..6b7ddf6a 100644
--- a/src/engine/cmdline.c
+++ b/src/libs/engine/cmdline.c
diff --git a/src/engine/cmdline.ggo b/src/libs/engine/cmdline.ggo
index 8c006ca7..8c006ca7 100644
--- a/src/engine/cmdline.ggo
+++ b/src/libs/engine/cmdline.ggo
diff --git a/src/engine/cmdline.h b/src/libs/engine/cmdline.h
index fe36a969..fe36a969 100644
--- a/src/engine/cmdline.h
+++ b/src/libs/engine/cmdline.h
diff --git a/src/engine/events.h b/src/libs/engine/events.h
index f1bc5f58..f1bc5f58 100644
--- a/src/engine/events.h
+++ b/src/libs/engine/events.h
diff --git a/src/engine/events/ActivateEvent.cpp b/src/libs/engine/events/ActivateEvent.cpp
index 671b26d5..671b26d5 100644
--- a/src/engine/events/ActivateEvent.cpp
+++ b/src/libs/engine/events/ActivateEvent.cpp
diff --git a/src/engine/events/ActivateEvent.h b/src/libs/engine/events/ActivateEvent.h
index 280b5523..280b5523 100644
--- a/src/engine/events/ActivateEvent.h
+++ b/src/libs/engine/events/ActivateEvent.h
diff --git a/src/engine/events/AddNodeEvent.cpp b/src/libs/engine/events/AddNodeEvent.cpp
index 2b31ef4a..2b31ef4a 100644
--- a/src/engine/events/AddNodeEvent.cpp
+++ b/src/libs/engine/events/AddNodeEvent.cpp
diff --git a/src/engine/events/AddNodeEvent.h b/src/libs/engine/events/AddNodeEvent.h
index fe0236ba..fe0236ba 100644
--- a/src/engine/events/AddNodeEvent.h
+++ b/src/libs/engine/events/AddNodeEvent.h
diff --git a/src/engine/events/AllNotesOffEvent.cpp b/src/libs/engine/events/AllNotesOffEvent.cpp
index aa3a00f1..aa3a00f1 100644
--- a/src/engine/events/AllNotesOffEvent.cpp
+++ b/src/libs/engine/events/AllNotesOffEvent.cpp
diff --git a/src/engine/events/AllNotesOffEvent.h b/src/libs/engine/events/AllNotesOffEvent.h
index ea23301b..ea23301b 100644
--- a/src/engine/events/AllNotesOffEvent.h
+++ b/src/libs/engine/events/AllNotesOffEvent.h
diff --git a/src/engine/events/ClearPatchEvent.cpp b/src/libs/engine/events/ClearPatchEvent.cpp
index 8b8fc223..8b8fc223 100644
--- a/src/engine/events/ClearPatchEvent.cpp
+++ b/src/libs/engine/events/ClearPatchEvent.cpp
diff --git a/src/engine/events/ClearPatchEvent.h b/src/libs/engine/events/ClearPatchEvent.h
index c6e531a8..c6e531a8 100644
--- a/src/engine/events/ClearPatchEvent.h
+++ b/src/libs/engine/events/ClearPatchEvent.h
diff --git a/src/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp
index fe3b991e..fe3b991e 100644
--- a/src/engine/events/ConnectionEvent.cpp
+++ b/src/libs/engine/events/ConnectionEvent.cpp
diff --git a/src/engine/events/ConnectionEvent.h b/src/libs/engine/events/ConnectionEvent.h
index 8aaf2292..8aaf2292 100644
--- a/src/engine/events/ConnectionEvent.h
+++ b/src/libs/engine/events/ConnectionEvent.h
diff --git a/src/engine/events/CreatePatchEvent.cpp b/src/libs/engine/events/CreatePatchEvent.cpp
index 9f0ae7f2..9f0ae7f2 100644
--- a/src/engine/events/CreatePatchEvent.cpp
+++ b/src/libs/engine/events/CreatePatchEvent.cpp
diff --git a/src/engine/events/CreatePatchEvent.h b/src/libs/engine/events/CreatePatchEvent.h
index 507d03c7..507d03c7 100644
--- a/src/engine/events/CreatePatchEvent.h
+++ b/src/libs/engine/events/CreatePatchEvent.h
diff --git a/src/engine/events/DSSIConfigureEvent.cpp b/src/libs/engine/events/DSSIConfigureEvent.cpp
index 2ade4671..2ade4671 100644
--- a/src/engine/events/DSSIConfigureEvent.cpp
+++ b/src/libs/engine/events/DSSIConfigureEvent.cpp
diff --git a/src/engine/events/DSSIConfigureEvent.h b/src/libs/engine/events/DSSIConfigureEvent.h
index 00b4a134..00b4a134 100644
--- a/src/engine/events/DSSIConfigureEvent.h
+++ b/src/libs/engine/events/DSSIConfigureEvent.h
diff --git a/src/engine/events/DSSIControlEvent.cpp b/src/libs/engine/events/DSSIControlEvent.cpp
index ea3e70ac..ea3e70ac 100644
--- a/src/engine/events/DSSIControlEvent.cpp
+++ b/src/libs/engine/events/DSSIControlEvent.cpp
diff --git a/src/engine/events/DSSIControlEvent.h b/src/libs/engine/events/DSSIControlEvent.h
index 30a5279e..30a5279e 100644
--- a/src/engine/events/DSSIControlEvent.h
+++ b/src/libs/engine/events/DSSIControlEvent.h
diff --git a/src/engine/events/DSSIProgramEvent.cpp b/src/libs/engine/events/DSSIProgramEvent.cpp
index eb68ef77..eb68ef77 100644
--- a/src/engine/events/DSSIProgramEvent.cpp
+++ b/src/libs/engine/events/DSSIProgramEvent.cpp
diff --git a/src/engine/events/DSSIProgramEvent.h b/src/libs/engine/events/DSSIProgramEvent.h
index 152f3cb1..152f3cb1 100644
--- a/src/engine/events/DSSIProgramEvent.h
+++ b/src/libs/engine/events/DSSIProgramEvent.h
diff --git a/src/engine/events/DSSIUpdateEvent.cpp b/src/libs/engine/events/DSSIUpdateEvent.cpp
index 5650dd63..5650dd63 100644
--- a/src/engine/events/DSSIUpdateEvent.cpp
+++ b/src/libs/engine/events/DSSIUpdateEvent.cpp
diff --git a/src/engine/events/DSSIUpdateEvent.h b/src/libs/engine/events/DSSIUpdateEvent.h
index cdd8851e..cdd8851e 100644
--- a/src/engine/events/DSSIUpdateEvent.h
+++ b/src/libs/engine/events/DSSIUpdateEvent.h
diff --git a/src/engine/events/DeactivateEvent.cpp b/src/libs/engine/events/DeactivateEvent.cpp
index 48bff55a..48bff55a 100644
--- a/src/engine/events/DeactivateEvent.cpp
+++ b/src/libs/engine/events/DeactivateEvent.cpp
diff --git a/src/engine/events/DeactivateEvent.h b/src/libs/engine/events/DeactivateEvent.h
index 8401f332..8401f332 100644
--- a/src/engine/events/DeactivateEvent.h
+++ b/src/libs/engine/events/DeactivateEvent.h
diff --git a/src/engine/events/DestroyEvent.cpp b/src/libs/engine/events/DestroyEvent.cpp
index 3988195a..3988195a 100644
--- a/src/engine/events/DestroyEvent.cpp
+++ b/src/libs/engine/events/DestroyEvent.cpp
diff --git a/src/engine/events/DestroyEvent.h b/src/libs/engine/events/DestroyEvent.h
index fc579bf4..fc579bf4 100644
--- a/src/engine/events/DestroyEvent.h
+++ b/src/libs/engine/events/DestroyEvent.h
diff --git a/src/engine/events/DisablePatchEvent.cpp b/src/libs/engine/events/DisablePatchEvent.cpp
index a772e6e9..a772e6e9 100644
--- a/src/engine/events/DisablePatchEvent.cpp
+++ b/src/libs/engine/events/DisablePatchEvent.cpp
diff --git a/src/engine/events/DisablePatchEvent.h b/src/libs/engine/events/DisablePatchEvent.h
index f38f14af..f38f14af 100644
--- a/src/engine/events/DisablePatchEvent.h
+++ b/src/libs/engine/events/DisablePatchEvent.h
diff --git a/src/engine/events/DisconnectNodeEvent.cpp b/src/libs/engine/events/DisconnectNodeEvent.cpp
index 17367dd4..17367dd4 100644
--- a/src/engine/events/DisconnectNodeEvent.cpp
+++ b/src/libs/engine/events/DisconnectNodeEvent.cpp
diff --git a/src/engine/events/DisconnectNodeEvent.h b/src/libs/engine/events/DisconnectNodeEvent.h
index a82fbaec..a82fbaec 100644
--- a/src/engine/events/DisconnectNodeEvent.h
+++ b/src/libs/engine/events/DisconnectNodeEvent.h
diff --git a/src/engine/events/DisconnectPortEvent.cpp b/src/libs/engine/events/DisconnectPortEvent.cpp
index a4c213d5..a4c213d5 100644
--- a/src/engine/events/DisconnectPortEvent.cpp
+++ b/src/libs/engine/events/DisconnectPortEvent.cpp
diff --git a/src/engine/events/DisconnectPortEvent.h b/src/libs/engine/events/DisconnectPortEvent.h
index e8de4120..e8de4120 100644
--- a/src/engine/events/DisconnectPortEvent.h
+++ b/src/libs/engine/events/DisconnectPortEvent.h
diff --git a/src/engine/events/DisconnectionEvent.cpp b/src/libs/engine/events/DisconnectionEvent.cpp
index e7d06eab..e7d06eab 100644
--- a/src/engine/events/DisconnectionEvent.cpp
+++ b/src/libs/engine/events/DisconnectionEvent.cpp
diff --git a/src/engine/events/DisconnectionEvent.h b/src/libs/engine/events/DisconnectionEvent.h
index bbb70f3c..bbb70f3c 100644
--- a/src/engine/events/DisconnectionEvent.h
+++ b/src/libs/engine/events/DisconnectionEvent.h
diff --git a/src/engine/events/EnablePatchEvent.cpp b/src/libs/engine/events/EnablePatchEvent.cpp
index 6af3b844..6af3b844 100644
--- a/src/engine/events/EnablePatchEvent.cpp
+++ b/src/libs/engine/events/EnablePatchEvent.cpp
diff --git a/src/engine/events/EnablePatchEvent.h b/src/libs/engine/events/EnablePatchEvent.h
index f3d22e69..f3d22e69 100644
--- a/src/engine/events/EnablePatchEvent.h
+++ b/src/libs/engine/events/EnablePatchEvent.h
diff --git a/src/engine/events/LashRestoreDoneEvent.h b/src/libs/engine/events/LashRestoreDoneEvent.h
index dfc5b120..dfc5b120 100644
--- a/src/engine/events/LashRestoreDoneEvent.h
+++ b/src/libs/engine/events/LashRestoreDoneEvent.h
diff --git a/src/engine/events/LoadPluginsEvent.cpp b/src/libs/engine/events/LoadPluginsEvent.cpp
index 656e9010..656e9010 100644
--- a/src/engine/events/LoadPluginsEvent.cpp
+++ b/src/libs/engine/events/LoadPluginsEvent.cpp
diff --git a/src/engine/events/LoadPluginsEvent.h b/src/libs/engine/events/LoadPluginsEvent.h
index b69dbb38..b69dbb38 100644
--- a/src/engine/events/LoadPluginsEvent.h
+++ b/src/libs/engine/events/LoadPluginsEvent.h
diff --git a/src/engine/events/Makefile.am b/src/libs/engine/events/Makefile.am
index 5b29e12b..5b29e12b 100644
--- a/src/engine/events/Makefile.am
+++ b/src/libs/engine/events/Makefile.am
diff --git a/src/engine/events/MidiLearnEvent.cpp b/src/libs/engine/events/MidiLearnEvent.cpp
index 63ad82fc..63ad82fc 100644
--- a/src/engine/events/MidiLearnEvent.cpp
+++ b/src/libs/engine/events/MidiLearnEvent.cpp
diff --git a/src/engine/events/MidiLearnEvent.h b/src/libs/engine/events/MidiLearnEvent.h
index 793e675a..793e675a 100644
--- a/src/engine/events/MidiLearnEvent.h
+++ b/src/libs/engine/events/MidiLearnEvent.h
diff --git a/src/engine/events/NoteOffEvent.cpp b/src/libs/engine/events/NoteOffEvent.cpp
index fde2e520..fde2e520 100644
--- a/src/engine/events/NoteOffEvent.cpp
+++ b/src/libs/engine/events/NoteOffEvent.cpp
diff --git a/src/engine/events/NoteOffEvent.h b/src/libs/engine/events/NoteOffEvent.h
index edd0b373..edd0b373 100644
--- a/src/engine/events/NoteOffEvent.h
+++ b/src/libs/engine/events/NoteOffEvent.h
diff --git a/src/engine/events/NoteOnEvent.cpp b/src/libs/engine/events/NoteOnEvent.cpp
index 9688af79..9688af79 100644
--- a/src/engine/events/NoteOnEvent.cpp
+++ b/src/libs/engine/events/NoteOnEvent.cpp
diff --git a/src/engine/events/NoteOnEvent.h b/src/libs/engine/events/NoteOnEvent.h
index 1e09e450..1e09e450 100644
--- a/src/engine/events/NoteOnEvent.h
+++ b/src/libs/engine/events/NoteOnEvent.h
diff --git a/src/engine/events/PingQueuedEvent.h b/src/libs/engine/events/PingQueuedEvent.h
index cfba7058..cfba7058 100644
--- a/src/engine/events/PingQueuedEvent.h
+++ b/src/libs/engine/events/PingQueuedEvent.h
diff --git a/src/engine/events/RegisterClientEvent.cpp b/src/libs/engine/events/RegisterClientEvent.cpp
index ca7dd1f6..ca7dd1f6 100644
--- a/src/engine/events/RegisterClientEvent.cpp
+++ b/src/libs/engine/events/RegisterClientEvent.cpp
diff --git a/src/engine/events/RegisterClientEvent.h b/src/libs/engine/events/RegisterClientEvent.h
index f4b6b60f..f4b6b60f 100644
--- a/src/engine/events/RegisterClientEvent.h
+++ b/src/libs/engine/events/RegisterClientEvent.h
diff --git a/src/engine/events/RenameEvent.cpp b/src/libs/engine/events/RenameEvent.cpp
index e2e98dd0..e2e98dd0 100644
--- a/src/engine/events/RenameEvent.cpp
+++ b/src/libs/engine/events/RenameEvent.cpp
diff --git a/src/engine/events/RenameEvent.h b/src/libs/engine/events/RenameEvent.h
index c1c9fe91..c1c9fe91 100644
--- a/src/engine/events/RenameEvent.h
+++ b/src/libs/engine/events/RenameEvent.h
diff --git a/src/engine/events/RequestAllObjectsEvent.cpp b/src/libs/engine/events/RequestAllObjectsEvent.cpp
index ef40a0de..ef40a0de 100644
--- a/src/engine/events/RequestAllObjectsEvent.cpp
+++ b/src/libs/engine/events/RequestAllObjectsEvent.cpp
diff --git a/src/engine/events/RequestAllObjectsEvent.h b/src/libs/engine/events/RequestAllObjectsEvent.h
index df63a577..df63a577 100644
--- a/src/engine/events/RequestAllObjectsEvent.h
+++ b/src/libs/engine/events/RequestAllObjectsEvent.h
diff --git a/src/engine/events/RequestMetadataEvent.cpp b/src/libs/engine/events/RequestMetadataEvent.cpp
index 10e1007c..10e1007c 100644
--- a/src/engine/events/RequestMetadataEvent.cpp
+++ b/src/libs/engine/events/RequestMetadataEvent.cpp
diff --git a/src/engine/events/RequestMetadataEvent.h b/src/libs/engine/events/RequestMetadataEvent.h
index e4243eb3..e4243eb3 100644
--- a/src/engine/events/RequestMetadataEvent.h
+++ b/src/libs/engine/events/RequestMetadataEvent.h
diff --git a/src/engine/events/RequestPluginsEvent.cpp b/src/libs/engine/events/RequestPluginsEvent.cpp
index 89dbefd5..89dbefd5 100644
--- a/src/engine/events/RequestPluginsEvent.cpp
+++ b/src/libs/engine/events/RequestPluginsEvent.cpp
diff --git a/src/engine/events/RequestPluginsEvent.h b/src/libs/engine/events/RequestPluginsEvent.h
index 83447fb3..83447fb3 100644
--- a/src/engine/events/RequestPluginsEvent.h
+++ b/src/libs/engine/events/RequestPluginsEvent.h
diff --git a/src/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp
index e4d3985e..e4d3985e 100644
--- a/src/engine/events/RequestPortValueEvent.cpp
+++ b/src/libs/engine/events/RequestPortValueEvent.cpp
diff --git a/src/engine/events/RequestPortValueEvent.h b/src/libs/engine/events/RequestPortValueEvent.h
index d970ee9c..d970ee9c 100644
--- a/src/engine/events/RequestPortValueEvent.h
+++ b/src/libs/engine/events/RequestPortValueEvent.h
diff --git a/src/engine/events/SetMetadataEvent.cpp b/src/libs/engine/events/SetMetadataEvent.cpp
index 614f7ca9..614f7ca9 100644
--- a/src/engine/events/SetMetadataEvent.cpp
+++ b/src/libs/engine/events/SetMetadataEvent.cpp
diff --git a/src/engine/events/SetMetadataEvent.h b/src/libs/engine/events/SetMetadataEvent.h
index ef471033..ef471033 100644
--- a/src/engine/events/SetMetadataEvent.h
+++ b/src/libs/engine/events/SetMetadataEvent.h
diff --git a/src/engine/events/SetPortValueEvent.cpp b/src/libs/engine/events/SetPortValueEvent.cpp
index 964cd9ca..964cd9ca 100644
--- a/src/engine/events/SetPortValueEvent.cpp
+++ b/src/libs/engine/events/SetPortValueEvent.cpp
diff --git a/src/engine/events/SetPortValueEvent.h b/src/libs/engine/events/SetPortValueEvent.h
index 0a9614b9..0a9614b9 100644
--- a/src/engine/events/SetPortValueEvent.h
+++ b/src/libs/engine/events/SetPortValueEvent.h
diff --git a/src/engine/events/SetPortValueQueuedEvent.cpp b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
index e73c0486..e73c0486 100644
--- a/src/engine/events/SetPortValueQueuedEvent.cpp
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.cpp
diff --git a/src/engine/events/SetPortValueQueuedEvent.h b/src/libs/engine/events/SetPortValueQueuedEvent.h
index b92beacf..b92beacf 100644
--- a/src/engine/events/SetPortValueQueuedEvent.h
+++ b/src/libs/engine/events/SetPortValueQueuedEvent.h
diff --git a/src/engine/events/UnregisterClientEvent.cpp b/src/libs/engine/events/UnregisterClientEvent.cpp
index ef5a9979..ef5a9979 100644
--- a/src/engine/events/UnregisterClientEvent.cpp
+++ b/src/libs/engine/events/UnregisterClientEvent.cpp
diff --git a/src/engine/events/UnregisterClientEvent.h b/src/libs/engine/events/UnregisterClientEvent.h
index fdbdb314..fdbdb314 100644
--- a/src/engine/events/UnregisterClientEvent.h
+++ b/src/libs/engine/events/UnregisterClientEvent.h
diff --git a/src/engine/instantiations.cpp b/src/libs/engine/instantiations.cpp
index e2b0088d..e2b0088d 100644
--- a/src/engine/instantiations.cpp
+++ b/src/libs/engine/instantiations.cpp
diff --git a/src/engine/main.cpp b/src/libs/engine/main.cpp
index a69c7e76..a69c7e76 100644
--- a/src/engine/main.cpp
+++ b/src/libs/engine/main.cpp
diff --git a/src/engine/midi.h b/src/libs/engine/midi.h
index 6575ede7..6575ede7 100644
--- a/src/engine/midi.h
+++ b/src/libs/engine/midi.h
diff --git a/src/engine/tests/Makefile.am b/src/libs/engine/tests/Makefile.am
index 54f6ad1f..54f6ad1f 100644
--- a/src/engine/tests/Makefile.am
+++ b/src/libs/engine/tests/Makefile.am
diff --git a/src/engine/tests/list_test.cpp b/src/libs/engine/tests/list_test.cpp
index d2f91c9d..d2f91c9d 100644
--- a/src/engine/tests/list_test.cpp
+++ b/src/libs/engine/tests/list_test.cpp
diff --git a/src/engine/tests/node_tree_test.cpp b/src/libs/engine/tests/node_tree_test.cpp
index 2bce9b97..2bce9b97 100644
--- a/src/engine/tests/node_tree_test.cpp
+++ b/src/libs/engine/tests/node_tree_test.cpp
diff --git a/src/engine/tests/old_node_tree_test.cpp b/src/libs/engine/tests/old_node_tree_test.cpp
index 3b5ed485..3b5ed485 100644
--- a/src/engine/tests/old_node_tree_test.cpp
+++ b/src/libs/engine/tests/old_node_tree_test.cpp
diff --git a/src/engine/tests/queue_test.cpp b/src/libs/engine/tests/queue_test.cpp
index 3381a329..3381a329 100644
--- a/src/engine/tests/queue_test.cpp
+++ b/src/libs/engine/tests/queue_test.cpp
diff --git a/src/engine/tuning.h b/src/libs/engine/tuning.h
index aeec81da..aeec81da 100644
--- a/src/engine/tuning.h
+++ b/src/libs/engine/tuning.h
diff --git a/src/engine/util.h b/src/libs/engine/util.h
index 9cf4bf7f..9cf4bf7f 100644
--- a/src/engine/util.h
+++ b/src/libs/engine/util.h
diff --git a/src/progs/om/Makefile.am b/src/progs/om/Makefile.am
new file mode 100644
index 00000000..ae0b3e53
--- /dev/null
+++ b/src/progs/om/Makefile.am
@@ -0,0 +1,259 @@
+SUBDIRS = tests
+DIST_SUBDIRS = events
+
+AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/engine/events -fno-exceptions -fno-rtti
+
+MAINTAINERCLEANFILES = Makefile.in
+
+common_SOURCES = \
+	util.h \
+	tuning.h \
+	Node.h \
+	NodeBase.h \
+	NodeBase.cpp \
+	InternalNode.h \
+	Patch.h \
+	Patch.cpp \
+	NodeFactory.h \
+	NodeFactory.cpp \
+	Om.h \
+	Om.cpp \
+	OmApp.h \
+	OmApp.cpp \
+	JackAudioDriver.h \
+	JackAudioDriver.cpp \
+	OSCReceiver.h \
+	OSCReceiver.cpp \
+	Responder.h \
+	OSCResponder.h \
+	OSCResponder.cpp \
+	ClientKey.h \
+	ClientBroadcaster.h \
+	ClientBroadcaster.cpp \
+	ObjectSender.h \
+	ObjectSender.cpp \
+	OSCClient.h \
+	OSCClient.cpp \
+	Buffer.h \
+	Buffer.cpp \
+	Port.h \
+	Port.cpp \
+	PortBase.h \
+	PortBase.cpp \
+	InputPort.h \
+	InputPort.cpp \
+	OutputPort.h \
+	OutputPort.cpp \
+	MidiMessage.h \
+	MidiNoteNode.h \
+	MidiNoteNode.cpp \
+	MidiTriggerNode.h \
+	MidiTriggerNode.cpp \
+	MidiControlNode.h \
+	MidiControlNode.cpp \
+	BridgeNode.h \
+	BridgeNode.cpp \
+	ControlInputNode.h \
+	ControlInputNode.cpp \
+	ControlOutputNode.h \
+	ControlOutputNode.cpp \
+	AudioInputNode.h \
+	AudioInputNode.cpp \
+	AudioOutputNode.h \
+	AudioOutputNode.cpp \
+	MidiInputNode.h \
+	MidiInputNode.cpp \
+	MidiOutputNode.h \
+	MidiOutputNode.cpp \
+	Event.h \
+	Event.cpp \
+	QueuedEvent.h \
+	EventSource.h \
+	QueuedEventSource.h \
+	QueuedEventSource.cpp \
+	QueuedEngineInterface.h \
+	QueuedEngineInterface.cpp \
+	OmObject.h \
+	Maid.h \
+	Maid.cpp \
+	MaidObject.h \
+	Tree.h \
+	ClientRecord.h \
+	PortInfo.h \
+	PluginLibrary.h \
+	Plugin.h \
+	Array.h \
+	List.h \
+	PostProcessor.h \
+	PostProcessor.cpp \
+	Connection.h \
+	Connection.cpp \
+	ConnectionBase.h \
+	ConnectionBase.cpp \
+	ObjectStore.h \
+	ObjectStore.cpp \
+	TransportNode.h \
+	TransportNode.cpp \
+	Driver.h \
+	AudioDriver.h \
+	MidiDriver.h \
+	midi.h \
+	../common/util/Semaphore.h \
+	../common/util/types.h \
+	../common/util/Path.h \
+	../common/util/Queue.h \
+	../common/interface/ClientInterface.h \
+	../common/interface/EngineInterface.h \
+	instantiations.cpp
+
+# Events
+common_SOURCES += \
+	events/RegisterClientEvent.h \
+	events/RegisterClientEvent.cpp \
+	events/UnregisterClientEvent.h \
+	events/UnregisterClientEvent.cpp \
+	events/PingQueuedEvent.h \
+	events/ActivateEvent.h \
+	events/ActivateEvent.cpp \
+	events/DeactivateEvent.h \
+	events/DeactivateEvent.cpp \
+	events/SetPortValueEvent.h \
+	events/SetPortValueEvent.cpp \
+	events/SetPortValueQueuedEvent.h \
+	events/SetPortValueQueuedEvent.cpp \
+	events/NoteOnEvent.h \
+	events/NoteOnEvent.cpp \
+	events/NoteOffEvent.h \
+	events/NoteOffEvent.cpp \
+	events/AllNotesOffEvent.h \
+	events/AllNotesOffEvent.cpp \
+	events/ConnectionEvent.h \
+	events/ConnectionEvent.cpp \
+	events/DisconnectionEvent.h \
+	events/DisconnectionEvent.cpp \
+	events/DisconnectNodeEvent.h \
+	events/DisconnectNodeEvent.cpp \
+	events/DisconnectPortEvent.h \
+	events/DisconnectPortEvent.cpp \
+	events/DestroyEvent.h \
+	events/DestroyEvent.cpp \
+	events/AddNodeEvent.h \
+	events/AddNodeEvent.cpp \
+	events/SetMetadataEvent.h \
+	events/SetMetadataEvent.cpp \
+	events/RequestMetadataEvent.h \
+	events/RequestMetadataEvent.cpp \
+	events/RequestPortValueEvent.h \
+	events/RequestPortValueEvent.cpp \
+	events/RequestAllObjectsEvent.h \
+	events/RequestAllObjectsEvent.cpp \
+	events/RequestPluginsEvent.h \
+	events/RequestPluginsEvent.cpp \
+	events/CreatePatchEvent.h \
+	events/CreatePatchEvent.cpp \
+	events/LoadPluginsEvent.h \
+	events/LoadPluginsEvent.cpp \
+	events/EnablePatchEvent.h \
+	events/EnablePatchEvent.cpp \
+	events/DisablePatchEvent.h \
+	events/DisablePatchEvent.cpp \
+	events/ClearPatchEvent.h \
+	events/ClearPatchEvent.cpp \
+	events/RenameEvent.h \
+	events/RenameEvent.cpp \
+	events/MidiLearnEvent.h \
+	events/MidiLearnEvent.cpp
+
+if WITH_JACK_MIDI
+common_SOURCES += \
+	JackMidiDriver.h \
+	JackMidiDriver.cpp
+endif
+
+if WITH_ALSA_MIDI
+common_SOURCES += \
+	AlsaMidiDriver.h \
+	AlsaMidiDriver.cpp
+endif
+
+if WITH_LADSPA
+common_SOURCES += \
+	LADSPAPlugin.h \
+	LADSPAPlugin.cpp
+endif
+
+if WITH_DSSI
+common_SOURCES += \
+	DSSIPlugin.h \
+	DSSIPlugin.cpp \
+	events/DSSIConfigureEvent.cpp \
+	events/DSSIConfigureEvent.h \
+	events/DSSIControlEvent.cpp \
+	events/DSSIControlEvent.h \
+	events/DSSIProgramEvent.cpp \
+	events/DSSIProgramEvent.h \
+	events/DSSIUpdateEvent.cpp \
+	events/DSSIUpdateEvent.h
+endif
+
+if WITH_LV2
+common_SOURCES += \
+	LV2Plugin.h \
+	LV2Plugin.cpp
+endif
+
+if WITH_LASH
+common_SOURCES += \
+	LashDriver.h \
+	LashDriver.cpp \
+	LashRestoreDoneEvent.h
+endif
+
+
+#
+# Non-installed library to link stand-alone and in-process build against
+#
+
+noinst_LTLIBRARIES = libom.la
+libom_la_SOURCES = $(common_SOURCES)
+
+
+
+#
+# Stand-alone engine
+#
+if BUILD_ENGINE
+
+bin_PROGRAMS = om
+om_DEPENDENCIES = libom.la
+om_LDADD = @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@ -lrt libom.la
+
+om_SOURCES = \
+	main.cpp \
+	cmdline.h \
+	cmdline.c
+
+endif # BUILD_ENGINE
+
+
+
+#
+# Jack internal client
+#
+if BUILD_IN_PROCESS_ENGINE
+
+
+# FIXME: broken
+
+
+# FIXME: Figure out how to get this properly
+omdir = $(prefix)/lib/jack
+
+om_la_CFLAGS = -fPIC
+om_LTLIBRARIES = om.la
+om_la_LDFLAGS = -module -avoid-version @JACK_LIBS@ @LOSC_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @SLV2_LIBS@
+om_la_SOURCES = OmInProcess.cpp
+
+endif # BUILD_IN_PROCESS_ENGINE
+
+