diff options
| author | David Robillard <d@drobilla.net> | 2008-10-18 16:58:12 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-18 16:58:12 +0000 |
| commit | 18dbb3f103795daab90cabf83335c51cb7c05621 (patch) | |
| tree | a1b6a0ae1ab5c600a8c04e7f97cd987df24b3229 /src | |
| parent | 49cf0af71d300585778b9bf55b74c781387a183e (diff) | |
| download | ingen-18dbb3f103795daab90cabf83335c51cb7c05621.tar.gz ingen-18dbb3f103795daab90cabf83335c51cb7c05621.tar.bz2 ingen-18dbb3f103795daab90cabf83335c51cb7c05621.zip | |
Build against local library versions no matter what.... hopefully....
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1677 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
163 files changed, 286 insertions, 293 deletions
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp index 18582046..8c54e96e 100644 --- a/src/client/ClientStore.cpp +++ b/src/client/ClientStore.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/PathTable.hpp> +#include "raul/PathTable.hpp" #include "ClientStore.hpp" #include "ObjectModel.hpp" #include "PatchModel.hpp" diff --git a/src/client/ClientStore.hpp b/src/client/ClientStore.hpp index f08fcd9b..4df8149b 100644 --- a/src/client/ClientStore.hpp +++ b/src/client/ClientStore.hpp @@ -21,12 +21,12 @@ #include <cassert> #include <string> #include <list> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include <sigc++/sigc++.h> -#include <raul/Path.hpp> -#include <raul/Atom.hpp> -#include <raul/PathTable.hpp> -#include <raul/TableImpl.hpp> +#include "raul/Path.hpp" +#include "raul/Atom.hpp" +#include "raul/PathTable.hpp" +#include "raul/TableImpl.hpp" #include "interface/EngineInterface.hpp" #include "shared/Store.hpp" using std::string; using std::list; diff --git a/src/client/ConnectionModel.hpp b/src/client/ConnectionModel.hpp index 91c448df..46b9050a 100644 --- a/src/client/ConnectionModel.hpp +++ b/src/client/ConnectionModel.hpp @@ -21,8 +21,8 @@ #include <cassert> #include <string> #include <list> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "interface/Connection.hpp" #include "PortModel.hpp" diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp index 6284d42c..84f47aeb 100644 --- a/src/client/DeprecatedLoader.cpp +++ b/src/client/DeprecatedLoader.cpp @@ -15,7 +15,6 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include <iostream> #include <fstream> #include <vector> @@ -29,7 +28,7 @@ #include <libxml/parser.h> #include <libxml/tree.h> #include <libxml/xpath.h> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "PatchModel.hpp" #include "NodeModel.hpp" diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp index f7213aca..ad1a8069 100644 --- a/src/client/DeprecatedLoader.hpp +++ b/src/client/DeprecatedLoader.hpp @@ -25,8 +25,8 @@ #include <boost/optional.hpp> #include <glibmm/ustring.h> #include <libxml/tree.h> -#include <raul/SharedPtr.hpp> -#include <raul/Path.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "interface/GraphObject.hpp" #include "ObjectModel.hpp" diff --git a/src/client/NodeModel.cpp b/src/client/NodeModel.cpp index ee4988e3..2975ecff 100644 --- a/src/client/NodeModel.cpp +++ b/src/client/NodeModel.cpp @@ -15,10 +15,9 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" - #include <cassert> #include <cmath> +#include "config.h" #include "interface/Port.hpp" #include "NodeModel.hpp" #include "PatchModel.hpp" diff --git a/src/client/NodeModel.hpp b/src/client/NodeModel.hpp index b7bbb5af..3ce16413 100644 --- a/src/client/NodeModel.hpp +++ b/src/client/NodeModel.hpp @@ -22,8 +22,8 @@ #include <iostream> #include <string> #include <sigc++/sigc++.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "interface/Node.hpp" #include "interface/Port.hpp" #include "ObjectModel.hpp" diff --git a/src/client/OSCClientReceiver.cpp b/src/client/OSCClientReceiver.cpp index 8ebd9d8e..f1c4e4eb 100644 --- a/src/client/OSCClientReceiver.cpp +++ b/src/client/OSCClientReceiver.cpp @@ -16,7 +16,7 @@ */ #include "OSCClientReceiver.hpp" -#include <raul/AtomLiblo.hpp> +#include "raul/AtomLiblo.hpp" #include <list> #include <cassert> #include <cstring> diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index c21d16ce..0111ac8f 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -16,7 +16,7 @@ */ #include <iostream> -#include <raul/AtomLiblo.hpp> +#include "raul/AtomLiblo.hpp" #include "OSCEngineSender.hpp" using namespace std; diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index ede5f822..b1a0169f 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -16,7 +16,7 @@ */ #include <iostream> -#include <raul/TableImpl.hpp> +#include "raul/TableImpl.hpp" #include "interface/GraphObject.hpp" #include "ObjectModel.hpp" diff --git a/src/client/ObjectModel.hpp b/src/client/ObjectModel.hpp index 11cc87a4..ac54ff98 100644 --- a/src/client/ObjectModel.hpp +++ b/src/client/ObjectModel.hpp @@ -25,10 +25,10 @@ #include <cassert> #include <boost/utility.hpp> #include <sigc++/sigc++.h> -#include <raul/Atom.hpp> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/PathTable.hpp> +#include "raul/Atom.hpp" +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/PathTable.hpp" #include "interface/GraphObject.hpp" using Raul::PathTable; diff --git a/src/client/PatchModel.cpp b/src/client/PatchModel.cpp index af20c9f8..d9f62b45 100644 --- a/src/client/PatchModel.cpp +++ b/src/client/PatchModel.cpp @@ -15,14 +15,14 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <cassert> +#include <iostream> #include "PatchModel.hpp" #include "NodeModel.hpp" #include "ConnectionModel.hpp" #include "ClientStore.hpp" -#include <cassert> -#include <iostream> -using std::cerr; using std::cout; using std::endl; +using namespace std; namespace Ingen { namespace Client { diff --git a/src/client/PatchModel.hpp b/src/client/PatchModel.hpp index ac1e2ac0..64ceaddf 100644 --- a/src/client/PatchModel.hpp +++ b/src/client/PatchModel.hpp @@ -22,7 +22,7 @@ #include <list> #include <string> #include <sigc++/sigc++.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/Patch.hpp" #include "NodeModel.hpp" diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp index ff7e5b5c..2b824034 100644 --- a/src/client/PluginModel.cpp +++ b/src/client/PluginModel.cpp @@ -16,7 +16,7 @@ */ #include <sstream> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "PluginModel.hpp" #include "PatchModel.hpp" #include "PluginUI.hpp" diff --git a/src/client/PluginModel.hpp b/src/client/PluginModel.hpp index 9260e39c..f27bb232 100644 --- a/src/client/PluginModel.hpp +++ b/src/client/PluginModel.hpp @@ -21,11 +21,11 @@ #include "config.h" #include <string> #include <iostream> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> -#include <redlandmm/World.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" +#include "redlandmm/World.hpp" #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #endif #include "interface/EngineInterface.hpp" #include "interface/Plugin.hpp" diff --git a/src/client/PluginUI.hpp b/src/client/PluginUI.hpp index d20dd16a..81aa23a4 100644 --- a/src/client/PluginUI.hpp +++ b/src/client/PluginUI.hpp @@ -18,8 +18,8 @@ #ifndef PLUGINUI_H #define PLUGINUI_H -#include <slv2/slv2.h> -#include <raul/SharedPtr.hpp> +#include "slv2/slv2.h" +#include "raul/SharedPtr.hpp" #include "module/World.hpp" namespace Ingen { diff --git a/src/client/PortModel.hpp b/src/client/PortModel.hpp index 0a078aaa..a0486ed5 100644 --- a/src/client/PortModel.hpp +++ b/src/client/PortModel.hpp @@ -22,8 +22,8 @@ #include <iostream> #include <string> #include <sigc++/sigc++.h> -#include <raul/SharedPtr.hpp> -#include <raul/Path.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" #include "interface/Port.hpp" #include "ObjectModel.hpp" diff --git a/src/client/ThreadedSigClientInterface.hpp b/src/client/ThreadedSigClientInterface.hpp index 3014c139..a5a667df 100644 --- a/src/client/ThreadedSigClientInterface.hpp +++ b/src/client/ThreadedSigClientInterface.hpp @@ -24,8 +24,8 @@ #include <glibmm/thread.h> #include "interface/ClientInterface.hpp" #include "SigClientInterface.hpp" -#include <raul/Atom.hpp> -#include <raul/SRSWQueue.hpp> +#include "raul/Atom.hpp" +#include "raul/SRSWQueue.hpp" using std::string; diff --git a/src/client/client.hpp b/src/client/client.hpp index 82166da5..c33b0abd 100644 --- a/src/client/client.hpp +++ b/src/client/client.hpp @@ -18,7 +18,7 @@ #ifndef INGEN_CLIENT_H #define INGEN_CLIENT_H -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Ingen { diff --git a/src/common/interface/ClientInterface.hpp b/src/common/interface/ClientInterface.hpp index 2d604ced..07c00fd7 100644 --- a/src/common/interface/ClientInterface.hpp +++ b/src/common/interface/ClientInterface.hpp @@ -21,7 +21,7 @@ #include <stdio.h> #include <string> #include <inttypes.h> -#include <raul/Atom.hpp> +#include "raul/Atom.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/common/interface/CommonInterface.hpp b/src/common/interface/CommonInterface.hpp index 220b2391..1e43efe4 100644 --- a/src/common/interface/CommonInterface.hpp +++ b/src/common/interface/CommonInterface.hpp @@ -20,8 +20,8 @@ #include <inttypes.h> #include <string> -#include <raul/SharedPtr.hpp> -#include <raul/Atom.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Atom.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/common/interface/Connection.hpp b/src/common/interface/Connection.hpp index 4d5ea1aa..92c3ab9a 100644 --- a/src/common/interface/Connection.hpp +++ b/src/common/interface/Connection.hpp @@ -18,7 +18,7 @@ #ifndef CONNECTION_H #define CONNECTION_H -#include <raul/Path.hpp> +#include "raul/Path.hpp" namespace Ingen { namespace Shared { diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp index 9a835784..55153d63 100644 --- a/src/common/interface/EngineInterface.hpp +++ b/src/common/interface/EngineInterface.hpp @@ -20,7 +20,7 @@ #include <inttypes.h> #include <string> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/common/interface/GraphObject.hpp b/src/common/interface/GraphObject.hpp index c6fb5856..013977d3 100644 --- a/src/common/interface/GraphObject.hpp +++ b/src/common/interface/GraphObject.hpp @@ -20,12 +20,12 @@ #include <string> #include <map> -#include <raul/Deletable.hpp> -#include <raul/PathTable.hpp> -#include <raul/Symbol.hpp> -#include <raul/Atom.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/WeakPtr.hpp> +#include "raul/Deletable.hpp" +#include "raul/PathTable.hpp" +#include "raul/Symbol.hpp" +#include "raul/Atom.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/WeakPtr.hpp" using Raul::PathTable; diff --git a/src/common/interface/Patch.hpp b/src/common/interface/Patch.hpp index 87165a4e..9e609c7c 100644 --- a/src/common/interface/Patch.hpp +++ b/src/common/interface/Patch.hpp @@ -18,8 +18,8 @@ #ifndef PATCH_H #define PATCH_H -#include <raul/SharedPtr.hpp> -#include <raul/List.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/List.hpp" #include "interface/Node.hpp" namespace Ingen { diff --git a/src/common/interface/Port.hpp b/src/common/interface/Port.hpp index b7305519..6977d249 100644 --- a/src/common/interface/Port.hpp +++ b/src/common/interface/Port.hpp @@ -18,7 +18,7 @@ #ifndef PORT_H #define PORT_H -#include <raul/Atom.hpp> +#include "raul/Atom.hpp" #include "GraphObject.hpp" #include "DataType.hpp" diff --git a/src/engine/AudioDriver.hpp b/src/engine/AudioDriver.hpp index 1a611846..ccbc8da4 100644 --- a/src/engine/AudioDriver.hpp +++ b/src/engine/AudioDriver.hpp @@ -18,8 +18,8 @@ #ifndef AUDIODRIVER_H #define AUDIODRIVER_H -#include <raul/List.hpp> -#include <raul/Path.hpp> +#include "raul/List.hpp" +#include "raul/Path.hpp" #include "Driver.hpp" #include "types.hpp" #include "interface/DataType.hpp" diff --git a/src/engine/Buffer.hpp b/src/engine/Buffer.hpp index e388e2e8..e0dd0ba2 100644 --- a/src/engine/Buffer.hpp +++ b/src/engine/Buffer.hpp @@ -21,7 +21,7 @@ #include <cstddef> #include <cassert> #include <boost/utility.hpp> -#include <raul/Deletable.hpp> +#include "raul/Deletable.hpp" #include "types.hpp" #include "interface/DataType.hpp" diff --git a/src/engine/ClientBroadcaster.hpp b/src/engine/ClientBroadcaster.hpp index efb58450..8f9afca3 100644 --- a/src/engine/ClientBroadcaster.hpp +++ b/src/engine/ClientBroadcaster.hpp @@ -22,7 +22,7 @@ #include <list> #include <map> #include <pthread.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/ClientInterface.hpp" #include "types.hpp" #include "NodeFactory.hpp" diff --git a/src/engine/CompiledPatch.hpp b/src/engine/CompiledPatch.hpp index 9ca1d6e9..c412cbb8 100644 --- a/src/engine/CompiledPatch.hpp +++ b/src/engine/CompiledPatch.hpp @@ -20,8 +20,8 @@ #include <iostream> #include <vector> -#include <raul/List.hpp> -#include <raul/Deletable.hpp> +#include "raul/List.hpp" +#include "raul/Deletable.hpp" #include <boost/utility.hpp> using Raul::List; diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp index eea81510..3ae82da9 100644 --- a/src/engine/ConnectionImpl.cpp +++ b/src/engine/ConnectionImpl.cpp @@ -16,7 +16,7 @@ */ #include <algorithm> -#include <raul/Maid.hpp> +#include "raul/Maid.hpp" #include "util.hpp" #include "ConnectionImpl.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp index a5a61c85..22bf9069 100644 --- a/src/engine/ConnectionImpl.hpp +++ b/src/engine/ConnectionImpl.hpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <boost/utility.hpp> -#include <raul/Deletable.hpp> +#include "raul/Deletable.hpp" #include "interface/DataType.hpp" #include "interface/Connection.hpp" #include "PortImpl.hpp" diff --git a/src/engine/Driver.hpp b/src/engine/Driver.hpp index 590b66b5..73be4a3b 100644 --- a/src/engine/Driver.hpp +++ b/src/engine/Driver.hpp @@ -20,7 +20,7 @@ #include <string> #include <boost/utility.hpp> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "interface/DataType.hpp" #include "DuplexPort.hpp" diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp index bcc5a54c..d221b4f9 100644 --- a/src/engine/Engine.cpp +++ b/src/engine/Engine.cpp @@ -19,9 +19,9 @@ #include <sys/mman.h> #include <iostream> #include <unistd.h> -#include <raul/Deletable.hpp> -#include <raul/Maid.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Deletable.hpp" +#include "raul/Maid.hpp" +#include "raul/SharedPtr.hpp" #include "Engine.hpp" #include "config.h" #include "tuning.hpp" diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index e2e5ea09..8edf37c3 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -22,7 +22,7 @@ #include <cassert> #include <vector> #include <boost/utility.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "module/global.hpp" #include "interface/DataType.hpp" #include "interface/EventType.hpp" diff --git a/src/engine/EngineStore.cpp b/src/engine/EngineStore.cpp index 0140f201..2d0dba40 100644 --- a/src/engine/EngineStore.cpp +++ b/src/engine/EngineStore.cpp @@ -17,9 +17,9 @@ #include <utility> #include <vector> -#include <raul/List.hpp> -#include <raul/PathTable.hpp> -#include <raul/TableImpl.hpp> +#include "raul/List.hpp" +#include "raul/PathTable.hpp" +#include "raul/TableImpl.hpp" #include "EngineStore.hpp" #include "PatchImpl.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/EngineStore.hpp b/src/engine/EngineStore.hpp index ad656aeb..57213be3 100644 --- a/src/engine/EngineStore.hpp +++ b/src/engine/EngineStore.hpp @@ -19,8 +19,8 @@ #define OBJECTSTORE_H #include <string> -#include <raul/PathTable.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/PathTable.hpp" +#include "raul/SharedPtr.hpp" #include "shared/Store.hpp" using std::string; diff --git a/src/engine/Event.hpp b/src/engine/Event.hpp index 5860da2a..ddfb58c9 100644 --- a/src/engine/Event.hpp +++ b/src/engine/Event.hpp @@ -19,8 +19,8 @@ #define EVENT_H #include <cassert> -#include <raul/SharedPtr.hpp> -#include <raul/Deletable.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Deletable.hpp" #include "types.hpp" namespace Ingen { diff --git a/src/engine/EventSink.hpp b/src/engine/EventSink.hpp index 72341b7b..82443dbd 100644 --- a/src/engine/EventSink.hpp +++ b/src/engine/EventSink.hpp @@ -20,7 +20,7 @@ #include <list> #include <utility> -#include <raul/RingBuffer.hpp> +#include "raul/RingBuffer.hpp" #include "types.hpp" namespace Ingen { diff --git a/src/engine/GraphObjectImpl.hpp b/src/engine/GraphObjectImpl.hpp index 9b1f675d..88ed3617 100644 --- a/src/engine/GraphObjectImpl.hpp +++ b/src/engine/GraphObjectImpl.hpp @@ -22,9 +22,9 @@ #include <map> #include <cstddef> #include <cassert> -#include <raul/Deletable.hpp> -#include <raul/Path.hpp> -#include <raul/Atom.hpp> +#include "raul/Deletable.hpp" +#include "raul/Path.hpp" +#include "raul/Atom.hpp" #include "interface/GraphObject.hpp" #include "types.hpp" diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index d7d246db..4c5c3b36 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -20,8 +20,8 @@ #include <cstdio> #include <string> #include <boost/format.hpp> +#include "raul/SharedPtr.hpp" #include "types.hpp" -#include <raul/SharedPtr.hpp> #include "interface/ClientInterface.hpp" #include "module/Module.hpp" #include "serialisation/serialisation.hpp" diff --git a/src/engine/HTTPEngineReceiver.hpp b/src/engine/HTTPEngineReceiver.hpp index 8d474bf5..18f0a972 100644 --- a/src/engine/HTTPEngineReceiver.hpp +++ b/src/engine/HTTPEngineReceiver.hpp @@ -22,7 +22,7 @@ #include <string> #include <stdint.h> #include <libsoup/soup.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "QueuedEngineInterface.hpp" namespace Ingen { diff --git a/src/engine/InputPort.hpp b/src/engine/InputPort.hpp index 23732fa9..fa190920 100644 --- a/src/engine/InputPort.hpp +++ b/src/engine/InputPort.hpp @@ -21,8 +21,8 @@ #include <string> #include <cstdlib> #include <cassert> -#include <raul/List.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/List.hpp" +#include "raul/SharedPtr.hpp" #include "PortImpl.hpp" using std::string; diff --git a/src/engine/InternalPlugin.hpp b/src/engine/InternalPlugin.hpp index 47d62e0e..3b285a0a 100644 --- a/src/engine/InternalPlugin.hpp +++ b/src/engine/InternalPlugin.hpp @@ -30,7 +30,7 @@ #include <dlfcn.h> #include <string> #include <iostream> -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "types.hpp" #include "PluginImpl.hpp" diff --git a/src/engine/JackAudioDriver.cpp b/src/engine/JackAudioDriver.cpp index 6ffca0da..14b1f11d 100644 --- a/src/engine/JackAudioDriver.cpp +++ b/src/engine/JackAudioDriver.cpp @@ -20,7 +20,7 @@ #include "tuning.hpp" #include <iostream> #include <cstdlib> -#include <raul/List.hpp> +#include "raul/List.hpp" #include "Engine.hpp" #include "util.hpp" #include "Event.hpp" diff --git a/src/engine/JackAudioDriver.hpp b/src/engine/JackAudioDriver.hpp index 56ae066b..a0d81705 100644 --- a/src/engine/JackAudioDriver.hpp +++ b/src/engine/JackAudioDriver.hpp @@ -20,9 +20,9 @@ #include <jack/jack.h> #include <jack/transport.h> -#include <raul/Thread.hpp> -#include <raul/Path.hpp> -#include <raul/List.hpp> +#include "raul/Thread.hpp" +#include "raul/Path.hpp" +#include "raul/List.hpp" #include "AudioDriver.hpp" #include "Buffer.hpp" #include "ProcessContext.hpp" diff --git a/src/engine/JackMidiDriver.cpp b/src/engine/JackMidiDriver.cpp index 9e236541..ecdbd098 100644 --- a/src/engine/JackMidiDriver.cpp +++ b/src/engine/JackMidiDriver.cpp @@ -18,8 +18,8 @@ #include <iostream> #include <cstdlib> #include <pthread.h> -#include <raul/Maid.hpp> -#include <raul/midi_events.h> +#include "raul/Maid.hpp" +#include "raul/midi_events.h" #include "types.hpp" #include "JackMidiDriver.hpp" #include "JackAudioDriver.hpp" diff --git a/src/engine/JackMidiDriver.hpp b/src/engine/JackMidiDriver.hpp index 3100acd4..0b155450 100644 --- a/src/engine/JackMidiDriver.hpp +++ b/src/engine/JackMidiDriver.hpp @@ -20,7 +20,7 @@ #include <jack/jack.h> #include <jack/midiport.h> -#include <raul/List.hpp> +#include "raul/List.hpp" #include "config.h" #include "MidiDriver.hpp" diff --git a/src/engine/LADSPANode.cpp b/src/engine/LADSPANode.cpp index b20d4636..4845b62c 100644 --- a/src/engine/LADSPANode.cpp +++ b/src/engine/LADSPANode.cpp @@ -19,7 +19,7 @@ #include <cassert> #include <cmath> #include <stdint.h> -#include <raul/Maid.hpp> +#include "raul/Maid.hpp" #include <boost/optional.hpp> #include "LADSPANode.hpp" #include "AudioBuffer.hpp" diff --git a/src/engine/LADSPAPlugin.hpp b/src/engine/LADSPAPlugin.hpp index 4e1c5b49..e9d11edf 100644 --- a/src/engine/LADSPAPlugin.hpp +++ b/src/engine/LADSPAPlugin.hpp @@ -26,7 +26,7 @@ #include <dlfcn.h> #include <string> #include <iostream> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "types.hpp" #include "PluginImpl.hpp" diff --git a/src/engine/LV2Info.cpp b/src/engine/LV2Info.cpp index 43dd014b..fbef2f78 100644 --- a/src/engine/LV2Info.cpp +++ b/src/engine/LV2Info.cpp @@ -20,7 +20,7 @@ #include <iostream> #include <stdint.h> #include "LV2Info.hpp" -#include <module/World.hpp> +#include "module/World.hpp" using namespace std; diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp index f8676947..0cb1b986 100644 --- a/src/engine/LV2Info.hpp +++ b/src/engine/LV2Info.hpp @@ -25,7 +25,7 @@ #include <map> #include <string> -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "module/global.hpp" #include "module/World.hpp" #include "shared/LV2URIMap.hpp" diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp index 7f8f95e8..4e0f7416 100644 --- a/src/engine/LV2Node.cpp +++ b/src/engine/LV2Node.cpp @@ -20,7 +20,7 @@ #include <float.h> #include <stdint.h> #include <cmath> -#include <raul/Maid.hpp> +#include "raul/Maid.hpp" #include "AudioBuffer.hpp" #include "InputPort.hpp" #include "LV2Node.hpp" diff --git a/src/engine/LV2Node.hpp b/src/engine/LV2Node.hpp index 1e821c6e..6757060b 100644 --- a/src/engine/LV2Node.hpp +++ b/src/engine/LV2Node.hpp @@ -19,7 +19,7 @@ #define LV2NODE_H #include <string> -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "lv2_contexts.h" #include "types.hpp" #include "NodeBase.hpp" diff --git a/src/engine/LV2Plugin.cpp b/src/engine/LV2Plugin.cpp index 90a3a6b8..e294b3b1 100644 --- a/src/engine/LV2Plugin.cpp +++ b/src/engine/LV2Plugin.cpp @@ -17,7 +17,7 @@ #include <cassert> #include <glibmm.h> -#include <redlandmm/World.hpp> +#include "redlandmm/World.hpp" #include "LV2Plugin.hpp" #include "LV2Node.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/LV2Plugin.hpp b/src/engine/LV2Plugin.hpp index 99c0a111..46a7607a 100644 --- a/src/engine/LV2Plugin.hpp +++ b/src/engine/LV2Plugin.hpp @@ -30,8 +30,8 @@ #include <dlfcn.h> #include <string> #include <iostream> -#include <slv2/slv2.h> -#include <raul/SharedPtr.hpp> +#include "slv2/slv2.h" +#include "raul/SharedPtr.hpp" #include "types.hpp" #include "PluginImpl.hpp" #include "LV2Info.hpp" diff --git a/src/engine/MidiControlNode.cpp b/src/engine/MidiControlNode.cpp index c7cd64ed..c30d6028 100644 --- a/src/engine/MidiControlNode.cpp +++ b/src/engine/MidiControlNode.cpp @@ -16,7 +16,7 @@ */ #include <math.h> -#include <raul/midi_events.h> +#include "raul/midi_events.h" #include "MidiControlNode.hpp" #include "PostProcessor.hpp" #include "events/MidiLearnEvent.hpp" diff --git a/src/engine/MidiNoteNode.cpp b/src/engine/MidiNoteNode.cpp index c6b116bb..5d966e75 100644 --- a/src/engine/MidiNoteNode.cpp +++ b/src/engine/MidiNoteNode.cpp @@ -15,9 +15,9 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Array.hpp> -#include <raul/Maid.hpp> -#include <raul/midi_events.h> +#include "raul/Array.hpp" +#include "raul/Maid.hpp" +#include "raul/midi_events.h" #include <cmath> #include <iostream> #include "AudioBuffer.hpp" diff --git a/src/engine/MidiTriggerNode.cpp b/src/engine/MidiTriggerNode.cpp index 8ab4991e..bbf63167 100644 --- a/src/engine/MidiTriggerNode.cpp +++ b/src/engine/MidiTriggerNode.cpp @@ -16,7 +16,7 @@ */ #include <cmath> -#include <raul/midi_events.h> +#include "raul/midi_events.h" #include "MidiTriggerNode.hpp" #include "AudioBuffer.hpp" #include "InputPort.hpp" diff --git a/src/engine/NodeBase.cpp b/src/engine/NodeBase.cpp index 559b51f4..f860631f 100644 --- a/src/engine/NodeBase.cpp +++ b/src/engine/NodeBase.cpp @@ -19,8 +19,8 @@ #include <cassert> #include <iostream> #include <stdint.h> -#include <raul/List.hpp> -#include <raul/Array.hpp> +#include "raul/List.hpp" +#include "raul/Array.hpp" #include "util.hpp" #include "PluginImpl.hpp" #include "ClientBroadcaster.hpp" diff --git a/src/engine/NodeBase.hpp b/src/engine/NodeBase.hpp index e3710aa9..3626f6b9 100644 --- a/src/engine/NodeBase.hpp +++ b/src/engine/NodeBase.hpp @@ -21,8 +21,8 @@ #include "types.hpp" #include <string> #include <cstdlib> -#include <raul/Semaphore.hpp> -#include <raul/AtomicInt.hpp> +#include "raul/Semaphore.hpp" +#include "raul/AtomicInt.hpp" #include "interface/Port.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp index 21f150d6..45da0a03 100644 --- a/src/engine/NodeFactory.cpp +++ b/src/engine/NodeFactory.cpp @@ -21,7 +21,7 @@ #include <dirent.h> #include <float.h> #include <cmath> -#include <redlandmm/World.hpp> +#include "redlandmm/World.hpp" #include "module/World.hpp" #include "NodeFactory.hpp" #include "ThreadManager.hpp" @@ -36,7 +36,7 @@ #include "LADSPAPlugin.hpp" #endif #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "LV2Plugin.hpp" #include "LV2Node.hpp" #endif diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp index 97057922..08a7ba3a 100644 --- a/src/engine/NodeFactory.hpp +++ b/src/engine/NodeFactory.hpp @@ -27,7 +27,7 @@ #include <pthread.h> #include <glibmm/module.h> #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "LV2Info.hpp" #endif #include "types.hpp" diff --git a/src/engine/NodeImpl.hpp b/src/engine/NodeImpl.hpp index ac125c13..bedc855d 100644 --- a/src/engine/NodeImpl.hpp +++ b/src/engine/NodeImpl.hpp @@ -19,7 +19,7 @@ #define NODEIMPL_H #include <string> -#include <raul/Array.hpp> +#include "raul/Array.hpp" #include "interface/Node.hpp" #include "types.hpp" #include "GraphObjectImpl.hpp" diff --git a/src/engine/OSCClientSender.cpp b/src/engine/OSCClientSender.cpp index c71f7e6b..95b6ec65 100644 --- a/src/engine/OSCClientSender.cpp +++ b/src/engine/OSCClientSender.cpp @@ -19,7 +19,7 @@ #include <cassert> #include <iostream> #include <unistd.h> -#include <raul/AtomLiblo.hpp> +#include "raul/AtomLiblo.hpp" #include "EngineStore.hpp" #include "NodeFactory.hpp" #include "util.hpp" diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index c2df9601..e0299556 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -15,14 +15,15 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +//#define ENABLE_AVAHI 1 + #include <iostream> #include <cstdlib> #include <string> -//#define ENABLE_AVAHI 1 #include <lo/lo.h> +#include "raul/SharedPtr.hpp" +#include "raul/AtomLiblo.hpp" #include "types.hpp" -#include <raul/SharedPtr.hpp> -#include <raul/AtomLiblo.hpp> #include "interface/ClientInterface.hpp" #include "engine/ThreadManager.hpp" #include "OSCEngineReceiver.hpp" diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index 05eb0322..0afea8dc 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -22,7 +22,7 @@ #include <string> #include <stdint.h> #include <lo/lo.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "QueuedEngineInterface.hpp" #include "Responder.hpp" using std::string; diff --git a/src/engine/PatchImpl.hpp b/src/engine/PatchImpl.hpp index 3629f6e5..78135069 100644 --- a/src/engine/PatchImpl.hpp +++ b/src/engine/PatchImpl.hpp @@ -20,8 +20,8 @@ #include <cstdlib> #include <string> -#include <raul/List.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/List.hpp" +#include "raul/SharedPtr.hpp" #include "interface/DataType.hpp" #include "interface/Patch.hpp" #include "NodeBase.hpp" diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp index d807304e..1a1fd9c0 100644 --- a/src/engine/PortImpl.cpp +++ b/src/engine/PortImpl.cpp @@ -16,8 +16,8 @@ */ #include <iostream> -#include <raul/Array.hpp> -#include <raul/Maid.hpp> +#include "raul/Array.hpp" +#include "raul/Maid.hpp" #include "PortImpl.hpp" #include "NodeImpl.hpp" #include "interface/DataType.hpp" diff --git a/src/engine/PortImpl.hpp b/src/engine/PortImpl.hpp index 338c7482..30d5a9b5 100644 --- a/src/engine/PortImpl.hpp +++ b/src/engine/PortImpl.hpp @@ -20,7 +20,7 @@ #include <cstdlib> #include <string> -#include <raul/Array.hpp> +#include "raul/Array.hpp" #include "interface/Port.hpp" #include "types.hpp" #include "GraphObjectImpl.hpp" diff --git a/src/engine/PostProcessor.cpp b/src/engine/PostProcessor.cpp index a50ca275..5d731fbb 100644 --- a/src/engine/PostProcessor.cpp +++ b/src/engine/PostProcessor.cpp @@ -18,8 +18,7 @@ #include <cassert> #include <iostream> #include <pthread.h> -#include <raul/SRSWQueue.hpp> -//#include <raul/Maid.hpp> +#include "raul/SRSWQueue.hpp" #include "events/SendPortValueEvent.hpp" #include "Event.hpp" #include "PostProcessor.hpp" diff --git a/src/engine/PostProcessor.hpp b/src/engine/PostProcessor.hpp index 3d51136d..fe767b60 100644 --- a/src/engine/PostProcessor.hpp +++ b/src/engine/PostProcessor.hpp @@ -20,8 +20,8 @@ #include <pthread.h> #include "types.hpp" -#include <raul/SRSWQueue.hpp> -//#include <raul/Slave.hpp> +#include "raul/SRSWQueue.hpp" +//#include "raul/Slave.hpp" //namespace Raul { class Maid; } diff --git a/src/engine/ProcessSlave.hpp b/src/engine/ProcessSlave.hpp index 029f25b7..c1444815 100644 --- a/src/engine/ProcessSlave.hpp +++ b/src/engine/ProcessSlave.hpp @@ -21,9 +21,9 @@ #include "config.h" #include <sstream> -#include <raul/Slave.hpp> -#include <raul/Array.hpp> -#include <raul/AtomicInt.hpp> +#include "raul/Slave.hpp" +#include "raul/Array.hpp" +#include "raul/AtomicInt.hpp" #include "ProcessContext.hpp" #include "types.hpp" diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 5665c2c7..77c1178d 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -21,7 +21,7 @@ #include <inttypes.h> #include <string> #include <memory> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "tuning.hpp" #include "interface/EngineInterface.hpp" #include "interface/ClientInterface.hpp" diff --git a/src/engine/QueuedEventSource.hpp b/src/engine/QueuedEventSource.hpp index 6dea092d..1d846897 100644 --- a/src/engine/QueuedEventSource.hpp +++ b/src/engine/QueuedEventSource.hpp @@ -21,10 +21,10 @@ #include <cstdlib> #include <pthread.h> #include "types.hpp" -#include <raul/Semaphore.hpp> -#include <raul/AtomicInt.hpp> -#include <raul/SRSWQueue.hpp> -#include <raul/Slave.hpp> +#include "raul/Semaphore.hpp" +#include "raul/AtomicInt.hpp" +#include "raul/SRSWQueue.hpp" +#include "raul/Slave.hpp" #include "Event.hpp" #include "EventSource.hpp" diff --git a/src/engine/Responder.hpp b/src/engine/Responder.hpp index 80d2e24c..6f11ffd0 100644 --- a/src/engine/Responder.hpp +++ b/src/engine/Responder.hpp @@ -20,7 +20,7 @@ #include <inttypes.h> #include <string> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/ClientInterface.hpp" namespace Ingen { diff --git a/src/engine/ThreadManager.hpp b/src/engine/ThreadManager.hpp index 12f27000..7e1e04ab 100644 --- a/src/engine/ThreadManager.hpp +++ b/src/engine/ThreadManager.hpp @@ -18,7 +18,7 @@ #ifndef THREADMANAGER_H #define THREADMANAGER_H -#include <raul/Thread.hpp> +#include "raul/Thread.hpp" using Raul::Thread; diff --git a/src/engine/events/ClearPatchEvent.cpp b/src/engine/events/ClearPatchEvent.cpp index c1fb0749..c180e5fa 100644 --- a/src/engine/events/ClearPatchEvent.cpp +++ b/src/engine/events/ClearPatchEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Maid.hpp> +#include "raul/Maid.hpp" #include "ClearPatchEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" diff --git a/src/engine/events/ClearPatchEvent.hpp b/src/engine/events/ClearPatchEvent.hpp index 803721fb..7fe76c65 100644 --- a/src/engine/events/ClearPatchEvent.hpp +++ b/src/engine/events/ClearPatchEvent.hpp @@ -19,9 +19,9 @@ #define CLEARPATCHEVENT_H #include <string> -#include <raul/Array.hpp> -#include <raul/Table.hpp> -#include <raul/Path.hpp> +#include "raul/Array.hpp" +#include "raul/Table.hpp" +#include "raul/Path.hpp" #include "QueuedEvent.hpp" #include "EngineStore.hpp" #include "PatchImpl.hpp" diff --git a/src/engine/events/ConnectionEvent.cpp b/src/engine/events/ConnectionEvent.cpp index 22bda824..e751c0b9 100644 --- a/src/engine/events/ConnectionEvent.cpp +++ b/src/engine/events/ConnectionEvent.cpp @@ -17,8 +17,8 @@ #include <string> #include <boost/format.hpp> -#include <raul/Maid.hpp> -#include <raul/Path.hpp> +#include "raul/Maid.hpp" +#include "raul/Path.hpp" #include "ClientBroadcaster.hpp" #include "ConnectionEvent.hpp" #include "ConnectionImpl.hpp" diff --git a/src/engine/events/ConnectionEvent.hpp b/src/engine/events/ConnectionEvent.hpp index 89407957..2bc8369f 100644 --- a/src/engine/events/ConnectionEvent.hpp +++ b/src/engine/events/ConnectionEvent.hpp @@ -19,7 +19,7 @@ #define CONNECTIONEVENT_H #include <string> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "QueuedEvent.hpp" #include "PatchImpl.hpp" #include "InputPort.hpp" diff --git a/src/engine/events/CreateNodeEvent.cpp b/src/engine/events/CreateNodeEvent.cpp index b58bc2c3..d616ce1f 100644 --- a/src/engine/events/CreateNodeEvent.cpp +++ b/src/engine/events/CreateNodeEvent.cpp @@ -15,10 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Maid.hpp> -#include <raul/Path.hpp> -#include <raul/Path.hpp> -#include <redlandmm/World.hpp> +#include "raul/Maid.hpp" +#include "raul/Path.hpp" +#include "raul/Path.hpp" +#include "redlandmm/World.hpp" #include "module/World.hpp" #include "CreateNodeEvent.hpp" #include "Responder.hpp" diff --git a/src/engine/events/CreateNodeEvent.hpp b/src/engine/events/CreateNodeEvent.hpp index c3ef6313..6b9e4f30 100644 --- a/src/engine/events/CreateNodeEvent.hpp +++ b/src/engine/events/CreateNodeEvent.hpp @@ -19,7 +19,7 @@ #define CREATENODEEVENT_H #include "QueuedEvent.hpp" -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include <string> using std::string; diff --git a/src/engine/events/CreatePatchEvent.cpp b/src/engine/events/CreatePatchEvent.cpp index 1f6504ab..b390770a 100644 --- a/src/engine/events/CreatePatchEvent.cpp +++ b/src/engine/events/CreatePatchEvent.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Maid.hpp> -#include <raul/Path.hpp> +#include "raul/Maid.hpp" +#include "raul/Path.hpp" #include "CreatePatchEvent.hpp" #include "Responder.hpp" #include "PatchImpl.hpp" diff --git a/src/engine/events/CreatePatchEvent.hpp b/src/engine/events/CreatePatchEvent.hpp index 733aba17..81ef6b44 100644 --- a/src/engine/events/CreatePatchEvent.hpp +++ b/src/engine/events/CreatePatchEvent.hpp @@ -19,7 +19,7 @@ #define CREATEPATCHEVENT_H #include <string> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "QueuedEvent.hpp" using std::string; diff --git a/src/engine/events/CreatePortEvent.cpp b/src/engine/events/CreatePortEvent.cpp index b70615d7..b02bec2a 100644 --- a/src/engine/events/CreatePortEvent.cpp +++ b/src/engine/events/CreatePortEvent.cpp @@ -15,10 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Path.hpp> -#include <raul/Array.hpp> -#include <raul/List.hpp> -#include <raul/Maid.hpp> +#include "raul/Path.hpp" +#include "raul/Array.hpp" +#include "raul/List.hpp" +#include "raul/Maid.hpp" #include "Responder.hpp" #include "CreatePortEvent.hpp" #include "PatchImpl.hpp" diff --git a/src/engine/events/CreatePortEvent.hpp b/src/engine/events/CreatePortEvent.hpp index 5ddd8aa3..c350d301 100644 --- a/src/engine/events/CreatePortEvent.hpp +++ b/src/engine/events/CreatePortEvent.hpp @@ -19,8 +19,8 @@ #define CREATEPORTEVENT_H #include "QueuedEvent.hpp" -#include <raul/Path.hpp> -#include <raul/Array.hpp> +#include "raul/Path.hpp" +#include "raul/Array.hpp" #include "interface/DataType.hpp" #include <string> using std::string; diff --git a/src/engine/events/DestroyEvent.cpp b/src/engine/events/DestroyEvent.cpp index 07770c0a..17552938 100644 --- a/src/engine/events/DestroyEvent.cpp +++ b/src/engine/events/DestroyEvent.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Maid.hpp> -#include <raul/Path.hpp> +#include "raul/Maid.hpp" +#include "raul/Path.hpp" #include "DestroyEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" diff --git a/src/engine/events/DestroyEvent.hpp b/src/engine/events/DestroyEvent.hpp index b24934f8..1876050d 100644 --- a/src/engine/events/DestroyEvent.hpp +++ b/src/engine/events/DestroyEvent.hpp @@ -19,7 +19,7 @@ #define DESTROYEVENT_H #include <string> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "QueuedEvent.hpp" #include "EngineStore.hpp" #include "PatchImpl.hpp" diff --git a/src/engine/events/DisconnectAllEvent.cpp b/src/engine/events/DisconnectAllEvent.cpp index 77b1b1b3..8057a17e 100644 --- a/src/engine/events/DisconnectAllEvent.cpp +++ b/src/engine/events/DisconnectAllEvent.cpp @@ -16,10 +16,10 @@ */ #include <boost/format.hpp> -#include <raul/Array.hpp> -#include <raul/List.hpp> -#include <raul/Maid.hpp> -#include <raul/Path.hpp> +#include "raul/Array.hpp" +#include "raul/List.hpp" +#include "raul/Maid.hpp" +#include "raul/Path.hpp" #include "ClientBroadcaster.hpp" #include "ConnectionImpl.hpp" #include "DisconnectAllEvent.hpp" diff --git a/src/engine/events/DisconnectAllEvent.hpp b/src/engine/events/DisconnectAllEvent.hpp index 6b75e6df..d6e96e38 100644 --- a/src/engine/events/DisconnectAllEvent.hpp +++ b/src/engine/events/DisconnectAllEvent.hpp @@ -19,8 +19,8 @@ #define DISCONNECTNODEEVENT_H #include <string> -#include <raul/List.hpp> -#include <raul/Path.hpp> +#include "raul/List.hpp" +#include "raul/Path.hpp" #include "QueuedEvent.hpp" using std::string; diff --git a/src/engine/events/DisconnectionEvent.cpp b/src/engine/events/DisconnectionEvent.cpp index fa045639..47263755 100644 --- a/src/engine/events/DisconnectionEvent.cpp +++ b/src/engine/events/DisconnectionEvent.cpp @@ -15,10 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "DisconnectionEvent.hpp" #include <string> -#include <raul/Maid.hpp> -#include <raul/Path.hpp> +#include "raul/Maid.hpp" +#include "raul/Path.hpp" +#include "DisconnectionEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" #include "ConnectionImpl.hpp" @@ -30,6 +30,7 @@ #include "EngineStore.hpp" using std::string; + namespace Ingen { diff --git a/src/engine/events/DisconnectionEvent.hpp b/src/engine/events/DisconnectionEvent.hpp index 700febeb..1ecf40a0 100644 --- a/src/engine/events/DisconnectionEvent.hpp +++ b/src/engine/events/DisconnectionEvent.hpp @@ -19,7 +19,7 @@ #define DISCONNECTIONEVENT_H #include <string> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "QueuedEvent.hpp" #include "types.hpp" #include "PatchImpl.hpp" diff --git a/src/engine/events/LoadPluginsEvent.cpp b/src/engine/events/LoadPluginsEvent.cpp index df5ff5d9..67fbed79 100644 --- a/src/engine/events/LoadPluginsEvent.cpp +++ b/src/engine/events/LoadPluginsEvent.cpp @@ -22,9 +22,6 @@ #include "ClientBroadcaster.hpp" #include "QueuedEventSource.hpp" -#include <iostream> -using std::cerr; - namespace Ingen { diff --git a/src/engine/events/RenameEvent.cpp b/src/engine/events/RenameEvent.cpp index 164676aa..4112527b 100644 --- a/src/engine/events/RenameEvent.cpp +++ b/src/engine/events/RenameEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "ClientBroadcaster.hpp" #include "Engine.hpp" #include "NodeImpl.hpp" diff --git a/src/engine/events/RenameEvent.hpp b/src/engine/events/RenameEvent.hpp index e230c589..db6d01b9 100644 --- a/src/engine/events/RenameEvent.hpp +++ b/src/engine/events/RenameEvent.hpp @@ -19,7 +19,7 @@ #define RENAMEEVENT_H #include <string> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "QueuedEvent.hpp" #include "EngineStore.hpp" diff --git a/src/engine/events/RequestMetadataEvent.cpp b/src/engine/events/RequestMetadataEvent.cpp index 733a6a82..628b11c4 100644 --- a/src/engine/events/RequestMetadataEvent.cpp +++ b/src/engine/events/RequestMetadataEvent.cpp @@ -15,14 +15,15 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "RequestMetadataEvent.hpp" #include <string> +#include "interface/ClientInterface.hpp" +#include "RequestMetadataEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" #include "GraphObjectImpl.hpp" #include "EngineStore.hpp" -#include "interface/ClientInterface.hpp" #include "ClientBroadcaster.hpp" + using std::string; namespace Ingen { diff --git a/src/engine/events/RequestMetadataEvent.hpp b/src/engine/events/RequestMetadataEvent.hpp index f6a18dfc..3a1d8827 100644 --- a/src/engine/events/RequestMetadataEvent.hpp +++ b/src/engine/events/RequestMetadataEvent.hpp @@ -20,7 +20,7 @@ #include <string> #include "QueuedEvent.hpp" -#include <raul/Atom.hpp> +#include "raul/Atom.hpp" using std::string; namespace Ingen { diff --git a/src/engine/events/RequestObjectEvent.cpp b/src/engine/events/RequestObjectEvent.cpp index 88479482..30f95c03 100644 --- a/src/engine/events/RequestObjectEvent.cpp +++ b/src/engine/events/RequestObjectEvent.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "RequestObjectEvent.hpp" #include <string> +#include "RequestObjectEvent.hpp" #include "interface/ClientInterface.hpp" #include "Responder.hpp" #include "Engine.hpp" diff --git a/src/engine/events/RequestPortValueEvent.cpp b/src/engine/events/RequestPortValueEvent.cpp index 025d3700..0bb9867a 100644 --- a/src/engine/events/RequestPortValueEvent.cpp +++ b/src/engine/events/RequestPortValueEvent.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "RequestPortValueEvent.hpp" #include <string> +#include "RequestPortValueEvent.hpp" #include "interface/ClientInterface.hpp" #include "Responder.hpp" #include "Engine.hpp" diff --git a/src/engine/events/SetMetadataEvent.hpp b/src/engine/events/SetMetadataEvent.hpp index 6b9be81c..ef1538b7 100644 --- a/src/engine/events/SetMetadataEvent.hpp +++ b/src/engine/events/SetMetadataEvent.hpp @@ -20,7 +20,7 @@ #include <string> #include "QueuedEvent.hpp" -#include <raul/Atom.hpp> +#include "raul/Atom.hpp" using std::string; diff --git a/src/engine/events/SetPolyphonicEvent.cpp b/src/engine/events/SetPolyphonicEvent.cpp index d1fc6a7c..87e03d9e 100644 --- a/src/engine/events/SetPolyphonicEvent.cpp +++ b/src/engine/events/SetPolyphonicEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Maid.hpp> +#include "raul/Maid.hpp" #include "SetPolyphonicEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" diff --git a/src/engine/events/SetPolyphonicEvent.hpp b/src/engine/events/SetPolyphonicEvent.hpp index 9079d49f..93505cba 100644 --- a/src/engine/events/SetPolyphonicEvent.hpp +++ b/src/engine/events/SetPolyphonicEvent.hpp @@ -19,7 +19,7 @@ #define SETPOLYPHONICEVENT_H #include <string> -#include <raul/Array.hpp> +#include "raul/Array.hpp" #include "QueuedEvent.hpp" using std::string; diff --git a/src/engine/events/SetPolyphonyEvent.cpp b/src/engine/events/SetPolyphonyEvent.cpp index eb6550cb..8f48fc41 100644 --- a/src/engine/events/SetPolyphonyEvent.cpp +++ b/src/engine/events/SetPolyphonyEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Maid.hpp> +#include "raul/Maid.hpp" #include "SetPolyphonyEvent.hpp" #include "Responder.hpp" #include "Engine.hpp" diff --git a/src/engine/events/SetPolyphonyEvent.hpp b/src/engine/events/SetPolyphonyEvent.hpp index 8aba997a..f9c5b4f9 100644 --- a/src/engine/events/SetPolyphonyEvent.hpp +++ b/src/engine/events/SetPolyphonyEvent.hpp @@ -19,7 +19,7 @@ #define SETPOLYPHONYEVENT_H #include <string> -#include <raul/Array.hpp> +#include "raul/Array.hpp" #include "QueuedEvent.hpp" using std::string; diff --git a/src/engine/events/SetPortValueEvent.cpp b/src/engine/events/SetPortValueEvent.cpp index b56dcbf5..b225862e 100644 --- a/src/engine/events/SetPortValueEvent.cpp +++ b/src/engine/events/SetPortValueEvent.cpp @@ -16,7 +16,7 @@ */ #include <sstream> -#include <lv2ext/lv2_event.h> +#include "lv2ext/lv2_event.h" #include "Responder.hpp" #include "SetPortValueEvent.hpp" #include "Engine.hpp" diff --git a/src/engine/ingen_engine.cpp b/src/engine/ingen_engine.cpp index 137499ee..08bbd5f8 100644 --- a/src/engine/ingen_engine.cpp +++ b/src/engine/ingen_engine.cpp @@ -18,7 +18,7 @@ #include "config.h" #include <string> -#include <raul/Process.hpp> +#include "raul/Process.hpp" #include "ingen_engine.hpp" #include "Engine.hpp" #include "tuning.hpp" diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 49f25b1e..7e414297 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -23,8 +23,8 @@ #include <libgnomecanvasmm.h> #include <time.h> #include <sys/time.h> -#include <raul/Path.hpp> -#include <flowcanvas/Connection.hpp> +#include "raul/Path.hpp" +#include "flowcanvas/Connection.hpp" #include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" @@ -48,7 +48,7 @@ #include "WindowFactory.hpp" #include "Port.hpp" #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #endif using namespace std; diff --git a/src/gui/App.hpp b/src/gui/App.hpp index f9b39d40..d3399f63 100644 --- a/src/gui/App.hpp +++ b/src/gui/App.hpp @@ -26,8 +26,8 @@ #include <libgnomecanvasmm.h> #include <gtkmm.h> #include <libglademm.h> -#include <raul/SharedPtr.hpp> -#include <raul/Deletable.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Deletable.hpp" #include <module/World.hpp> namespace Ingen { diff --git a/src/gui/BreadCrumb.hpp b/src/gui/BreadCrumb.hpp index c3b05e01..45bdae31 100644 --- a/src/gui/BreadCrumb.hpp +++ b/src/gui/BreadCrumb.hpp @@ -19,8 +19,8 @@ #define BREADCRUMB_H #include <gtkmm.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "PatchView.hpp" namespace Ingen { diff --git a/src/gui/BreadCrumbBox.hpp b/src/gui/BreadCrumbBox.hpp index b5650252..caaca612 100644 --- a/src/gui/BreadCrumbBox.hpp +++ b/src/gui/BreadCrumbBox.hpp @@ -22,8 +22,8 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "PatchView.hpp" namespace Ingen { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 906a16dc..41d26f5b 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -21,7 +21,7 @@ #include <stdlib.h> #include <sys/time.h> #include <sys/resource.h> -#include <raul/Process.hpp> +#include "raul/Process.hpp" #include "config.h" #include "interface/EngineInterface.hpp" #include "module/World.hpp" diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp index 1635dbde..06283c70 100644 --- a/src/gui/ConnectWindow.hpp +++ b/src/gui/ConnectWindow.hpp @@ -21,13 +21,13 @@ #include "config.h" #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #endif #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/ThreadedSigClientInterface.hpp" using Ingen::Client::SigClientInterface; diff --git a/src/gui/Connection.hpp b/src/gui/Connection.hpp index 55378891..5291a7c7 100644 --- a/src/gui/Connection.hpp +++ b/src/gui/Connection.hpp @@ -20,8 +20,8 @@ #include <cassert> #include <string> -#include <flowcanvas/Connection.hpp> -#include <raul/SharedPtr.hpp> +#include "flowcanvas/Connection.hpp" +#include "raul/SharedPtr.hpp" #include "client/ConnectionModel.hpp" using Ingen::Client::ConnectionModel; diff --git a/src/gui/ControlPanel.hpp b/src/gui/ControlPanel.hpp index 8af5a728..579531d8 100644 --- a/src/gui/ControlPanel.hpp +++ b/src/gui/ControlPanel.hpp @@ -26,7 +26,7 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "Controls.hpp" namespace Ingen { namespace Client { diff --git a/src/gui/Controls.hpp b/src/gui/Controls.hpp index 8a9c4064..db480dc2 100644 --- a/src/gui/Controls.hpp +++ b/src/gui/Controls.hpp @@ -23,7 +23,7 @@ #include <libglademm/xml.h> #include <libglademm.h> #include "client/PortModel.hpp" -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Ingen { namespace Client { class PortModel; } } using namespace Ingen::Client; diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp index 4f3521e5..22d2509a 100644 --- a/src/gui/LoadPatchWindow.hpp +++ b/src/gui/LoadPatchWindow.hpp @@ -20,7 +20,7 @@ #include <libglademm/xml.h> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PluginModel.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp index ee804773..0faf4eb9 100644 --- a/src/gui/LoadPluginWindow.hpp +++ b/src/gui/LoadPluginWindow.hpp @@ -21,8 +21,8 @@ #include <libglademm/xml.h> #include <libglademm.h> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> -#include <raul/Table.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Table.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index 5567d67b..c2979e80 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -18,7 +18,7 @@ #include <sys/types.h> #include <dirent.h> #include <boost/optional/optional.hpp> -#include <redlandmm/Query.hpp> +#include "redlandmm/Query.hpp" #include "client/PatchModel.hpp" #include "interface/EngineInterface.hpp" #include "module/World.hpp" diff --git a/src/gui/LoadRemotePatchWindow.hpp b/src/gui/LoadRemotePatchWindow.hpp index ca0ca814..e343fc64 100644 --- a/src/gui/LoadRemotePatchWindow.hpp +++ b/src/gui/LoadRemotePatchWindow.hpp @@ -20,7 +20,7 @@ #include <libglademm/xml.h> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/LoadSubpatchWindow.hpp b/src/gui/LoadSubpatchWindow.hpp index ee8a5a16..e3d138c3 100644 --- a/src/gui/LoadSubpatchWindow.hpp +++ b/src/gui/LoadSubpatchWindow.hpp @@ -20,7 +20,7 @@ #include <libglademm/xml.h> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" #include "interface/GraphObject.hpp" diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp index 00fb6a3b..b3482fdd 100644 --- a/src/gui/NewSubpatchWindow.hpp +++ b/src/gui/NewSubpatchWindow.hpp @@ -20,7 +20,7 @@ #include <libglademm/xml.h> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" diff --git a/src/gui/NodeControlWindow.hpp b/src/gui/NodeControlWindow.hpp index 84e462c5..2e6c5837 100644 --- a/src/gui/NodeControlWindow.hpp +++ b/src/gui/NodeControlWindow.hpp @@ -23,7 +23,7 @@ #include <gtkmm.h> #include <libglademm.h> #include <sigc++/sigc++.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" using std::string; using std::vector; namespace Ingen { namespace Client { diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp index 67bed69a..d31aded2 100644 --- a/src/gui/NodeMenu.hpp +++ b/src/gui/NodeMenu.hpp @@ -20,8 +20,8 @@ #include <string> #include <gtkmm.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/NodeModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp index 742ad4c4..16e624e4 100644 --- a/src/gui/NodeModule.cpp +++ b/src/gui/NodeModule.cpp @@ -16,7 +16,7 @@ */ #include <cassert> -#include <raul/Atom.hpp> +#include "raul/Atom.hpp" #include "interface/EngineInterface.hpp" #include "client/NodeModel.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/NodeModule.hpp b/src/gui/NodeModule.hpp index 5747bf30..b9425a86 100644 --- a/src/gui/NodeModule.hpp +++ b/src/gui/NodeModule.hpp @@ -19,8 +19,8 @@ #include <string> #include <libgnomecanvasmm.h> -#include <flowcanvas/Module.hpp> -#include <raul/SharedPtr.hpp> +#include "flowcanvas/Module.hpp" +#include "raul/SharedPtr.hpp" #include "Port.hpp" class Atom; diff --git a/src/gui/NodePropertiesWindow.hpp b/src/gui/NodePropertiesWindow.hpp index 248c8b42..0152ed5b 100644 --- a/src/gui/NodePropertiesWindow.hpp +++ b/src/gui/NodePropertiesWindow.hpp @@ -20,7 +20,7 @@ #include <gtkmm.h> #include <libglademm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/NodeModel.hpp" using namespace Ingen::Client; diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp index b5c5bf49..838b8052 100644 --- a/src/gui/ObjectMenu.hpp +++ b/src/gui/ObjectMenu.hpp @@ -21,8 +21,8 @@ #include <string> #include <gtkmm.h> #include <libglademm/xml.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/ObjectModel.hpp" using Ingen::Client::ObjectModel; diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index bc7832ea..cb596791 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -20,8 +20,8 @@ #include "module/World.hpp" #include <cassert> -#include <flowcanvas/Canvas.hpp> -#include <flowcanvas/Ellipse.hpp> +#include "flowcanvas/Canvas.hpp" +#include "flowcanvas/Ellipse.hpp" #include "interface/EngineInterface.hpp" #include "shared/Builder.hpp" #include "shared/ClashAvoider.hpp" diff --git a/src/gui/PatchCanvas.hpp b/src/gui/PatchCanvas.hpp index 98c71aff..5896957e 100644 --- a/src/gui/PatchCanvas.hpp +++ b/src/gui/PatchCanvas.hpp @@ -23,10 +23,10 @@ #include <string> #include <map> #include <boost/shared_ptr.hpp> -#include <flowcanvas/Canvas.hpp> -#include <flowcanvas/Module.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/Path.hpp> +#include "flowcanvas/Canvas.hpp" +#include "flowcanvas/Module.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" #include "client/ConnectionModel.hpp" #include "client/PatchModel.hpp" #include "interface/GraphObject.hpp" diff --git a/src/gui/PatchPortModule.hpp b/src/gui/PatchPortModule.hpp index d6715834..eec1b2c4 100644 --- a/src/gui/PatchPortModule.hpp +++ b/src/gui/PatchPortModule.hpp @@ -21,8 +21,8 @@ #include <string> #include <boost/enable_shared_from_this.hpp> #include <libgnomecanvasmm.h> -#include <flowcanvas/Module.hpp> -#include <raul/Atom.hpp> +#include "flowcanvas/Module.hpp" +#include "raul/Atom.hpp" #include "Port.hpp" using std::string; diff --git a/src/gui/PatchPropertiesWindow.hpp b/src/gui/PatchPropertiesWindow.hpp index 59d27389..1020bffc 100644 --- a/src/gui/PatchPropertiesWindow.hpp +++ b/src/gui/PatchPropertiesWindow.hpp @@ -21,7 +21,7 @@ #include <string> #include <gtkmm.h> #include <libglademm/xml.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" using std::string; namespace Ingen { namespace Client { class PatchModel; } } diff --git a/src/gui/PatchTreeWindow.cpp b/src/gui/PatchTreeWindow.cpp index 5afce50a..cf422409 100644 --- a/src/gui/PatchTreeWindow.cpp +++ b/src/gui/PatchTreeWindow.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/Path.hpp> +#include "raul/Path.hpp" #include "interface/EngineInterface.hpp" #include "client/ClientStore.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp index f549a322..6fcea6d9 100644 --- a/src/gui/PatchTreeWindow.hpp +++ b/src/gui/PatchTreeWindow.hpp @@ -20,7 +20,7 @@ #include <gtkmm.h> #include <libglademm.h> -#include <raul/Path.hpp> +#include "raul/Path.hpp" namespace Ingen { namespace Client { class ClientStore; diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp index 2c0570bd..209480f2 100644 --- a/src/gui/PatchView.hpp +++ b/src/gui/PatchView.hpp @@ -22,7 +22,7 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" using std::string; diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp index 4d4f0f1e..3673e1a8 100644 --- a/src/gui/PatchWindow.hpp +++ b/src/gui/PatchWindow.hpp @@ -23,8 +23,8 @@ #include <gtkmm.h> #include <libglademm/xml.h> #include <libglademm.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" #include "PatchView.hpp" using Ingen::Client::PatchModel; diff --git a/src/gui/Port.hpp b/src/gui/Port.hpp index 7b347194..ebf9a59e 100644 --- a/src/gui/Port.hpp +++ b/src/gui/Port.hpp @@ -20,9 +20,9 @@ #include <cassert> #include <string> -#include <flowcanvas/Port.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/Atom.hpp> +#include "flowcanvas/Port.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/Atom.hpp" namespace Ingen { namespace Client { class PortModel; } } using Ingen::Client::PortModel; diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp index 45b216b6..ea9b2dc9 100644 --- a/src/gui/PortMenu.cpp +++ b/src/gui/PortMenu.cpp @@ -17,7 +17,7 @@ #include <iostream> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/EngineInterface.hpp" #include "client/PortModel.hpp" #include "App.hpp" diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp index 520c5809..a7df2117 100644 --- a/src/gui/PortMenu.hpp +++ b/src/gui/PortMenu.hpp @@ -20,8 +20,8 @@ #include <string> #include <gtkmm.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" #include "client/PortModel.hpp" #include "ObjectMenu.hpp" diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp index 4580c7c6..e8037e36 100644 --- a/src/gui/PortPropertiesWindow.hpp +++ b/src/gui/PortPropertiesWindow.hpp @@ -20,7 +20,7 @@ #include <gtkmm.h> #include <libglademm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/PortModel.hpp" using namespace Ingen::Client; diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp index 3cf37f7c..6e6a09f5 100644 --- a/src/gui/RenameWindow.hpp +++ b/src/gui/RenameWindow.hpp @@ -20,7 +20,7 @@ #include <gtkmm.h> #include <libglademm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/ObjectModel.hpp" using Ingen::Client::ObjectModel; diff --git a/src/gui/SubpatchModule.hpp b/src/gui/SubpatchModule.hpp index 44e37e62..11c53a69 100644 --- a/src/gui/SubpatchModule.hpp +++ b/src/gui/SubpatchModule.hpp @@ -21,7 +21,7 @@ #include <string> #include <libgnomecanvasmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "client/PatchModel.hpp" #include "PatchPortModule.hpp" #include "NodeModule.hpp" diff --git a/src/gui/ThreadedLoader.hpp b/src/gui/ThreadedLoader.hpp index 3cf88cf9..fee298d8 100644 --- a/src/gui/ThreadedLoader.hpp +++ b/src/gui/ThreadedLoader.hpp @@ -22,8 +22,8 @@ #include <list> #include <cassert> #include <boost/optional/optional.hpp> -#include <raul/Thread.hpp> -#include <raul/Slave.hpp> +#include "raul/Thread.hpp" +#include "raul/Slave.hpp" #include <glibmm/thread.h> #include "interface/EngineInterface.hpp" #include "client/PatchModel.hpp" diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp index 2ca54f3c..bb45cc71 100644 --- a/src/gui/UploadPatchWindow.cpp +++ b/src/gui/UploadPatchWindow.cpp @@ -21,7 +21,7 @@ #include <dirent.h> #include <boost/optional/optional.hpp> #include <curl/curl.h> -#include <redlandmm/Query.hpp> +#include "redlandmm/Query.hpp" #include "module/global.hpp" #include "module/World.hpp" #include "client/ClientStore.hpp" diff --git a/src/gui/UploadPatchWindow.hpp b/src/gui/UploadPatchWindow.hpp index af064bdb..4c3cfdfc 100644 --- a/src/gui/UploadPatchWindow.hpp +++ b/src/gui/UploadPatchWindow.hpp @@ -22,9 +22,9 @@ #include <libglademm/xml.h> #include <gtkmm.h> #include <curl/curl.h> -#include <raul/SharedPtr.hpp> -#include <raul/Thread.hpp> -#include <raul/AtomicInt.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Thread.hpp" +#include "raul/AtomicInt.hpp" #include "client/PatchModel.hpp" #include "client/PluginModel.hpp" using Ingen::Client::PatchModel; diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp index 618b027c..487cbdb4 100644 --- a/src/gui/WindowFactory.hpp +++ b/src/gui/WindowFactory.hpp @@ -20,7 +20,7 @@ #include <map> #include <gtkmm.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "interface/GraphObject.hpp" #include "client/PatchModel.hpp" #include "PatchView.hpp" diff --git a/src/gui/gui.hpp b/src/gui/gui.hpp index 3aa86f3b..ab1be8ab 100644 --- a/src/gui/gui.hpp +++ b/src/gui/gui.hpp @@ -20,7 +20,7 @@ #include "config.h" #include "module/global.hpp" -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Ingen { diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 0b2ed83e..e6f9a4ce 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -25,9 +25,9 @@ #include <glibmm/miscutils.h> #include <glibmm/spawn.h> #include <glibmm/thread.h> -#include <raul/Path.hpp> -#include <raul/SharedPtr.hpp> -#include <redlandmm/World.hpp> +#include "raul/Path.hpp" +#include "raul/SharedPtr.hpp" +#include "redlandmm/World.hpp" #include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" diff --git a/src/module/Module.cpp b/src/module/Module.cpp index 76f9baac..02808206 100644 --- a/src/module/Module.cpp +++ b/src/module/Module.cpp @@ -21,7 +21,7 @@ #include <glibmm/module.h> #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #ifndef INGEN_MODULE_DIR #error This file expects INGEN_MODULE_DIR to be defined. diff --git a/src/module/Module.hpp b/src/module/Module.hpp index 2d9ba382..a91e6803 100644 --- a/src/module/Module.hpp +++ b/src/module/Module.hpp @@ -17,7 +17,7 @@ #include <string> #include <glibmm/module.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Ingen { namespace Shared { diff --git a/src/module/World.hpp b/src/module/World.hpp index 443c6d01..d8935fa5 100644 --- a/src/module/World.hpp +++ b/src/module/World.hpp @@ -22,11 +22,11 @@ #include <string> #include <glibmm/module.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "shared/LV2Features.hpp" #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #endif namespace Redland { class World; } diff --git a/src/module/global.cpp b/src/module/global.cpp index d03ed260..47894be4 100644 --- a/src/module/global.cpp +++ b/src/module/global.cpp @@ -16,13 +16,13 @@ */ #include <iostream> -#include <redlandmm/World.hpp> +#include "redlandmm/World.hpp" #include "global.hpp" #include "World.hpp" #include "config.h" #ifdef HAVE_SLV2 -#include <slv2/slv2.h> +#include "slv2/slv2.h" #endif using namespace std; diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 3dda415c..3945c379 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -19,12 +19,12 @@ #include <set> #include <locale.h> #include <glibmm/ustring.h> -#include <redlandmm/Model.hpp> -#include <redlandmm/Node.hpp> -#include <redlandmm/Query.hpp> -#include <raul/TableImpl.hpp> -#include <raul/Atom.hpp> -#include <raul/AtomRDF.hpp> +#include "redlandmm/Model.hpp" +#include "redlandmm/Node.hpp" +#include "redlandmm/Query.hpp" +#include "raul/TableImpl.hpp" +#include "raul/Atom.hpp" +#include "raul/AtomRDF.hpp" #include "interface/EngineInterface.hpp" #include "Parser.hpp" diff --git a/src/serialisation/Parser.hpp b/src/serialisation/Parser.hpp index 7b8a35eb..9d1314fe 100644 --- a/src/serialisation/Parser.hpp +++ b/src/serialisation/Parser.hpp @@ -21,9 +21,9 @@ #include <string> #include <glibmm/ustring.h> #include <boost/optional.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/Path.hpp> -#include <raul/Table.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" +#include "raul/Table.hpp" #include "interface/GraphObject.hpp" #include "module/World.hpp" diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index 7dccbe2c..96fe2632 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -27,13 +27,13 @@ #include <string> #include <utility> // pair, make_pair #include <vector> -#include <raul/Atom.hpp> -#include <raul/AtomRDF.hpp> -#include <raul/Path.hpp> -#include <raul/TableImpl.hpp> -#include <redlandmm/Model.hpp> -#include <redlandmm/Node.hpp> -#include <redlandmm/World.hpp> +#include "raul/Atom.hpp" +#include "raul/AtomRDF.hpp" +#include "raul/Path.hpp" +#include "raul/TableImpl.hpp" +#include "redlandmm/Model.hpp" +#include "redlandmm/Node.hpp" +#include "redlandmm/World.hpp" #include "module/World.hpp" #include "interface/EngineInterface.hpp" #include "interface/Plugin.hpp" diff --git a/src/serialisation/Serialiser.hpp b/src/serialisation/Serialiser.hpp index a739980c..58cad912 100644 --- a/src/serialisation/Serialiser.hpp +++ b/src/serialisation/Serialiser.hpp @@ -23,11 +23,11 @@ #include <string> #include <stdexcept> #include <cassert> -#include <raul/SharedPtr.hpp> -#include <raul/Path.hpp> -#include <raul/Atom.hpp> -#include <redlandmm/World.hpp> -#include <redlandmm/Model.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" +#include "raul/Atom.hpp" +#include "redlandmm/World.hpp" +#include "redlandmm/Model.hpp" #include "interface/GraphObject.hpp" #include "shared/Store.hpp" diff --git a/src/shared/Builder.cpp b/src/shared/Builder.cpp index 1eb127a5..48950e2e 100644 --- a/src/shared/Builder.cpp +++ b/src/shared/Builder.cpp @@ -22,7 +22,7 @@ #include "common/interface/Port.hpp" #include "common/interface/Connection.hpp" #include "common/interface/Plugin.hpp" -#include <iostream> + using namespace std; namespace Ingen { @@ -41,8 +41,7 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) SharedPtr<const Patch> patch = PtrCast<const Patch>(object); if (patch) { if (object->path() != "/") { - const std::string path_str = prefix.base() + object->path().substr(1); - //cout << "BUILDING PATCH " << path_str << endl; + const string path_str = prefix.base() + object->path().substr(1); _interface.new_patch(path_str, patch->internal_polyphony()); } @@ -50,7 +49,6 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) for (Patch::Connections::const_iterator i = patch->connections().begin(); i != patch->connections().end(); ++i) { string base = prefix.base() + object->path().substr(1); - cout << "*********** BASE: " << base << endl; _interface.connect(base + (*i)->src_port_path().substr(1), base + (*i)->dst_port_path().substr(1)); } @@ -60,7 +58,6 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) SharedPtr<const Node> node = PtrCast<const Node>(object); if (node) { Raul::Path path = prefix.base() + node->path().substr(1); - //cout << "BUILDING NODE " << path << endl; _interface.new_node(path, node->plugin()->uri()); build_object(prefix, object); return; @@ -69,7 +66,6 @@ Builder::build(const Raul::Path& prefix, SharedPtr<const GraphObject> object) SharedPtr<const Port> port = PtrCast<const Port>(object); if (port) { Raul::Path path = prefix.base() + port->path().substr(1); - //cout << "BUILDING PORT " << path << endl; _interface.new_port(path, port->index(), port->type().uri(), !port->is_input()); build_object(prefix, object); return; diff --git a/src/shared/Builder.hpp b/src/shared/Builder.hpp index a980bad2..f4b33538 100644 --- a/src/shared/Builder.hpp +++ b/src/shared/Builder.hpp @@ -18,7 +18,7 @@ #ifndef BUILDER_H #define BUILDER_H -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Raul { class Path; } diff --git a/src/shared/ClashAvoider.hpp b/src/shared/ClashAvoider.hpp index f7016e4e..c6501b5f 100644 --- a/src/shared/ClashAvoider.hpp +++ b/src/shared/ClashAvoider.hpp @@ -21,8 +21,8 @@ #include <inttypes.h> #include <string> #include <map> -#include <raul/Atom.hpp> -#include <raul/Path.hpp> +#include "raul/Atom.hpp" +#include "raul/Path.hpp" #include "interface/CommonInterface.hpp" namespace Ingen { diff --git a/src/shared/LV2Features.hpp b/src/shared/LV2Features.hpp index 4eac6daa..ef39c6b9 100644 --- a/src/shared/LV2Features.hpp +++ b/src/shared/LV2Features.hpp @@ -25,7 +25,7 @@ #include <map> #include <string> -#include <slv2/slv2.h> +#include "slv2/slv2.h" namespace Ingen { namespace Shared { diff --git a/src/shared/LV2URIMap.hpp b/src/shared/LV2URIMap.hpp index 8821c4f6..a6642c28 100644 --- a/src/shared/LV2URIMap.hpp +++ b/src/shared/LV2URIMap.hpp @@ -26,7 +26,7 @@ #include <map> #include <string> #include <boost/utility.hpp> -#include <slv2/slv2.h> +#include "slv2/slv2.h" #include "common/lv2ext/lv2_uri_map.h" namespace Ingen { diff --git a/src/shared/Store.cpp b/src/shared/Store.cpp index 9f0f3624..d5e95e00 100644 --- a/src/shared/Store.cpp +++ b/src/shared/Store.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <raul/PathTable.hpp> -#include <raul/TableImpl.hpp> +#include "raul/PathTable.hpp" +#include "raul/TableImpl.hpp" #include "common/interface/Node.hpp" #include "common/interface/Port.hpp" #include "Store.hpp" diff --git a/src/shared/Store.hpp b/src/shared/Store.hpp index 27754345..809ebabc 100644 --- a/src/shared/Store.hpp +++ b/src/shared/Store.hpp @@ -20,7 +20,7 @@ #include <string> #include <glibmm/thread.h> -#include <raul/PathTable.hpp> +#include "raul/PathTable.hpp" #include "interface/GraphObject.hpp" using Raul::PathTable; |