diff options
33 files changed, 74 insertions, 74 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5e8cb83..f7bc5d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ endif machina_SOURCES = machina.cpp -AM_CXXFLAGS = -I$(top_srcdir)/raul -I$(top_srcdir)/machine/src/engine @JACK_CFLAGS@ @GLIBMM_CFLAGS@ +AM_CXXFLAGS = -I$(top_srcdir)/raul -I$(top_srcdir)/machina/src/engine @JACK_CFLAGS@ @GLIBMM_CFLAGS@ LDADD = @RAUL_LIBS@ @JACK_LIBS@ @GLIBMM_LIBS@ engine/libmachina.la midi2machina_SOURCES = midi2machina.cpp diff --git a/src/engine/Action.cpp b/src/engine/Action.cpp index a9de1ee..312bff6 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 <raul/RDFWorld.h> -#include <raul/RDFModel.h> +#include <raul/RDFWorld.hpp> +#include <raul/RDFModel.hpp> #include "machina/Action.hpp" namespace Machina { diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp index 710629c..430c746 100644 --- a/src/engine/Edge.cpp +++ b/src/engine/Edge.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <raul/RDFWorld.h> -#include <raul/RDFModel.h> +#include <raul/RDFWorld.hpp> +#include <raul/RDFModel.hpp> #include "machina/Node.hpp" #include "machina/Edge.hpp" diff --git a/src/engine/LearnRequest.cpp b/src/engine/LearnRequest.cpp index b908f7d..f4d88f0 100644 --- a/src/engine/LearnRequest.cpp +++ b/src/engine/LearnRequest.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <raul/Quantizer.h> +#include <raul/Quantizer.hpp> #include <machina/LearnRequest.hpp> namespace Machina { diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp index 34f29d2..015accf 100644 --- a/src/engine/Loader.cpp +++ b/src/engine/Loader.cpp @@ -19,7 +19,7 @@ #include <map> #include <cmath> #include <glibmm/ustring.h> -#include <raul/RDFQuery.h> +#include <raul/RDFQuery.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 61cad67..09e0e72 100644 --- a/src/engine/Machine.cpp +++ b/src/engine/Machine.cpp @@ -16,9 +16,9 @@ */ #include <cstdlib> -#include <raul/RDFWorld.h> -#include <raul/RDFModel.h> -#include <raul/SharedPtr.h> +#include <raul/RDFWorld.hpp> +#include <raul/RDFModel.hpp> +#include <raul/SharedPtr.hpp> #include "machina/Machine.hpp" #include "machina/Node.hpp" #include "machina/Edge.hpp" diff --git a/src/engine/MachineBuilder.cpp b/src/engine/MachineBuilder.cpp index 1b1ed61..af486df 100644 --- a/src/engine/MachineBuilder.cpp +++ b/src/engine/MachineBuilder.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <raul/midi_events.h> -#include <raul/Quantizer.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 38a5d6f..f811924 100644 --- a/src/engine/MidiAction.cpp +++ b/src/engine/MidiAction.cpp @@ -16,8 +16,8 @@ */ #include <iostream> -#include <raul/SharedPtr.h> -#include <raul/MIDISink.h> +#include <raul/SharedPtr.hpp> +#include <raul/MIDISink.hpp> #include "machina/MidiAction.hpp" namespace Machina { diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp index 73a2059..6869798 100644 --- a/src/engine/Node.cpp +++ b/src/engine/Node.cpp @@ -16,8 +16,8 @@ */ #include <cassert> -#include <raul/RDFWorld.h> -#include <raul/RDFModel.h> +#include <raul/RDFWorld.hpp> +#include <raul/RDFModel.hpp> #include <machina/Node.hpp> #include <machina/Edge.hpp> diff --git a/src/engine/SMFDriver.cpp b/src/engine/SMFDriver.cpp index 0283288..e885e4b 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.h> -#include <raul/SharedPtr.h> -#include <raul/SMFWriter.h> -#include <raul/SMFReader.h> +#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 d3c47cb..cf6bf58 100644 --- a/src/engine/machina/Action.hpp +++ b/src/engine/machina/Action.hpp @@ -20,10 +20,10 @@ #include <string> #include <iostream> -#include <raul/MIDISink.h> -#include <raul/TimeSlice.h> -#include <raul/Stateful.h> -#include <raul/SharedPtr.h> +#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 c43bf72..b0aa1f9 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.h> +#include <raul/SharedPtr.hpp> namespace Machina { diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp index cca9c55..098cb0a 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.h> +#include <raul/MIDISink.hpp> namespace Machina { diff --git a/src/engine/machina/Edge.hpp b/src/engine/machina/Edge.hpp index 4681b38..f82f1ae 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.h> -#include <raul/SharedPtr.h> -#include <raul/DoubleBuffer.h> -#include <raul/Stateful.h> +#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 2cae36d..d429df2 100644 --- a/src/engine/machina/Engine.hpp +++ b/src/engine/machina/Engine.hpp @@ -19,8 +19,8 @@ #define MACHINA_ENGINE_HPP #include <glibmm/ustring.h> -#include <raul/SharedPtr.h> -#include <raul/types.h> +#include <raul/SharedPtr.hpp> +#include <raul/types.hpp> #include "machina/Driver.hpp" #include "machina/Loader.hpp" diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp index b24c8a9..72f8dfd 100644 --- a/src/engine/machina/JackDriver.hpp +++ b/src/engine/machina/JackDriver.hpp @@ -19,11 +19,11 @@ #define MACHINA_JACKDRIVER_HPP #include <boost/enable_shared_from_this.hpp> -#include <raul/JackDriver.h> -#include <raul/SharedPtr.h> -#include <raul/DoubleBuffer.h> -#include <raul/StampedChunkRingBuffer.h> -#include <raul/Semaphore.h> +#include <raul/JackDriver.hpp> +#include <raul/SharedPtr.hpp> +#include <raul/DoubleBuffer.hpp> +#include <raul/StampedChunkRingBuffer.hpp> +#include <raul/Semaphore.hpp> #include <jack/midiport.h> #include "Machine.hpp" #include "Driver.hpp" diff --git a/src/engine/machina/LearnRequest.hpp b/src/engine/machina/LearnRequest.hpp index 3d96fd4..4ec22ff 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.h> -#include <raul/SharedPtr.h> +#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 eb7deac..9c351a0 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.h> -#include <raul/Path.h> -#include <raul/RDFWorld.h> +#include <raul/SharedPtr.hpp> +#include <raul/Path.hpp> +#include <raul/RDFWorld.hpp> using Raul::Namespaces; diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp index ff32930..946eaca 100644 --- a/src/engine/machina/Machine.hpp +++ b/src/engine/machina/Machine.hpp @@ -19,10 +19,10 @@ #define MACHINA_MACHINE_HPP #include <boost/utility.hpp> -#include <raul/SharedPtr.h> -#include <raul/List.h> -#include <raul/RDFModel.h> -#include <raul/TimeSlice.h> +#include <raul/SharedPtr.hpp> +#include <raul/List.hpp> +#include <raul/RDFModel.hpp> +#include <raul/TimeSlice.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 25104e8..c7b5def 100644 --- a/src/engine/machina/MachineBuilder.hpp +++ b/src/engine/machina/MachineBuilder.hpp @@ -19,8 +19,8 @@ #define MACHINA_MACHINEBUILDER_HPP #include <list> -#include <raul/types.h> -#include <raul/SharedPtr.h> +#include <raul/types.hpp> +#include <raul/SharedPtr.hpp> namespace Machina { diff --git a/src/engine/machina/MidiAction.hpp b/src/engine/machina/MidiAction.hpp index c019ca9..09986fd 100644 --- a/src/engine/machina/MidiAction.hpp +++ b/src/engine/machina/MidiAction.hpp @@ -18,10 +18,10 @@ #ifndef MACHINA_MIDIACTION_HPP #define MACHINA_MIDIACTION_HPP -#include <raul/Maid.h> -#include <raul/WeakPtr.h> -#include <raul/AtomicPtr.h> -#include <raul/TimeSlice.h> +#include <raul/Maid.hpp> +#include <raul/WeakPtr.hpp> +#include <raul/AtomicPtr.hpp> +#include <raul/TimeSlice.hpp> #include "types.hpp" #include "Action.hpp" diff --git a/src/engine/machina/Node.hpp b/src/engine/machina/Node.hpp index 6c275a8..1834207 100644 --- a/src/engine/machina/Node.hpp +++ b/src/engine/machina/Node.hpp @@ -19,10 +19,10 @@ #define MACHINA_NODE_HPP #include <boost/utility.hpp> -#include <raul/SharedPtr.h> -#include <raul/List.h> -#include <raul/Stateful.h> -#include <raul/MIDISink.h> +#include <raul/SharedPtr.hpp> +#include <raul/List.hpp> +#include <raul/Stateful.hpp> +#include <raul/MIDISink.hpp> #include "Action.hpp" namespace Machina { diff --git a/src/engine/machina/Recorder.hpp b/src/engine/machina/Recorder.hpp index ad2e28c..7938556 100644 --- a/src/engine/machina/Recorder.hpp +++ b/src/engine/machina/Recorder.hpp @@ -18,10 +18,10 @@ #ifndef MACHINA_RECORDER_HPP #define MACHINA_RECORDER_HPP -#include <raul/types.h> -#include <raul/Slave.h> -#include <raul/SharedPtr.h> -#include <raul/StampedChunkRingBuffer.h> +#include <raul/types.hpp> +#include <raul/Slave.hpp> +#include <raul/SharedPtr.hpp> +#include <raul/StampedChunkRingBuffer.hpp> #include "Machine.hpp" namespace Machina { diff --git a/src/engine/machina/SMFDriver.hpp b/src/engine/machina/SMFDriver.hpp index 7b22a26..55d76a0 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.h> -#include <raul/SMFWriter.h> -#include <raul/SMFReader.h> +#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 e47d9fc..9e933f8 100644 --- a/src/gui/EdgeView.cpp +++ b/src/gui/EdgeView.cpp @@ -17,7 +17,7 @@ #include <iomanip> #include <sstream> -#include <flowcanvas/Canvas.h> +#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 6dbc611..29eacde 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.h> +#include <flowcanvas/Connection.hpp> namespace Machina { class Edge; } class NodeView; diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index 741c0db..c4d22ac 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -16,7 +16,7 @@ */ #include <map> -#include <raul/SharedPtr.h> +#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 47c0174..9e20051 100644 --- a/src/gui/MachinaCanvas.hpp +++ b/src/gui/MachinaCanvas.hpp @@ -19,9 +19,9 @@ #define PATCHAGEPATCHBAYAREA_H #include <string> -#include <raul/SharedPtr.h> -#include <raul/WeakPtr.h> -#include <flowcanvas/Canvas.h> +#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 6e6c7b9..eabb4c9 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -22,7 +22,7 @@ #include <pthread.h> #include <libgnomecanvasmm.h> #include <libglademm/xml.h> -#include <raul/RDFModel.h> +#include <raul/RDFModel.hpp> #include <machina/Machine.hpp> #include <machina/SMFDriver.hpp> #include "GladeXml.hpp" diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 7f21c55..ac4bb6d 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -19,8 +19,8 @@ #define MACHINA_GUI_H #include <string> -#include <raul/SharedPtr.h> -#include <raul/Maid.h> +#include <raul/SharedPtr.hpp> +#include <raul/Maid.hpp> #include <libgnomecanvasmm.h> #include <machina/Engine.hpp> diff --git a/src/gui/NodeView.hpp b/src/gui/NodeView.hpp index fd4e43d..82c1bdb 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.h> +#include <flowcanvas/Ellipse.hpp> #include "machina/Node.hpp" diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 104e0a6..8c6a78e 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -19,7 +19,7 @@ #include <iostream> #include <string> #include <libgnomecanvasmm.h> -#include <raul/RDFWorld.h> +#include <raul/RDFWorld.hpp> #include "../config/config.h" #include "machina/Machine.hpp" #include "machina/Loader.hpp" diff --git a/src/midi2machina.cpp b/src/midi2machina.cpp index 3493c06..560bfd1 100644 --- a/src/midi2machina.cpp +++ b/src/midi2machina.cpp @@ -17,7 +17,7 @@ #include <iostream> #include <signal.h> -#include <raul/RDFModel.h> +#include <raul/RDFModel.hpp> #include "machina/Engine.hpp" #include "machina/Machine.hpp" #include "machina/Node.hpp" |