diff options
Diffstat (limited to 'src')
39 files changed, 108 insertions, 108 deletions
diff --git a/src/engine/Action.cpp b/src/engine/Action.cpp index bb7adaf..c13e9c8 100644 --- a/src/engine/Action.cpp +++ b/src/engine/Action.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <redlandmm/World.hpp> -#include <redlandmm/Model.hpp> +#include "redlandmm/World.hpp" +#include "redlandmm/Model.hpp" #include "machina/Action.hpp" namespace Machina { diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp index 70539e0..e380a30 100644 --- a/src/engine/Edge.cpp +++ b/src/engine/Edge.cpp @@ -15,10 +15,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <raul/Atom.hpp> -#include <raul/AtomRDF.hpp> -#include <redlandmm/World.hpp> -#include <redlandmm/Model.hpp> +#include "raul/Atom.hpp" +#include "raul/AtomRDF.hpp" +#include "redlandmm/World.hpp" +#include "redlandmm/Model.hpp" #include "machina/Node.hpp" #include "machina/Edge.hpp" diff --git a/src/engine/Evolver.cpp b/src/engine/Evolver.cpp index 507b4b8..3cb2dd8 100644 --- a/src/engine/Evolver.cpp +++ b/src/engine/Evolver.cpp @@ -16,12 +16,12 @@ */ #include <iostream> -#include <eugene/core/Mutation.hpp> -#include <eugene/core/HybridMutation.hpp> -#include <eugene/core/TournamentSelection.hpp> -#include <machina/Evolver.hpp> -#include <machina/Mutation.hpp> -#include <machina/Problem.hpp> +#include "eugene/core/Mutation.hpp" +#include "eugene/core/HybridMutation.hpp" +#include "eugene/core/TournamentSelection.hpp" +#include "machina/Evolver.hpp" +#include "machina/Mutation.hpp" +#include "machina/Problem.hpp" using namespace std; using namespace Eugene; diff --git a/src/engine/LearnRequest.cpp b/src/engine/LearnRequest.cpp index 2bcd719..00401dc 100644 --- a/src/engine/LearnRequest.cpp +++ b/src/engine/LearnRequest.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <raul/Quantizer.hpp> -#include <machina/LearnRequest.hpp> +#include "raul/Quantizer.hpp" +#include "machina/LearnRequest.hpp" namespace Machina { diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp index 3cc93aa..830ef47 100644 --- a/src/engine/Loader.cpp +++ b/src/engine/Loader.cpp @@ -19,7 +19,7 @@ #include <map> #include <cmath> #include <glibmm/ustring.h> -#include <redlandmm/Query.hpp> +#include "redlandmm/Query.hpp" #include "machina/Loader.hpp" #include "machina/Node.hpp" #include "machina/Edge.hpp" diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp index 23bf1f8..99dd93e 100644 --- a/src/engine/Machine.cpp +++ b/src/engine/Machine.cpp @@ -16,9 +16,9 @@ */ #include <cstdlib> -#include <raul/SharedPtr.hpp> -#include <redlandmm/Model.hpp> -#include <redlandmm/World.hpp> +#include "raul/SharedPtr.hpp" +#include "redlandmm/Model.hpp" +#include "redlandmm/World.hpp" #include "machina/Edge.hpp" #include "machina/Machine.hpp" #include "machina/MidiAction.hpp" diff --git a/src/engine/MachineBuilder.cpp b/src/engine/MachineBuilder.cpp index 206df5d..21280e0 100644 --- a/src/engine/MachineBuilder.cpp +++ b/src/engine/MachineBuilder.cpp @@ -16,8 +16,8 @@ */ #include <algorithm> -#include <raul/midi_events.h> -#include <raul/Quantizer.hpp> +#include "raul/midi_events.h" +#include "raul/Quantizer.hpp" #include "machina/MachineBuilder.hpp" #include "machina/Machine.hpp" #include "machina/Node.hpp" diff --git a/src/engine/MidiAction.cpp b/src/engine/MidiAction.cpp index bad3fc0..c57a9c0 100644 --- a/src/engine/MidiAction.cpp +++ b/src/engine/MidiAction.cpp @@ -16,10 +16,10 @@ */ #include <iostream> -#include <raul/SharedPtr.hpp> -#include <raul/MIDISink.hpp> -#include <raul/Atom.hpp> -#include <raul/AtomRDF.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/MIDISink.hpp" +#include "raul/Atom.hpp" +#include "raul/AtomRDF.hpp" #include "machina/MidiAction.hpp" namespace Machina { diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp index f24c4be..067b54d 100644 --- a/src/engine/Node.cpp +++ b/src/engine/Node.cpp @@ -16,13 +16,13 @@ */ #include <cassert> -#include <raul/Atom.hpp> -#include <raul/AtomRDF.hpp> -#include <redlandmm/World.hpp> -#include <redlandmm/Model.hpp> -#include <machina/Node.hpp> -#include <machina/Edge.hpp> -#include <machina/ActionFactory.hpp> +#include "raul/Atom.hpp" +#include "raul/AtomRDF.hpp" +#include "redlandmm/World.hpp" +#include "redlandmm/Model.hpp" +#include "machina/Node.hpp" +#include "machina/Edge.hpp" +#include "machina/ActionFactory.hpp" using namespace Raul; diff --git a/src/engine/Problem.cpp b/src/engine/Problem.cpp index dfbe038..daf3ace 100644 --- a/src/engine/Problem.cpp +++ b/src/engine/Problem.cpp @@ -21,13 +21,13 @@ #include <set> #include <vector> #include <iostream> -#include <machina/Problem.hpp> -#include <machina/Machine.hpp> -#include <machina/ActionFactory.hpp> -#include <machina/Edge.hpp> -#include <raul/SMFReader.hpp> -#include <raul/midi_events.h> - #include <eugene/core/Problem.hpp> +#include "machina/Problem.hpp" +#include "machina/Machine.hpp" +#include "machina/ActionFactory.hpp" +#include "machina/Edge.hpp" +#include "raul/SMFReader.hpp" +#include "raul/midi_events.h" +#include "eugene/core/Problem.hpp" using namespace std; diff --git a/src/engine/RaulJackDriver.cpp b/src/engine/RaulJackDriver.cpp index b6bbd27..6c60085 100644 --- a/src/engine/RaulJackDriver.cpp +++ b/src/engine/RaulJackDriver.cpp @@ -22,7 +22,7 @@ #include <jack/jack.h> #include <jack/statistics.h> #include <jack/thread.h> -#include <raul/JackDriver.hpp> +#include "raul/JackDriver.hpp" using std::cerr; using std::endl; using std::string; diff --git a/src/engine/SMFDriver.cpp b/src/engine/SMFDriver.cpp index 776339c..cf4c9da 100644 --- a/src/engine/SMFDriver.cpp +++ b/src/engine/SMFDriver.cpp @@ -18,10 +18,10 @@ #include <list> #include <iostream> #include <glibmm/convert.h> -#include <raul/Quantizer.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/SMFWriter.hpp> -#include <raul/SMFReader.hpp> +#include "raul/Quantizer.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/SMFWriter.hpp" +#include "raul/SMFReader.hpp" #include "machina/Machine.hpp" #include "machina/Edge.hpp" #include "machina/SMFDriver.hpp" diff --git a/src/engine/machina/Action.hpp b/src/engine/machina/Action.hpp index 1d1700d..09c3878 100644 --- a/src/engine/machina/Action.hpp +++ b/src/engine/machina/Action.hpp @@ -20,10 +20,10 @@ #include <string> #include <iostream> -#include <raul/MIDISink.hpp> -#include <raul/TimeSlice.hpp> -#include <raul/Stateful.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/MIDISink.hpp" +#include "raul/TimeSlice.hpp" +#include "raul/Stateful.hpp" +#include "raul/SharedPtr.hpp" #include "types.hpp" namespace Machina { diff --git a/src/engine/machina/ActionFactory.hpp b/src/engine/machina/ActionFactory.hpp index f47a626..0cf4154 100644 --- a/src/engine/machina/ActionFactory.hpp +++ b/src/engine/machina/ActionFactory.hpp @@ -18,7 +18,7 @@ #ifndef MACHINA_ACTIONFACTORY_HPP #define MACHINA_ACTIONFACTORY_HPP -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Machina { diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp index 31d8a9c..d087d88 100644 --- a/src/engine/machina/Driver.hpp +++ b/src/engine/machina/Driver.hpp @@ -18,7 +18,7 @@ #ifndef MACHINA_DRIVER_HPP #define MACHINA_DRIVER_HPP -#include <raul/MIDISink.hpp> +#include "raul/MIDISink.hpp" namespace Machina { diff --git a/src/engine/machina/Edge.hpp b/src/engine/machina/Edge.hpp index 1b52dc7..5851090 100644 --- a/src/engine/machina/Edge.hpp +++ b/src/engine/machina/Edge.hpp @@ -20,10 +20,10 @@ #include <list> #include <boost/utility.hpp> -#include <raul/WeakPtr.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/DoubleBuffer.hpp> -#include <raul/Stateful.hpp> +#include "raul/WeakPtr.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/DoubleBuffer.hpp" +#include "raul/Stateful.hpp" #include "types.hpp" #include "Action.hpp" diff --git a/src/engine/machina/Engine.hpp b/src/engine/machina/Engine.hpp index 763b9a8..02a9fc6 100644 --- a/src/engine/machina/Engine.hpp +++ b/src/engine/machina/Engine.hpp @@ -19,7 +19,7 @@ #define MACHINA_ENGINE_HPP #include <glibmm/ustring.h> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "machina/Driver.hpp" #include "machina/Loader.hpp" diff --git a/src/engine/machina/Evolver.hpp b/src/engine/machina/Evolver.hpp index 6025210..edf68db 100644 --- a/src/engine/machina/Evolver.hpp +++ b/src/engine/machina/Evolver.hpp @@ -18,9 +18,9 @@ #ifndef MACHINA_EVOLVER_HPP #define MACHINA_EVOLVER_HPP -#include <raul/SharedPtr.hpp> -#include <raul/Thread.hpp> -#include <eugene/core/GAImpl.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Thread.hpp" +#include "eugene/core/GAImpl.hpp" #include "Schrodinbit.hpp" namespace Eugene { template <typename G> class HybridMutation; } diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp index 7fb5351..54c7b1a 100644 --- a/src/engine/machina/JackDriver.hpp +++ b/src/engine/machina/JackDriver.hpp @@ -19,13 +19,13 @@ #define MACHINA_JACKDRIVER_HPP #include <boost/enable_shared_from_this.hpp> -#include <raul/JackDriver.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/DoubleBuffer.hpp> -#include <raul/EventRingBuffer.hpp> -#include <raul/Semaphore.hpp> -#include <raul/Command.hpp> #include <jack/midiport.h> +#include "raul/JackDriver.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/DoubleBuffer.hpp" +#include "raul/EventRingBuffer.hpp" +#include "raul/Semaphore.hpp" +#include "raul/Command.hpp" #include "Machine.hpp" #include "Driver.hpp" #include "Recorder.hpp" diff --git a/src/engine/machina/LearnRequest.hpp b/src/engine/machina/LearnRequest.hpp index 1d36057..4a65675 100644 --- a/src/engine/machina/LearnRequest.hpp +++ b/src/engine/machina/LearnRequest.hpp @@ -18,8 +18,8 @@ #ifndef MACHINA_LEARNREQUEST_HPP #define MACHINA_LEARNREQUEST_HPP -#include <raul/Maid.hpp> -#include <raul/SharedPtr.hpp> +#include "raul/Maid.hpp" +#include "raul/SharedPtr.hpp" #include "types.hpp" #include "Node.hpp" #include "MidiAction.hpp" diff --git a/src/engine/machina/Loader.hpp b/src/engine/machina/Loader.hpp index 4a3c123..2c9fa1c 100644 --- a/src/engine/machina/Loader.hpp +++ b/src/engine/machina/Loader.hpp @@ -19,9 +19,9 @@ #define MACHINA_LOADER_HPP #include <glibmm/ustring.h> -#include <raul/SharedPtr.hpp> -#include <raul/Path.hpp> -#include <redlandmm/World.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Path.hpp" +#include "redlandmm/World.hpp" using Redland::Namespaces; diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp index dae8b75..468b9bc 100644 --- a/src/engine/machina/Machine.hpp +++ b/src/engine/machina/Machine.hpp @@ -20,11 +20,11 @@ #include <vector> #include <boost/utility.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/WeakPtr.hpp> -#include <raul/List.hpp> -#include <raul/TimeSlice.hpp> -#include <redlandmm/Model.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/WeakPtr.hpp" +#include "raul/List.hpp" +#include "raul/TimeSlice.hpp" +#include "redlandmm/Model.hpp" #include "types.hpp" #include "LearnRequest.hpp" #include "Node.hpp" diff --git a/src/engine/machina/MachineBuilder.hpp b/src/engine/machina/MachineBuilder.hpp index 58d1eb4..4e0e28d 100644 --- a/src/engine/machina/MachineBuilder.hpp +++ b/src/engine/machina/MachineBuilder.hpp @@ -19,7 +19,7 @@ #define MACHINA_MACHINEBUILDER_HPP #include <list> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" namespace Machina { diff --git a/src/engine/machina/MidiAction.hpp b/src/engine/machina/MidiAction.hpp index 57dd242..5ae507e 100644 --- a/src/engine/machina/MidiAction.hpp +++ b/src/engine/machina/MidiAction.hpp @@ -18,8 +18,8 @@ #ifndef MACHINA_MIDIACTION_HPP #define MACHINA_MIDIACTION_HPP -#include <raul/AtomicPtr.hpp> -#include <raul/TimeSlice.hpp> +#include "raul/AtomicPtr.hpp" +#include "raul/TimeSlice.hpp" #include "types.hpp" #include "Action.hpp" diff --git a/src/engine/machina/Mutation.hpp b/src/engine/machina/Mutation.hpp index 606ca42..628222b 100644 --- a/src/engine/machina/Mutation.hpp +++ b/src/engine/machina/Mutation.hpp @@ -21,7 +21,7 @@ #include "config.h" #if HAVE_EUGENE - #include <eugene/core/Mutation.hpp> + #include "eugene/core/Mutation.hpp" #define SUPER : public Eugene::Mutation<Machine> #else #define SUPER diff --git a/src/engine/machina/Node.hpp b/src/engine/machina/Node.hpp index 446db96..4258476 100644 --- a/src/engine/machina/Node.hpp +++ b/src/engine/machina/Node.hpp @@ -18,10 +18,10 @@ #ifndef MACHINA_NODE_HPP #define MACHINA_NODE_HPP -#include <raul/SharedPtr.hpp> -#include <raul/List.hpp> -#include <raul/Stateful.hpp> -#include <raul/MIDISink.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/List.hpp" +#include "raul/Stateful.hpp" +#include "raul/MIDISink.hpp" #include "Action.hpp" #include "Schrodinbit.hpp" diff --git a/src/engine/machina/Problem.hpp b/src/engine/machina/Problem.hpp index 9fc35b5..d487f46 100644 --- a/src/engine/machina/Problem.hpp +++ b/src/engine/machina/Problem.hpp @@ -21,8 +21,8 @@ #include "config.h" #include <map> -#include <raul/MIDISink.hpp> -#include <machina/Machine.hpp> +#include "raul/MIDISink.hpp" +#include "machina/Machine.hpp" namespace Machina { diff --git a/src/engine/machina/Recorder.hpp b/src/engine/machina/Recorder.hpp index 5afce2a..aa5040a 100644 --- a/src/engine/machina/Recorder.hpp +++ b/src/engine/machina/Recorder.hpp @@ -18,9 +18,9 @@ #ifndef MACHINA_RECORDER_HPP #define MACHINA_RECORDER_HPP -#include <raul/Slave.hpp> -#include <raul/SharedPtr.hpp> -#include <raul/EventRingBuffer.hpp> +#include "raul/Slave.hpp" +#include "raul/SharedPtr.hpp" +#include "raul/EventRingBuffer.hpp" #include "Machine.hpp" namespace Machina { diff --git a/src/engine/machina/SMFDriver.hpp b/src/engine/machina/SMFDriver.hpp index 73e8901..9cbef26 100644 --- a/src/engine/machina/SMFDriver.hpp +++ b/src/engine/machina/SMFDriver.hpp @@ -20,9 +20,9 @@ #include <boost/enable_shared_from_this.hpp> #include <glibmm/ustring.h> -#include <raul/SharedPtr.hpp> -#include <raul/SMFWriter.hpp> -#include <raul/SMFReader.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/SMFWriter.hpp" +#include "raul/SMFReader.hpp" #include "machina/types.hpp" #include "machina/Driver.hpp" #include "machina/MachineBuilder.hpp" diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp index 2c32425..fb9fb07 100644 --- a/src/gui/EdgeView.cpp +++ b/src/gui/EdgeView.cpp @@ -17,8 +17,8 @@ #include <iomanip> #include <sstream> -#include <flowcanvas/Canvas.hpp> -#include <machina/Edge.hpp> +#include "flowcanvas/Canvas.hpp" +#include "machina/Edge.hpp" #include "EdgeView.hpp" #include "NodeView.hpp" diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp index 2b04324..5a36afa 100644 --- a/src/gui/EdgeView.hpp +++ b/src/gui/EdgeView.hpp @@ -18,7 +18,7 @@ #ifndef MACHINA_EDGEVIEW_H #define MACHINA_EDGEVIEW_H -#include <flowcanvas/Connection.hpp> +#include "flowcanvas/Connection.hpp" namespace Machina { class Edge; } class NodeView; diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index 2a99c8d..717960e 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -16,7 +16,7 @@ */ #include <map> -#include <raul/SharedPtr.hpp> +#include "raul/SharedPtr.hpp" #include "machina/Node.hpp" #include "machina/Machine.hpp" #include "machina/Action.hpp" diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp index f5a37c4..86be5d5 100644 --- a/src/gui/MachinaCanvas.hpp +++ b/src/gui/MachinaCanvas.hpp @@ -19,9 +19,9 @@ #define MACHINA_CANVAS_HPP_H #include <string> -#include <raul/SharedPtr.hpp> -#include <raul/WeakPtr.hpp> -#include <flowcanvas/Canvas.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/WeakPtr.hpp" +#include "flowcanvas/Canvas.hpp" using namespace FlowCanvas; diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index 81d9053..d7927df 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -24,10 +24,10 @@ #include <pthread.h> #include <libgnomecanvasmm.h> #include <libglademm/xml.h> -#include <redlandmm/Model.hpp> -#include <machina/Machine.hpp> -#include <machina/Mutation.hpp> -#include <machina/SMFDriver.hpp> +#include "redlandmm/Model.hpp" +#include "machina/Machine.hpp" +#include "machina/Mutation.hpp" +#include "machina/SMFDriver.hpp" #include "GladeXml.hpp" #include "MachinaGUI.hpp" #include "MachinaCanvas.hpp" @@ -35,7 +35,7 @@ #include "EdgeView.hpp" #ifdef HAVE_EUGENE -#include <machina/Evolver.hpp> +#include "machina/Evolver.hpp" #endif using namespace Machina; diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index b0d379e..342cedf 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -19,10 +19,10 @@ #define MACHINA_GUI_H #include <string> -#include <raul/SharedPtr.hpp> -#include <raul/Maid.hpp> #include <libgnomecanvasmm.h> -#include <machina/Engine.hpp> +#include "raul/SharedPtr.hpp" +#include "raul/Maid.hpp" +#include "machina/Engine.hpp" using namespace std; diff --git a/src/gui/NodeView.cpp b/src/gui/NodeView.cpp index 61f1858..67516fb 100644 --- a/src/gui/NodeView.cpp +++ b/src/gui/NodeView.cpp @@ -16,7 +16,7 @@ */ #include <iostream> -#include <machina/MidiAction.hpp> +#include "machina/MidiAction.hpp" #include "NodeView.hpp" #include "NodePropertiesWindow.hpp" diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp index 02b34e6..80f8968 100644 --- a/src/gui/NodeView.hpp +++ b/src/gui/NodeView.hpp @@ -18,7 +18,7 @@ #ifndef MACHINA_NODEVIEW_H #define MACHINA_NODEVIEW_H -#include <flowcanvas/Ellipse.hpp> +#include "flowcanvas/Ellipse.hpp" #include "machina/Node.hpp" diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 93a7611..3fc80aa 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -19,7 +19,7 @@ #include <iostream> #include <string> #include <libgnomecanvasmm.h> -#include <redlandmm/World.hpp> +#include "redlandmm/World.hpp" #include "config.h" #include "machina/Machine.hpp" #include "machina/Loader.hpp" diff --git a/src/midi2machina.cpp b/src/midi2machina.cpp index 2dba4ff..06a0554 100644 --- a/src/midi2machina.cpp +++ b/src/midi2machina.cpp @@ -17,7 +17,7 @@ #include <iostream> #include <signal.h> -#include <redlandmm/Model.hpp> +#include "redlandmm/Model.hpp" #include "machina/Engine.hpp" #include "machina/Machine.hpp" #include "machina/Node.hpp" |