diff options
| author | David Robillard <d@drobilla.net> | 2007-03-22 02:45:06 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-03-22 02:45:06 +0000 |
| commit | 61c123747f791633bb9b61a1c528d7fbb7d7bdd7 (patch) | |
| tree | 23516f30b18a0447de5e5188a30822ede389ce9e /src/engine/machina | |
| parent | b80654a5193536050c8f8e494ba5fd402b7a18aa (diff) | |
| download | machina-61c123747f791633bb9b61a1c528d7fbb7d7bdd7.tar.gz machina-61c123747f791633bb9b61a1c528d7fbb7d7bdd7.tar.bz2 machina-61c123747f791633bb9b61a1c528d7fbb7d7bdd7.zip | |
Serialization fixes for GUI.
Loading/Saving of MIDI actions to RDF.
git-svn-id: http://svn.drobilla.net/lad/machina@368 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina')
| -rw-r--r-- | src/engine/machina/Driver.hpp | 2 | ||||
| -rw-r--r-- | src/engine/machina/JackDriver.hpp | 1 | ||||
| -rw-r--r-- | src/engine/machina/Machine.hpp | 3 | ||||
| -rw-r--r-- | src/engine/machina/Makefile.am | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/machina/Driver.hpp b/src/engine/machina/Driver.hpp index b900da0..a1a38a2 100644 --- a/src/engine/machina/Driver.hpp +++ b/src/engine/machina/Driver.hpp @@ -39,7 +39,7 @@ public: virtual void activate() {} virtual void deactivate() {} -private: +protected: SharedPtr<Machine> _machine; }; diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp index e5d0abb..a048c0c 100644 --- a/src/engine/machina/JackDriver.hpp +++ b/src/engine/machina/JackDriver.hpp @@ -67,7 +67,6 @@ private: virtual void on_process(jack_nframes_t nframes); Raul::Semaphore _machine_changed; - SharedPtr<Machine> _machine; SharedPtr<Machine> _last_machine; jack_port_t* _input_port; diff --git a/src/engine/machina/Machine.hpp b/src/engine/machina/Machine.hpp index 12b601d..fb37f4e 100644 --- a/src/engine/machina/Machine.hpp +++ b/src/engine/machina/Machine.hpp @@ -18,6 +18,7 @@ #ifndef MACHINA_MACHINE_HPP #define MACHINA_MACHINE_HPP +#include <boost/utility.hpp> #include <raul/SharedPtr.h> #include <raul/List.h> #include <raul/RDFWriter.h> @@ -29,7 +30,7 @@ namespace Machina { -class Machine : public Raul::Stateful { +class Machine : public Raul::Stateful, public boost::noncopyable { public: Machine(); ~Machine(); diff --git a/src/engine/machina/Makefile.am b/src/engine/machina/Makefile.am index ff8eab5..ce19080 100644 --- a/src/engine/machina/Makefile.am +++ b/src/engine/machina/Makefile.am @@ -8,6 +8,7 @@ libmachinainclude_HEADERS = \ Machine.hpp \ Loader.hpp \ MidiAction.hpp \ + ActionFactory.hpp \ Driver.hpp \ LearnRequest.hpp \ Engine.hpp |