aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/Action.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-12 23:38:03 +0000
committerDavid Robillard <d@drobilla.net>2013-01-12 23:38:03 +0000
commit1dad5b5aaa139993fe19e266d08dfc55844e6804 (patch)
treefd2bed5971853b429f1b74369a778a4d608e6925 /src/engine/Action.hpp
parent8f048287d06afd7d3c2e90f4a503d7666a9cb6fa (diff)
downloadmachina-1dad5b5aaa139993fe19e266d08dfc55844e6804.tar.gz
machina-1dad5b5aaa139993fe19e266d08dfc55844e6804.tar.bz2
machina-1dad5b5aaa139993fe19e266d08dfc55844e6804.zip
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends. Move Raul::Disposable and Raul::Manageable into Raul::Maid. Use sets to store machina nodes and edges to avoid O(n) searches. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/Action.hpp')
-rw-r--r--src/engine/Action.hpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/engine/Action.hpp b/src/engine/Action.hpp
index f954a39..7397eaa 100644
--- a/src/engine/Action.hpp
+++ b/src/engine/Action.hpp
@@ -21,9 +21,8 @@
#include <string>
#include <iostream>
-#include "raul/SharedPtr.hpp"
+#include "raul/Maid.hpp"
#include "raul/TimeSlice.hpp"
-#include "raul/Manageable.hpp"
#include "machina/types.hpp"
@@ -35,15 +34,14 @@ namespace Machina {
/** An Action, executed on entering or exiting of a state.
*/
struct Action
- : public Raul::Manageable
- , public Stateful {
+ : public Raul::Maid::Manageable
+ , public Stateful {
virtual void execute(MIDISink* sink, Raul::TimeStamp time) = 0;
virtual void write_state(Sord::Model& model);
};
-class PrintAction
- : public Action
+class PrintAction : public Action
{
public:
PrintAction(const std::string& msg)