aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-13 09:27:06 +0000
committerDavid Robillard <d@drobilla.net>2013-01-13 09:27:06 +0000
commit6ca00476393400d6edd73bd7182ec8da28c2e8f2 (patch)
treedeae18739dcc4ea64c2b69c4779267074ef4908f
parent448d6e329a55848e357d57f8ca225d987627ee08 (diff)
downloadmachina-6ca00476393400d6edd73bd7182ec8da28c2e8f2.tar.gz
machina-6ca00476393400d6edd73bd7182ec8da28c2e8f2.tar.bz2
machina-6ca00476393400d6edd73bd7182ec8da28c2e8f2.zip
Fix multiple initial nodes on import.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4957 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/MachineBuilder.cpp2
-rw-r--r--src/engine/SMFDriver.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/engine/MachineBuilder.cpp b/src/engine/MachineBuilder.cpp
index ff2ee77..cc7076b 100644
--- a/src/engine/MachineBuilder.cpp
+++ b/src/engine/MachineBuilder.cpp
@@ -35,7 +35,7 @@ MachineBuilder::MachineBuilder(SPtr<Machine> machine, double q, bool step)
: _quantization(q)
, _time(machine->time().unit()) // = 0
, _machine(machine)
- , _initial_node(new Node(_time, true)) // duration 0
+ , _initial_node(machine->initial_node()) // duration 0
, _connect_node(_initial_node)
, _connect_node_end_time(_time) // = 0
, _step(step)
diff --git a/src/engine/SMFDriver.cpp b/src/engine/SMFDriver.cpp
index 538b540..7f42602 100644
--- a/src/engine/SMFDriver.cpp
+++ b/src/engine/SMFDriver.cpp
@@ -126,7 +126,6 @@ SMFDriver::learn_track(SPtr<MachineBuilder> builder,
uint32_t ev_size;
uint32_t ev_delta_time;
-
Raul::TimeUnit unit = Raul::TimeUnit(TimeUnit::BEATS, MACHINA_PPQN);
uint64_t t = 0;