1 files changed, 22 insertions, 22 deletions

diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index b103310..e151cae 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -28,43 +28,43 @@
 
 namespace Machina {
 
-Engine::Engine(Raul::Forge&      forge,
-               SharedPtr<Driver> driver,
-               Sord::World&      rdf_world)
+Engine::Engine(Raul::Forge& forge,
+               SPtr<Driver> driver,
+               Sord::World& rdf_world)
 	: _driver(driver)
 	, _rdf_world(rdf_world)
 	, _loader(_forge, _rdf_world)
 	, _forge(forge)
 {}
 
-SharedPtr<Driver>
+SPtr<Driver>
 Engine::new_driver(Raul::Forge&       forge,
                    const std::string& name,
-                   SharedPtr<Machine> machine)
+                   SPtr<Machine>      machine)
 {
 #ifdef HAVE_JACK
 	if (name == "jack") {
 		JackDriver* driver = new JackDriver(forge, machine);
 		driver->attach("machina");
-		return SharedPtr<Driver>(driver);
+		return SPtr<Driver>(driver);
 	}
 #endif
 	if (name == "smf") {
-		return SharedPtr<Driver>(new SMFDriver(forge, machine->time().unit()));
+		return SPtr<Driver>(new SMFDriver(forge, machine->time().unit()));
 	}
 
 	std::cerr << "Error: Unknown driver type `" << name << "'" << std::endl;
-	return SharedPtr<Driver>();
+	return SPtr<Driver>();
 }
 
 /** Load the machine at @a uri, and run it (replacing current machine).
  * Safe to call while engine is processing.
  */
-SharedPtr<Machine>
+SPtr<Machine>
 Engine::load_machine(const Glib::ustring& uri)
 {
-	SharedPtr<Machine> machine = _loader.load(uri);
-	SharedPtr<Machine> old_machine;
+	SPtr<Machine> machine = _loader.load(uri);
+	SPtr<Machine> old_machine;
 	if (machine) {
 		old_machine = _driver->machine(); // Keep a reference to old machine...
 		machine->activate();
@@ -79,13 +79,14 @@ Engine::load_machine(const Glib::ustring& uri)
 /** Build a machine from the MIDI at @a uri, and run it (replacing current machine).
  * Safe to call while engine is processing.
  */
-SharedPtr<Machine>
-Engine::load_machine_midi(const Glib::ustring& uri, double q,
-                          Raul::TimeDuration dur)
+SPtr<Machine>
+Engine::load_machine_midi(const Glib::ustring& uri,
+                          double               q,
+                          Raul::TimeDuration   dur)
 {
-	SharedPtr<SMFDriver> file_driver(new SMFDriver(_forge, dur.unit()));
-	SharedPtr<Machine>   machine = file_driver->learn(uri, q, dur);
-	SharedPtr<Machine>   old_machine;
+	SPtr<SMFDriver> file_driver(new SMFDriver(_forge, dur.unit()));
+	SPtr<Machine>   machine = file_driver->learn(uri, q, dur);
+	SPtr<Machine>   old_machine;
 	if (machine) {
 		old_machine = _driver->machine(); // Keep a reference to old machine...
 		machine->activate();
@@ -98,11 +99,10 @@ Engine::load_machine_midi(const Glib::ustring& uri, double q,
 }
 
 void
-Engine::import_machine(SharedPtr<Machine> machine)
+Engine::import_machine(SPtr<Machine> machine)
 {
 	machine->activate();
-	_driver->machine()->nodes().insert(_driver->machine()->nodes().end(),
-	                                   machine->nodes().begin(),
+	_driver->machine()->nodes().insert(machine->nodes().begin(),
 	                                   machine->nodes().end());
 	// FIXME: thread safe?
 	// FIXME: announce
@@ -111,8 +111,8 @@ Engine::import_machine(SharedPtr<Machine> machine)
 void
 Engine::export_midi(const Glib::ustring& filename, Raul::TimeDuration dur)
 {
-	SharedPtr<Machine>            machine = _driver->machine();
-	SharedPtr<Machina::SMFDriver> file_driver(
+	SPtr<Machine>            machine = _driver->machine();
+	SPtr<Machina::SMFDriver> file_driver(
 		new Machina::SMFDriver(_forge, dur.unit()));
 
 	const bool activated = _driver->is_activated();