diff options
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/Engine.cpp | 4 | ||||
| -rw-r--r-- | src/engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/engine/MidiControlNode.cpp | 2 | ||||
| -rw-r--r-- | src/engine/PortImpl.cpp | 2 | ||||
| -rw-r--r-- | src/engine/events.hpp | 56 | ||||
| l--------- | src/engine/lv2_contexts.h | 2 | ||||
| -rw-r--r-- | src/engine/wscript | 2 |
7 files changed, 34 insertions, 36 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index a08a37ca..64a2431c 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -37,8 +37,8 @@ #include "OSCDriver.hpp" #include "QueuedEventSource.hpp" #include "PostProcessor.hpp" -#include "CreatePatchEvent.hpp" -#include "EnablePatchEvent.hpp" +#include "events/CreatePatchEvent.hpp" +#include "events/EnablePatchEvent.hpp" #include "OSCEngineReceiver.hpp" #ifdef HAVE_SOUP #include "HTTPEngineReceiver.hpp" diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 3c464de3..ca76dfc5 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -27,8 +27,6 @@ libingen_engine_la_LIBADD = \ @SLV2_LIBS@ \ @SOUP_LIBS@ -AM_CFLAGS=-std=c99 - libingen_engine_la_SOURCES = \ AudioBuffer.cpp \ AudioBuffer.hpp \ diff --git a/src/engine/MidiControlNode.cpp b/src/engine/MidiControlNode.cpp index bfe0e57e..0aeac448 100644 --- a/src/engine/MidiControlNode.cpp +++ b/src/engine/MidiControlNode.cpp @@ -19,7 +19,7 @@ #include <raul/midi_events.h> #include "MidiControlNode.hpp" #include "PostProcessor.hpp" -#include "MidiLearnEvent.hpp" +#include "events/MidiLearnEvent.hpp" #include "InputPort.hpp" #include "OutputPort.hpp" #include "InternalPlugin.hpp" diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp index 3eac65ca..62e89def 100644 --- a/src/engine/PortImpl.cpp +++ b/src/engine/PortImpl.cpp @@ -24,7 +24,7 @@ #include "AudioBuffer.hpp" #include "EventBuffer.hpp" #include "ProcessContext.hpp" -#include "SendPortActivityEvent.hpp" +#include "events/SendPortActivityEvent.hpp" using namespace std; diff --git a/src/engine/events.hpp b/src/engine/events.hpp index 14f5230c..6131cb76 100644 --- a/src/engine/events.hpp +++ b/src/engine/events.hpp @@ -20,34 +20,34 @@ #include CONFIG_H_PATH -#include "AllNotesOffEvent.hpp" -#include "ClearPatchEvent.hpp" -#include "ConnectionEvent.hpp" -#include "CreateNodeEvent.hpp" -#include "CreatePatchEvent.hpp" -#include "CreatePortEvent.hpp" -#include "DeactivateEvent.hpp" -#include "DestroyEvent.hpp" -#include "DisconnectAllEvent.hpp" -#include "DisconnectionEvent.hpp" -#include "EnablePatchEvent.hpp" -#include "LoadPluginsEvent.hpp" -#include "MidiLearnEvent.hpp" -#include "NoteEvent.hpp" -#include "PingQueuedEvent.hpp" -#include "RegisterClientEvent.hpp" -#include "RenameEvent.hpp" -#include "RequestAllObjectsEvent.hpp" -#include "RequestMetadataEvent.hpp" -#include "RequestObjectEvent.hpp" -#include "RequestPluginEvent.hpp" -#include "RequestPluginsEvent.hpp" -#include "RequestPortValueEvent.hpp" -#include "SetMetadataEvent.hpp" -#include "SetPolyphonicEvent.hpp" -#include "SetPolyphonyEvent.hpp" -#include "SetPortValueEvent.hpp" -#include "UnregisterClientEvent.hpp" +#include "events/AllNotesOffEvent.hpp" +#include "events/ClearPatchEvent.hpp" +#include "events/ConnectionEvent.hpp" +#include "events/CreateNodeEvent.hpp" +#include "events/CreatePatchEvent.hpp" +#include "events/CreatePortEvent.hpp" +#include "events/DeactivateEvent.hpp" +#include "events/DestroyEvent.hpp" +#include "events/DisconnectAllEvent.hpp" +#include "events/DisconnectionEvent.hpp" +#include "events/EnablePatchEvent.hpp" +#include "events/LoadPluginsEvent.hpp" +#include "events/MidiLearnEvent.hpp" +#include "events/NoteEvent.hpp" +#include "events/PingQueuedEvent.hpp" +#include "events/RegisterClientEvent.hpp" +#include "events/RenameEvent.hpp" +#include "events/RequestAllObjectsEvent.hpp" +#include "events/RequestMetadataEvent.hpp" +#include "events/RequestObjectEvent.hpp" +#include "events/RequestPluginEvent.hpp" +#include "events/RequestPluginsEvent.hpp" +#include "events/RequestPortValueEvent.hpp" +#include "events/SetMetadataEvent.hpp" +#include "events/SetPolyphonicEvent.hpp" +#include "events/SetPolyphonyEvent.hpp" +#include "events/SetPortValueEvent.hpp" +#include "events/UnregisterClientEvent.hpp" #endif // EVENTS_H diff --git a/src/engine/lv2_contexts.h b/src/engine/lv2_contexts.h index 8556a582..8c09603a 120000 --- a/src/engine/lv2_contexts.h +++ b/src/engine/lv2_contexts.h @@ -1 +1 @@ -../../../../lv2/lv2/contexts/lv2_contexts.h
\ No newline at end of file +../../../lv2/lv2/contexts/lv2_contexts.h
\ No newline at end of file diff --git a/src/engine/wscript b/src/engine/wscript index 1ad135d3..2fbd6a23 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -65,7 +65,7 @@ def build(bld): events/SetPortValueEvent.cpp events/UnregisterClientEvent.cpp ''' - obj.includes = ['..', '../../common', '../..', './events'] + obj.includes = ['..', '../common', './events'] obj.name = 'libingen_engine' obj.target = 'ingen_engine' obj.uselib = 'GLIBMM GTHREAD SLV2 JACK LIBLO RAUL REDLANDMM SOUP' |