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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/engine/JackDriver.hpp b/src/engine/JackDriver.hpp
index c0f94ff..06ffabe 100644
--- a/src/engine/JackDriver.hpp
+++ b/src/engine/JackDriver.hpp
@@ -25,11 +25,11 @@
 
 #include "raul/DoubleBuffer.hpp"
 #include "raul/Semaphore.hpp"
-#include "raul/SharedPtr.hpp"
 
 #include "machina/Context.hpp"
 #include "machina/Driver.hpp"
 #include "machina/Machine.hpp"
+#include "machina/types.hpp"
 
 #include "Recorder.hpp"
 
@@ -47,8 +47,8 @@ class JackDriver
 	: public Machina::Driver
 {
 public:
-	JackDriver(Raul::Forge&       forge,
-	           SharedPtr<Machine> machine = SharedPtr<Machine>());
+	JackDriver(Raul::Forge&  forge,
+	           SPtr<Machine> machine = SPtr<Machine>());
 	~JackDriver();
 
 	void attach(const std::string& client_name);
@@ -57,7 +57,7 @@ public:
 	void activate();
 	void deactivate();
 
-	void set_machine(SharedPtr<Machine> machine);
+	void set_machine(SPtr<Machine> machine);
 
 	void write_event(Raul::TimeStamp      time,
 	                 size_t               size,
@@ -90,10 +90,10 @@ public:
 	jack_client_t* jack_client() const { return _client; }
 
 private:
-	void read_input_recording(SharedPtr<Machine>     machine,
+	void read_input_recording(SPtr<Machine>          machine,
 	                          const Raul::TimeSlice& time);
 
-	void read_input_playing(SharedPtr<Machine>     machine,
+	void read_input_playing(SPtr<Machine>          machine,
 	                        const Raul::TimeSlice& time);
 
 	static void jack_error_cb(const char* msg);
@@ -104,8 +104,8 @@ private:
 
 	jack_client_t* _client;
 
-	Raul::Semaphore    _machine_changed;
-	SharedPtr<Machine> _last_machine;
+	Raul::Semaphore _machine_changed;
+	SPtr<Machine>   _last_machine;
 
 	jack_port_t* _input_port;
 	jack_port_t* _output_port;
@@ -121,10 +121,10 @@ private:
 	Raul::Semaphore _stop;
 	bool            _stop_flag;
 
-	Raul::TimeDuration  _record_dur;
-	std::atomic<bool>   _recording;
-	SharedPtr<Recorder> _recorder;
-	bool                _is_activated;
+	Raul::TimeDuration _record_dur;
+	std::atomic<bool>  _recording;
+	SPtr<Recorder>     _recorder;
+	bool               _is_activated;
 };
 
 } // namespace Machina