From 1dad5b5aaa139993fe19e266d08dfc55844e6804 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 12 Jan 2013 23:38:03 +0000
Subject: 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
---
 src/engine/JackDriver.cpp | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'src/engine/JackDriver.cpp')

diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index d13bbdd..d8442b1 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -32,7 +32,7 @@ using namespace std;
 
 namespace Machina {
 
-JackDriver::JackDriver(Raul::Forge& forge, SharedPtr<Machine> machine)
+JackDriver::JackDriver(Raul::Forge& forge, SPtr<Machine> machine)
 	: Driver(forge, machine)
 	, _client(NULL)
 	, _machine_changed(0)
@@ -107,9 +107,9 @@ JackDriver::attach(const std::string& client_name)
 		}
 
 		if (!_machine) {
-			_machine = SharedPtr<Machine>(
-			        new Machine(TimeUnit::frames(jack_get_sample_rate(
-			                                         jack_client()))));
+			_machine = SPtr<Machine>(
+				new Machine(TimeUnit::frames(
+					            jack_get_sample_rate(jack_client()))));
 		}
 
 		_machine->activate();
@@ -160,13 +160,13 @@ JackDriver::deactivate()
 }
 
 void
-JackDriver::set_machine(SharedPtr<Machine> machine)
+JackDriver::set_machine(SPtr<Machine> machine)
 {
 	if (machine == _machine) {
 		return;
 	}
 
-	SharedPtr<Machine> last_machine = _last_machine; // Keep a reference
+	SPtr<Machine> last_machine = _last_machine; // Keep a reference
 	_machine_changed.reset(0);
 	assert(!last_machine.unique());
 	_machine = machine;
@@ -178,7 +178,7 @@ JackDriver::set_machine(SharedPtr<Machine> machine)
 }
 
 void
-JackDriver::read_input_recording(SharedPtr<Machine>     machine,
+JackDriver::read_input_recording(SPtr<Machine>          machine,
                                  const Raul::TimeSlice& time)
 {
 	const jack_nframes_t nframes  = time.length_ticks().ticks();
@@ -203,7 +203,7 @@ JackDriver::read_input_recording(SharedPtr<Machine>     machine,
 }
 
 void
-JackDriver::read_input_playing(SharedPtr<Machine>     machine,
+JackDriver::read_input_playing(SPtr<Machine>          machine,
                                const Raul::TimeSlice& time)
 {
 	const jack_nframes_t nframes  = time.length_ticks().ticks();
@@ -215,7 +215,7 @@ JackDriver::read_input_playing(SharedPtr<Machine>     machine,
 		jack_midi_event_get(&ev, buf, i);
 
 		if (ev.buffer[0] == 0x90) {
-			const SharedPtr<LearnRequest> learn = machine->pending_learn();
+			const SPtr<LearnRequest> learn = machine->pending_learn();
 			if (learn) {
 				learn->enter_action()->set_event(ev.size, ev.buffer);
 				learn->start(_quantization.get(),
@@ -225,7 +225,7 @@ JackDriver::read_input_playing(SharedPtr<Machine>     machine,
 			}
 
 		} else if (ev.buffer[0] == 0x80) {
-			const SharedPtr<LearnRequest> learn = machine->pending_learn();
+			const SPtr<LearnRequest> learn = machine->pending_learn();
 			if (learn && learn->started()) {
 				learn->exit_action()->set_event(ev.size, ev.buffer);
 				learn->finish(
@@ -323,7 +323,7 @@ JackDriver::on_process(jack_nframes_t nframes)
 
 	/* Take a reference to machine here and use only it during the process
 	 * cycle so _machine can be switched with set_machine during a cycle. */
-	SharedPtr<Machine> machine = _machine;
+	SPtr<Machine> machine = _machine;
 
 	// Machine was switched since last cycle, finalize old machine.
 	if (machine != _last_machine) {
@@ -411,9 +411,8 @@ void
 JackDriver::start_record(bool step)
 {
 	// FIXME: Choose an appropriate maximum ringbuffer size
-	_recorder
-	    = SharedPtr<Recorder>(new Recorder(_forge, 1024, _beats_unit,
-	                                       _quantization.get(), step));
+	_recorder = SPtr<Recorder>(
+		new Recorder(_forge, 1024, _beats_unit, _quantization.get(), step));
 	_recorder->start();
 	_record_dur = 0;
 	_recording  = true;
@@ -423,12 +422,10 @@ void
 JackDriver::finish_record()
 {
 	_recording = false;
-	SharedPtr<Machine> machine = _recorder->finish();
+	SPtr<Machine> machine = _recorder->finish();
 	_recorder.reset();
 	machine->activate();
-	_machine->nodes().insert(_machine->nodes().end(),
-	                         machine->nodes().begin(),
-	                         machine->nodes().end());
+	_machine->nodes().insert(machine->nodes().begin(), machine->nodes().end());
 }
 
 int
-- 
cgit v1.2.1