diff options
Diffstat (limited to 'src/engine')
37 files changed, 61 insertions, 55 deletions
diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp index 8013fa32..76d47e26 100644 --- a/src/engine/Buffer.hpp +++ b/src/engine/Buffer.hpp @@ -24,7 +24,7 @@ #include <boost/intrusive_ptr.hpp> #include "raul/Deletable.hpp" #include "raul/SharedPtr.hpp" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "types.hpp" #include "BufferFactory.hpp" diff --git a/src/engine/BufferFactory.hpp b/src/engine/BufferFactory.hpp index e2ac98bb..959e7e73 100644 --- a/src/engine/BufferFactory.hpp +++ b/src/engine/BufferFactory.hpp @@ -20,7 +20,7 @@ #include <map> #include <boost/intrusive_ptr.hpp> -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "glibmm/thread.h" #include "raul/RingBuffer.hpp" #include "raul/AtomicPtr.hpp" diff --git a/src/engine/ClientBroadcaster.cpp b/src/engine/ClientBroadcaster.cpp index b3a90628..f83b56a6 100644 --- a/src/engine/ClientBroadcaster.cpp +++ b/src/engine/ClientBroadcaster.cpp @@ -18,7 +18,7 @@ #include <cassert> #include <unistd.h> #include "raul/log.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "ClientBroadcaster.hpp" #include "PluginImpl.hpp" #include "ConnectionImpl.hpp" diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index 11668218..4d1a460d 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -23,7 +23,7 @@ #include <map> #include <pthread.h> #include "raul/SharedPtr.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "NodeFactory.hpp" using namespace std; diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp index ea38226f..09dd208a 100644 --- a/src/engine/ConnectionImpl.hpp +++ b/src/engine/ConnectionImpl.hpp @@ -23,8 +23,8 @@ #include "raul/log.hpp" #include "raul/Deletable.hpp" #include "raul/IntrusivePtr.hpp" -#include "interface/PortType.hpp" -#include "interface/Connection.hpp" +#include "ingen/PortType.hpp" +#include "ingen/Connection.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "PortImpl.hpp" diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp index f87ec338..c744b54f 100644 --- a/src/engine/Driver.hpp +++ b/src/engine/Driver.hpp @@ -21,8 +21,8 @@ #include <string> #include <boost/utility.hpp> #include "raul/Deletable.hpp" -#include "interface/PortType.hpp" -#include "interface/EventType.hpp" +#include "ingen/PortType.hpp" +#include "ingen/EventType.hpp" #include "DuplexPort.hpp" namespace Raul { class Path; } diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index 514e286f..3979cfa9 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -23,7 +23,7 @@ #include "raul/Maid.hpp" #include "raul/SharedPtr.hpp" #include "lv2/lv2plug.in/ns/ext/uri-map/uri-map.h" -#include "common/interface/EventType.hpp" +#include "ingen/EventType.hpp" #include "events/CreatePatch.hpp" #include "events/CreatePort.hpp" #include "module/World.hpp" diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index e79dbb9f..920acfa3 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -26,8 +26,8 @@ #include "raul/SharedPtr.hpp" -#include "interface/PortType.hpp" -#include "interface/EventType.hpp" +#include "ingen/PortType.hpp" +#include "ingen/EventType.hpp" namespace Raul { class Maid; } diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp index 567abcab..9757ace7 100644 --- a/src/engine/EventBuffer.hpp +++ b/src/engine/EventBuffer.hpp @@ -21,7 +21,7 @@ #include "lv2/lv2plug.in/ns/ext/atom/atom.h" #include "lv2/lv2plug.in/ns/ext/event/event.h" #include "lv2/lv2plug.in/ns/ext/event/event-helpers.h" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "Buffer.hpp" namespace Ingen { diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp index 59f28b3e..251559f3 100644 --- a/src/engine/GraphObjectImpl.hpp +++ b/src/engine/GraphObjectImpl.hpp @@ -25,7 +25,7 @@ #include "raul/Deletable.hpp" #include "raul/Path.hpp" #include "raul/SharedPtr.hpp" -#include "interface/GraphObject.hpp" +#include "ingen/GraphObject.hpp" #include "shared/ResourceImpl.hpp" namespace Raul { class Maid; } diff --git a/src/engine/HTTPClientSender.hpp b/src/engine/HTTPClientSender.hpp index 630bdd5a..4d74358f 100644 --- a/src/engine/HTTPClientSender.hpp +++ b/src/engine/HTTPClientSender.hpp @@ -22,7 +22,7 @@ #include <string> #include <pthread.h> #include "raul/Thread.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "shared/HTTPSender.hpp" namespace Ingen { diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index 81481f02..b2678754 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -26,7 +26,7 @@ #include "raul/SharedPtr.hpp" #include "raul/log.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "module/Module.hpp" #include "serialisation/Parser.hpp" #include "serialisation/Serialiser.hpp" diff --git a/src/engine/InputPort.cpp b/src/engine/InputPort.cpp index f82b522a..f65b9a5a 100644 --- a/src/engine/InputPort.cpp +++ b/src/engine/InputPort.cpp @@ -18,7 +18,7 @@ #include "InputPort.hpp" #include <cstdlib> #include <cassert> -#include "interface/Patch.hpp" +#include "ingen/Patch.hpp" #include "shared/LV2URIMap.hpp" #include "AudioBuffer.hpp" #include "BufferFactory.hpp" diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp index d57861c9..4d98bb2a 100644 --- a/src/engine/NodeImpl.hpp +++ b/src/engine/NodeImpl.hpp @@ -23,7 +23,7 @@ #include "raul/AtomicInt.hpp" #include "raul/IntrusivePtr.hpp" #include "raul/Semaphore.hpp" -#include "interface/Node.hpp" +#include "ingen/Node.hpp" #include "GraphObjectImpl.hpp" #include "types.hpp" diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index 75f330b3..786f9ee9 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -29,7 +29,7 @@ #include "PatchImpl.hpp" #include "PluginImpl.hpp" #include "PortImpl.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "util.hpp" using namespace std; diff --git a/src/engine/OSCClientSender.hpp b/src/engine/OSCClientSender.hpp index 7df10d15..5b775846 100644 --- a/src/engine/OSCClientSender.hpp +++ b/src/engine/OSCClientSender.hpp @@ -22,8 +22,8 @@ #include <string> #include <lo/lo.h> #include <pthread.h> -#include "interface/ClientInterface.hpp" -#include "interface/GraphObject.hpp" +#include "ingen/ClientInterface.hpp" +#include "ingen/GraphObject.hpp" #include "shared/OSCSender.hpp" namespace Ingen { diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index 50dcb78f..60cf483e 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -17,19 +17,25 @@ //#define ENABLE_AVAHI 1 -#include <cstdlib> +#include <stdlib.h> +#include <stdio.h> + #include <string> + #include <lo/lo.h> -#include "ingen-config.h" -#include "raul/log.hpp" + #include "raul/AtomLiblo.hpp" #include "raul/SharedPtr.hpp" -#include "interface/ClientInterface.hpp" +#include "raul/log.hpp" + +#include "ingen-config.h" +#include "ingen/ClientInterface.hpp" + #include "ClientBroadcaster.hpp" #include "Engine.hpp" +#include "EventSource.hpp" #include "OSCClientSender.hpp" #include "OSCEngineReceiver.hpp" -#include "EventSource.hpp" #include "ThreadManager.hpp" #define LOG(s) s << "[OSCEngineReceiver] " diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp index 9854e025..7066c025 100644 --- a/src/engine/ObjectBuffer.hpp +++ b/src/engine/ObjectBuffer.hpp @@ -19,7 +19,7 @@ #define INGEN_ENGINE_OBJECTBUFFER_HPP #include "lv2/lv2plug.in/ns/ext/atom/atom.h" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "Buffer.hpp" namespace Ingen { diff --git a/src/engine/ObjectSender.cpp b/src/engine/ObjectSender.cpp index b962da2e..ee977fdc 100644 --- a/src/engine/ObjectSender.cpp +++ b/src/engine/ObjectSender.cpp @@ -16,7 +16,7 @@ */ #include "ObjectSender.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "shared/LV2URIMap.hpp" #include "EngineStore.hpp" #include "PatchImpl.hpp" @@ -24,7 +24,7 @@ #include "PortImpl.hpp" #include "ConnectionImpl.hpp" #include "NodeFactory.hpp" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "AudioBuffer.hpp" using namespace std; diff --git a/src/engine/OutputPort.cpp b/src/engine/OutputPort.cpp index a4e997a5..d647fbdd 100644 --- a/src/engine/OutputPort.cpp +++ b/src/engine/OutputPort.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "interface/Patch.hpp" +#include "ingen/Patch.hpp" #include "shared/LV2URIMap.hpp" #include "Buffer.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp index 77f2cb43..1ecb5bae 100644 --- a/src/engine/PatchImpl.hpp +++ b/src/engine/PatchImpl.hpp @@ -21,8 +21,8 @@ #include <cstdlib> #include <string> #include "raul/List.hpp" -#include "interface/PortType.hpp" -#include "interface/Patch.hpp" +#include "ingen/PortType.hpp" +#include "ingen/Patch.hpp" #include "NodeImpl.hpp" #include "PluginImpl.hpp" #include "CompiledPatch.hpp" diff --git a/src/engine/PluginImpl.hpp b/src/engine/PluginImpl.hpp index bf6be506..fca6320e 100644 --- a/src/engine/PluginImpl.hpp +++ b/src/engine/PluginImpl.hpp @@ -24,7 +24,7 @@ #include <boost/utility.hpp> #include <glibmm/module.h> -#include "interface/Plugin.hpp" +#include "ingen/Plugin.hpp" #include "shared/ResourceImpl.hpp" namespace Ingen { diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp index 29ac4b31..a2bb594b 100644 --- a/src/engine/PortImpl.cpp +++ b/src/engine/PortImpl.cpp @@ -19,7 +19,7 @@ #include "raul/Maid.hpp" #include "shared/LV2URIMap.hpp" #include "lv2/lv2plug.in/ns/ext/contexts/contexts.h" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "events/SendPortValue.hpp" #include "events/SendPortActivity.hpp" #include "AudioBuffer.hpp" diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp index c9b74ca4..58fd6ea5 100644 --- a/src/engine/PortImpl.hpp +++ b/src/engine/PortImpl.hpp @@ -23,10 +23,10 @@ #include <set> #include "raul/Array.hpp" #include "raul/Atom.hpp" -#include "interface/Port.hpp" +#include "ingen/Port.hpp" #include "types.hpp" #include "GraphObjectImpl.hpp" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "Buffer.hpp" #include "Context.hpp" diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 2c1e94b9..6cdb618d 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -22,9 +22,9 @@ #include <string> #include <memory> #include "raul/SharedPtr.hpp" -#include "interface/ClientInterface.hpp" -#include "interface/EngineInterface.hpp" -#include "interface/Resource.hpp" +#include "ingen/ClientInterface.hpp" +#include "ingen/EngineInterface.hpp" +#include "ingen/Resource.hpp" #include "EventSource.hpp" #include "Request.hpp" #include "tuning.hpp" diff --git a/src/engine/Request.hpp b/src/engine/Request.hpp index 9f68d7f9..17930554 100644 --- a/src/engine/Request.hpp +++ b/src/engine/Request.hpp @@ -20,7 +20,7 @@ #include <inttypes.h> #include <string> -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "EventSource.hpp" namespace Ingen { diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp index 456bcc04..1e341c1a 100644 --- a/src/engine/events/CreateNode.hpp +++ b/src/engine/events/CreateNode.hpp @@ -20,7 +20,7 @@ #include <string> #include "QueuedEvent.hpp" -#include "interface/Resource.hpp" +#include "ingen/Resource.hpp" namespace Ingen { diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp index d10bb605..84c0c0aa 100644 --- a/src/engine/events/CreatePatch.hpp +++ b/src/engine/events/CreatePatch.hpp @@ -19,7 +19,7 @@ #define INGEN_EVENTS_CREATEPATCH_HPP #include "QueuedEvent.hpp" -#include "interface/Resource.hpp" +#include "ingen/Resource.hpp" namespace Ingen { diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp index 9fd56530..1bee8be6 100644 --- a/src/engine/events/CreatePort.hpp +++ b/src/engine/events/CreatePort.hpp @@ -21,8 +21,8 @@ #include "QueuedEvent.hpp" #include "raul/Path.hpp" #include "raul/Array.hpp" -#include "interface/PortType.hpp" -#include "interface/Resource.hpp" +#include "ingen/PortType.hpp" +#include "ingen/Resource.hpp" namespace Ingen { diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp index 93b81b24..17c4699d 100644 --- a/src/engine/events/Get.cpp +++ b/src/engine/events/Get.cpp @@ -16,7 +16,7 @@ */ #include "Get.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "Request.hpp" #include "Engine.hpp" #include "EngineStore.hpp" diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp index 1dbd3b06..2703484c 100644 --- a/src/engine/events/RegisterClient.hpp +++ b/src/engine/events/RegisterClient.hpp @@ -19,7 +19,7 @@ #define INGEN_EVENTS_REGISTERCLIENT_HPP #include "raul/URI.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "QueuedEvent.hpp" namespace Ingen { diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp index e16bf57a..b8adc34e 100644 --- a/src/engine/events/RequestMetadata.cpp +++ b/src/engine/events/RequestMetadata.cpp @@ -16,7 +16,7 @@ */ #include "raul/IntrusivePtr.hpp" -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "events/RequestMetadata.hpp" #include "shared/LV2Atom.hpp" #include "shared/LV2URIMap.hpp" diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp index ef192b96..afd4a226 100644 --- a/src/engine/events/SetMetadata.cpp +++ b/src/engine/events/SetMetadata.cpp @@ -19,7 +19,7 @@ #include <boost/format.hpp> #include "raul/log.hpp" #include "raul/Maid.hpp" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "shared/LV2URIMap.hpp" #include "ClientBroadcaster.hpp" #include "ControlBindings.hpp" diff --git a/src/engine/events/UnregisterClient.cpp b/src/engine/events/UnregisterClient.cpp index ed5fe5e5..6f0b6357 100644 --- a/src/engine/events/UnregisterClient.cpp +++ b/src/engine/events/UnregisterClient.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "interface/ClientInterface.hpp" +#include "ingen/ClientInterface.hpp" #include "Request.hpp" #include "UnregisterClient.hpp" #include "Engine.hpp" diff --git a/src/engine/ingen_lv2.cpp b/src/engine/ingen_lv2.cpp index 8b9fd90d..b259de11 100644 --- a/src/engine/ingen_lv2.cpp +++ b/src/engine/ingen_lv2.cpp @@ -39,7 +39,7 @@ #include "engine/ProcessContext.hpp" #include "engine/QueuedEngineInterface.hpp" #include "engine/ThreadManager.hpp" -#include "interface/EngineInterface.hpp" +#include "ingen/EngineInterface.hpp" #include "module/World.hpp" #include "module/ingen_module.hpp" #include "serialisation/Parser.hpp" diff --git a/src/engine/mix.hpp b/src/engine/mix.hpp index a6c8fbab..072c7d3c 100644 --- a/src/engine/mix.hpp +++ b/src/engine/mix.hpp @@ -19,7 +19,7 @@ #define INGEN_ENGINE_MIX_HPP #include "raul/log.hpp" -#include "interface/PortType.hpp" +#include "ingen/PortType.hpp" #include "Buffer.hpp" #include "Context.hpp" diff --git a/src/engine/wscript b/src/engine/wscript index 47a55079..61be8c01 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -65,7 +65,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.source = core_source obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../common'] + obj.includes = ['.', '..', '../..', '../../include'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' obj.install_path = '${LIBDIR}' @@ -82,7 +82,7 @@ def build(bld): HTTPEngineReceiver.cpp ingen_http.cpp ''' - obj.includes = ['.', '..', '../..', '../common', '../engine'] + obj.includes = ['.', '..', '../..', '../../include', '../engine'] obj.name = 'libingen_http' obj.target = 'ingen_http' obj.install_path = '${LIBDIR}' @@ -98,7 +98,7 @@ def build(bld): ingen_osc.cpp ''' obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../common', '../engine'] + obj.includes = ['.', '..', '../..', '../../include', '../engine'] obj.name = 'libingen_osc' obj.target = 'ingen_osc' obj.install_path = '${LIBDIR}' @@ -108,7 +108,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.source = 'JackDriver.cpp ingen_jack.cpp' obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../common', '../engine'] + obj.includes = ['.', '..', '../..', '../../include', '../engine'] obj.name = 'libingen_jack' obj.target = 'ingen_jack' obj.install_path = '${LIBDIR}' @@ -119,7 +119,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.source = ' ingen_lv2.cpp ' obj.export_includes = ['.'] - obj.includes = ['.', '..', '../..', '../common'] + obj.includes = ['.', '..', '../..', '../../include'] obj.name = 'libingen_lv2' obj.target = 'ingen_lv2' obj.install_path = '${LIBDIR}' |