summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/engine/InternalPlugin.cpp8
-rw-r--r--src/engine/NodeFactory.cpp8
-rw-r--r--src/engine/PluginImpl.cpp8
-rw-r--r--src/engine/events/MidiLearn.cpp2
-rw-r--r--src/engine/events/MidiLearn.hpp2
-rw-r--r--src/engine/events/Note.cpp10
-rw-r--r--src/engine/internals/Controller.cpp (renamed from src/engine/InternalController.cpp)2
-rw-r--r--src/engine/internals/Controller.hpp (renamed from src/engine/InternalController.hpp)0
-rw-r--r--src/engine/internals/Note.cpp (renamed from src/engine/InternalNote.cpp)4
-rw-r--r--src/engine/internals/Note.hpp (renamed from src/engine/InternalNote.hpp)0
-rw-r--r--src/engine/internals/Transport.cpp (renamed from src/engine/InternalTransport.cpp)2
-rw-r--r--src/engine/internals/Transport.hpp (renamed from src/engine/InternalTransport.hpp)0
-rw-r--r--src/engine/internals/Trigger.cpp (renamed from src/engine/InternalTrigger.cpp)6
-rw-r--r--src/engine/internals/Trigger.hpp (renamed from src/engine/InternalTrigger.hpp)0
-rw-r--r--src/engine/wscript8
15 files changed, 30 insertions, 30 deletions
diff --git a/src/engine/InternalPlugin.cpp b/src/engine/InternalPlugin.cpp
index 8ab9070b..77290c66 100644
--- a/src/engine/InternalPlugin.cpp
+++ b/src/engine/InternalPlugin.cpp
@@ -17,10 +17,10 @@
#include <cassert>
#include "InternalPlugin.hpp"
-#include "InternalNote.hpp"
-#include "InternalTrigger.hpp"
-#include "InternalController.hpp"
-#include "InternalTransport.hpp"
+#include "internals/Note.hpp"
+#include "internals/Trigger.hpp"
+#include "internals/Controller.hpp"
+#include "internals/Transport.hpp"
#include "Engine.hpp"
#include "AudioDriver.hpp"
diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp
index ad4de3c2..f1df20b9 100644
--- a/src/engine/NodeFactory.cpp
+++ b/src/engine/NodeFactory.cpp
@@ -26,10 +26,10 @@
#include "module/World.hpp"
#include "NodeFactory.hpp"
#include "ThreadManager.hpp"
-#include "InternalNote.hpp"
-#include "InternalTrigger.hpp"
-#include "InternalController.hpp"
-#include "InternalTransport.hpp"
+#include "internals/Note.hpp"
+#include "internals/Trigger.hpp"
+#include "internals/Controller.hpp"
+#include "internals/Transport.hpp"
#include "PatchImpl.hpp"
#include "InternalPlugin.hpp"
#ifdef HAVE_LADSPA_H
diff --git a/src/engine/PluginImpl.cpp b/src/engine/PluginImpl.cpp
index ad3c08b6..7a481c55 100644
--- a/src/engine/PluginImpl.cpp
+++ b/src/engine/PluginImpl.cpp
@@ -17,10 +17,10 @@
#include <iostream>
#include "PluginImpl.hpp"
-#include "InternalNote.hpp"
-#include "InternalTrigger.hpp"
-#include "InternalController.hpp"
-#include "InternalTransport.hpp"
+#include "internals/Note.hpp"
+#include "internals/Trigger.hpp"
+#include "internals/Controller.hpp"
+#include "internals/Transport.hpp"
using namespace std;
diff --git a/src/engine/events/MidiLearn.cpp b/src/engine/events/MidiLearn.cpp
index c475833b..b5c25102 100644
--- a/src/engine/events/MidiLearn.cpp
+++ b/src/engine/events/MidiLearn.cpp
@@ -20,7 +20,7 @@
#include "Engine.hpp"
#include "EngineStore.hpp"
#include "NodeImpl.hpp"
-#include "InternalController.hpp"
+#include "internals/Controller.hpp"
#include "ClientBroadcaster.hpp"
#include "PluginImpl.hpp"
diff --git a/src/engine/events/MidiLearn.hpp b/src/engine/events/MidiLearn.hpp
index 061c9b7f..5835cf6a 100644
--- a/src/engine/events/MidiLearn.hpp
+++ b/src/engine/events/MidiLearn.hpp
@@ -19,7 +19,7 @@
#define MIDILEARNEVENT_H
#include "QueuedEvent.hpp"
-#include "InternalController.hpp"
+#include "internals/Controller.hpp"
#include "types.hpp"
namespace Ingen {
diff --git a/src/engine/events/Note.cpp b/src/engine/events/Note.cpp
index 2bf71068..0871b0d3 100644
--- a/src/engine/events/Note.cpp
+++ b/src/engine/events/Note.cpp
@@ -15,16 +15,16 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "Note.hpp"
-#include "Responder.hpp"
+#include "internals/Note.hpp"
+#include "internals/Trigger.hpp"
#include "Engine.hpp"
#include "EngineStore.hpp"
+#include "InternalPlugin.hpp"
#include "NodeImpl.hpp"
-#include "InternalNote.hpp"
-#include "InternalTrigger.hpp"
+#include "Note.hpp"
#include "PluginImpl.hpp"
-#include "InternalPlugin.hpp"
#include "ProcessContext.hpp"
+#include "Responder.hpp"
using namespace Raul;
diff --git a/src/engine/InternalController.cpp b/src/engine/internals/Controller.cpp
index 1995e2cf..d615830a 100644
--- a/src/engine/InternalController.cpp
+++ b/src/engine/internals/Controller.cpp
@@ -17,7 +17,7 @@
#include <math.h>
#include "raul/midi_events.h"
-#include "InternalController.hpp"
+#include "internals/Controller.hpp"
#include "PostProcessor.hpp"
#include "events/MidiLearn.hpp"
#include "events/SendPortValue.hpp"
diff --git a/src/engine/InternalController.hpp b/src/engine/internals/Controller.hpp
index e0c7de0f..e0c7de0f 100644
--- a/src/engine/InternalController.hpp
+++ b/src/engine/internals/Controller.hpp
diff --git a/src/engine/InternalNote.cpp b/src/engine/internals/Note.cpp
index b2ab27b3..e3ba42d3 100644
--- a/src/engine/InternalNote.cpp
+++ b/src/engine/internals/Note.cpp
@@ -20,12 +20,12 @@
#include "raul/midi_events.h"
#include <cmath>
#include <iostream>
+#include "internals/Note.hpp"
#include "AudioBuffer.hpp"
#include "AudioDriver.hpp"
+#include "EventBuffer.hpp"
#include "InputPort.hpp"
#include "InternalPlugin.hpp"
-#include "EventBuffer.hpp"
-#include "InternalNote.hpp"
#include "OutputPort.hpp"
#include "PatchImpl.hpp"
#include "ProcessContext.hpp"
diff --git a/src/engine/InternalNote.hpp b/src/engine/internals/Note.hpp
index b14ba604..b14ba604 100644
--- a/src/engine/InternalNote.hpp
+++ b/src/engine/internals/Note.hpp
diff --git a/src/engine/InternalTransport.cpp b/src/engine/internals/Transport.cpp
index 40f953a5..3355f4d8 100644
--- a/src/engine/InternalTransport.cpp
+++ b/src/engine/internals/Transport.cpp
@@ -15,7 +15,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "InternalTransport.hpp"
+#include "internals/Transport.hpp"
#include <jack/transport.h>
#include "OutputPort.hpp"
#include "InternalPlugin.hpp"
diff --git a/src/engine/InternalTransport.hpp b/src/engine/internals/Transport.hpp
index 3947b235..3947b235 100644
--- a/src/engine/InternalTransport.hpp
+++ b/src/engine/internals/Transport.hpp
diff --git a/src/engine/InternalTrigger.cpp b/src/engine/internals/Trigger.cpp
index cd5684cf..cb7ae2fe 100644
--- a/src/engine/InternalTrigger.cpp
+++ b/src/engine/internals/Trigger.cpp
@@ -17,13 +17,13 @@
#include <cmath>
#include "raul/midi_events.h"
-#include "InternalTrigger.hpp"
+#include "internals/Trigger.hpp"
#include "AudioBuffer.hpp"
+#include "EventBuffer.hpp"
#include "InputPort.hpp"
-#include "OutputPort.hpp"
#include "InternalPlugin.hpp"
+#include "OutputPort.hpp"
#include "ProcessContext.hpp"
-#include "EventBuffer.hpp"
#include "util.hpp"
using namespace std;
diff --git a/src/engine/InternalTrigger.hpp b/src/engine/internals/Trigger.hpp
index 973b9b41..973b9b41 100644
--- a/src/engine/InternalTrigger.hpp
+++ b/src/engine/internals/Trigger.hpp
diff --git a/src/engine/wscript b/src/engine/wscript
index e869534a..b4d0dc7a 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -15,11 +15,7 @@ def build(bld):
EventSink.cpp
GraphObjectImpl.cpp
InputPort.cpp
- InternalController.cpp
- InternalNote.cpp
InternalPlugin.cpp
- InternalTransport.cpp
- InternalTrigger.cpp
LV2EventBuffer.cpp
MessageContext.cpp
NodeBase.cpp
@@ -35,6 +31,10 @@ def build(bld):
events/SendPortActivity.cpp
events/SendPortValue.cpp
ingen_engine.cpp
+ internals/Controller.cpp
+ internals/Note.cpp
+ internals/Transport.cpp
+ internals/Trigger.cpp
'''
obj = bld.new_task_gen('cxx', 'shlib')