diff options
| author | David Robillard <d@drobilla.net> | 2008-02-09 18:23:57 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-09 18:23:57 +0000 |
| commit | bd92c37ed3513ab881cad3e8667c6e9c6af0858f (patch) | |
| tree | fa0971280abc199228bdc84dbbfe6e3b04b8b876 /src/engine/Loader.cpp | |
| parent | 643bc5303bd0aaf054df02782a1ee2bf2c78e852 (diff) | |
| download | machina-bd92c37ed3513ab881cad3e8667c6e9c6af0858f.tar.gz machina-bd92c37ed3513ab881cad3e8667c6e9c6af0858f.tar.bz2 machina-bd92c37ed3513ab881cad3e8667c6e9c6af0858f.zip | |
Use Raul::TimeStamp (LV2 compatible typed 32:32 fixed timestamp) everywhere.
Fix initial size of Patchage messages window.
Machina disabled for now (transitioning to generic timestamps).
git-svn-id: http://svn.drobilla.net/lad/machina@1133 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/Loader.cpp')
| -rw-r--r-- | src/engine/Loader.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp index cf41bd1..3cc93aa 100644 --- a/src/engine/Loader.cpp +++ b/src/engine/Loader.cpp @@ -74,7 +74,7 @@ Loader::load(const Glib::ustring& uri) cout << "[Loader] Loading " << machine_uri << " from " << document_uri << endl; - machine = SharedPtr<Machine>(new Machine()); + machine = SharedPtr<Machine>(new Machine(TimeUnit::beats(LV2_EVENT_PPQN))); typedef std::map<string, SharedPtr<Node> > Created; Created created; @@ -93,7 +93,9 @@ Loader::load(const Glib::ustring& uri) for (Query::Results::iterator i = results.begin(); i != results.end(); ++i) { const char* node_id = (*i)["node"]; - SharedPtr<Node> node(new Node(float((*i)["duration"]), true)); + SharedPtr<Node> node(new Node( + TimeStamp(TimeUnit(TimeUnit::BEATS, LV2_EVENT_PPQN), (double)(*i)["duration"]), + true)); machine->add_node(node); created[node_id] = node; } @@ -112,7 +114,9 @@ Loader::load(const Glib::ustring& uri) for (Query::Results::iterator i = results.begin(); i != results.end(); ++i) { const char* node_id = (*i)["node"]; if (created.find(node_id) == created.end()) { - SharedPtr<Node> node(new Node((float)(*i)["duration"], false)); + SharedPtr<Node> node(new Node( + TimeStamp(TimeUnit(TimeUnit::BEATS, LV2_EVENT_PPQN), (double)(*i)["duration"]), + false)); machine->add_node(node); created[node_id] = node; } |