aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2017-02-12 15:36:13 +0100
committerDavid Robillard <d@drobilla.net>2017-02-12 15:36:13 +0100
commitf249d6b60cb3268bb4f70468657f5eefef7add0f (patch)
treeb08ba2188a0c1163909ac68577cfaa3813d23242
parenta9290108205c9763b6e613290c53132e912f3a95 (diff)
downloadmachina-f249d6b60cb3268bb4f70468657f5eefef7add0f.tar.gz
machina-f249d6b60cb3268bb4f70468657f5eefef7add0f.tar.bz2
machina-f249d6b60cb3268bb4f70468657f5eefef7add0f.zip
Update for latest Raul
-rw-r--r--src/engine/Action.hpp2
-rw-r--r--src/engine/LearnRequest.cpp6
-rw-r--r--src/engine/LearnRequest.hpp2
-rw-r--r--src/engine/Updates.cpp1
-rw-r--r--src/engine/machina/Updates.hpp1
-rw-r--r--src/engine/machina/types.hpp6
-rw-r--r--wscript14
7 files changed, 17 insertions, 15 deletions
diff --git a/src/engine/Action.hpp b/src/engine/Action.hpp
index 90f8664..2916099 100644
--- a/src/engine/Action.hpp
+++ b/src/engine/Action.hpp
@@ -33,7 +33,7 @@ namespace machina {
/** An Action, executed on entering or exiting of a state.
*/
struct Action
- : public Raul::Maid::Manageable
+ : public Raul::Maid::Disposable
, public Stateful
{
bool operator==(const Action& rhs) const { return false; }
diff --git a/src/engine/LearnRequest.cpp b/src/engine/LearnRequest.cpp
index 9ad8422..5756dd1 100644
--- a/src/engine/LearnRequest.cpp
+++ b/src/engine/LearnRequest.cpp
@@ -27,16 +27,12 @@ LearnRequest::LearnRequest(SPtr<Raul::Maid> maid, SPtr<Node> node)
, _enter_action(new MidiAction(4, NULL))
, _exit_action(new MidiAction(4, NULL))
{
- maid->manage(_enter_action);
- maid->manage(_exit_action);
}
SPtr<LearnRequest>
LearnRequest::create(SPtr<Raul::Maid> maid, SPtr<Node> node)
{
- SPtr<LearnRequest> ret(new LearnRequest(maid, node));
- maid->manage(ret);
- return ret;
+ return SPtr<LearnRequest>(new LearnRequest(maid, node));
}
void
diff --git a/src/engine/LearnRequest.hpp b/src/engine/LearnRequest.hpp
index 685b140..9cdfc3c 100644
--- a/src/engine/LearnRequest.hpp
+++ b/src/engine/LearnRequest.hpp
@@ -31,7 +31,7 @@ class MidiAction;
/** A request to MIDI learn a certain node.
*/
-class LearnRequest : public Raul::Maid::Manageable
+class LearnRequest : public Raul::Maid::Disposable
{
public:
static SPtr<LearnRequest> create(SPtr<Raul::Maid> maid, SPtr<Node> node);
diff --git a/src/engine/Updates.cpp b/src/engine/Updates.cpp
index 846bf8d..ce655e4 100644
--- a/src/engine/Updates.cpp
+++ b/src/engine/Updates.cpp
@@ -19,6 +19,7 @@
#include "machina/Atom.hpp"
#include "machina/Updates.hpp"
#include "machina/types.hpp"
+#include "raul/RingBuffer.hpp"
namespace machina {
diff --git a/src/engine/machina/Updates.hpp b/src/engine/machina/Updates.hpp
index 7c0391b..ff09af9 100644
--- a/src/engine/machina/Updates.hpp
+++ b/src/engine/machina/Updates.hpp
@@ -21,6 +21,7 @@
#include "machina/Atom.hpp"
#include "machina/types.hpp"
+#include "raul/RingBuffer.hpp"
namespace machina {
diff --git a/src/engine/machina/types.hpp b/src/engine/machina/types.hpp
index e9ac7d0..61137b7 100644
--- a/src/engine/machina/types.hpp
+++ b/src/engine/machina/types.hpp
@@ -20,7 +20,7 @@
#include <map>
#include <memory>
-#include "raul/RingBuffer.hpp"
+#include "raul/Maid.hpp"
namespace machina {
@@ -37,9 +37,13 @@ using SPtr = std::shared_ptr<T>;
template <class T>
using WPtr = std::weak_ptr<T>;
+
+template <class T>
+using MPtr = Raul::managed_ptr<T>;
#else
#define SPtr std::shared_ptr
#define WPtr std::weak_ptr
+#define MPtr Raul::managed_ptr
#endif
template <class T>
diff --git a/wscript b/wscript
index 47a5b8f..afea742 100644
--- a/wscript
+++ b/wscript
@@ -31,21 +31,21 @@ def configure(conf):
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
atleast_version='1.2.0', mandatory=True)
autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM',
- atleast_version='2.14.0', mandatory=True)
+ atleast_version='2.14.0', mandatory=True)
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD',
- atleast_version='2.14.0', mandatory=True)
+ atleast_version='2.14.0', mandatory=True)
autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM',
- atleast_version='2.12.0', mandatory=False)
+ atleast_version='2.12.0', mandatory=False)
autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
atleast_version='0.120.0', mandatory=True)
autowaf.check_pkg(conf, 'raul', uselib_store='RAUL',
- atleast_version='0.5.1', mandatory=True)
+ atleast_version='0.8.7', mandatory=True)
autowaf.check_pkg(conf, 'ganv-1', uselib_store='GANV',
- atleast_version='1.2.1', mandatory=False)
+ atleast_version='1.2.1', mandatory=False)
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
- atleast_version='0.4.0', mandatory=False)
+ atleast_version='0.4.0', mandatory=False)
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
- atleast_version='0.4.0', mandatory=False)
+ atleast_version='0.4.0', mandatory=False)
#autowaf.check_pkg(conf, 'eugene', uselib_store='EUGENE',
# atleast_version='0.0.0', mandatory=False)