summaryrefslogtreecommitdiffstats
path: root/src/gui/PatchCanvas.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-12 06:59:48 +0000
committerDavid Robillard <d@drobilla.net>2012-03-12 06:59:48 +0000
commit81e9fb3245bd461ebfee4cfa16d1792e48533f9e (patch)
treeeb1b30d79cba70dda9d832100dd7c14b08085b03 /src/gui/PatchCanvas.cpp
parente9d9569271ee962c09ab66c6babed1ca5655a6c6 (diff)
downloadingen-81e9fb3245bd461ebfee4cfa16d1792e48533f9e.tar.gz
ingen-81e9fb3245bd461ebfee4cfa16d1792e48533f9e.tar.bz2
ingen-81e9fb3245bd461ebfee4cfa16d1792e48533f9e.zip
Centralise atom creation in forge object.
Aside from being more greppable and making realtime violations more obvious, this is a step towards using LV2 atoms internally (which needs a factory since the type numbers are dynamic). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4054 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/PatchCanvas.cpp')
-rw-r--r--src/gui/PatchCanvas.cpp27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 6690e93f..61e30e04 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -706,7 +706,7 @@ PatchCanvas::paste()
props.insert(make_pair(uris.rdf_type,
uris.ingen_Patch));
props.insert(make_pair(uris.ingen_polyphony,
- Raul::Atom(int32_t(_patch->internal_poly()))));
+ _app.forge().make(int32_t(_patch->internal_poly()))));
clipboard.put(Path(), props);
size_t first_slash;
while (to_create != "/" && !to_create.empty()
@@ -739,14 +739,17 @@ PatchCanvas::paste()
GraphObject::Properties::iterator x = props.find(uris.ingen_canvasX);
if (x != i->second->properties().end())
- x->second = x->second.get_float() + (20.0f * _paste_count);
+ x->second = _app.forge().make(
+ x->second.get_float() + (20.0f * _paste_count));
GraphObject::Properties::iterator y = props.find(uris.ingen_canvasY);
if (y != i->second->properties().end())
- y->second = y->second.get_float() + (20.0f * _paste_count);
+ y->second = _app.forge().make(
+ y->second.get_float() + (20.0f * _paste_count));
if (i->first.parent().is_root())
- i->second->set_property(uris.ingen_selected, true);
+ i->second->set_property(uris.ingen_selected,
+ _app.forge().make(true));
builder.build(i->second);
}
@@ -793,9 +796,9 @@ PatchCanvas::menu_add_port(const string& sym_base, const string& name_base,
props.insert(make_pair(uris.rdf_type,
is_output ? uris.lv2_OutputPort : uris.lv2_InputPort));
props.insert(make_pair(uris.lv2_index,
- Atom(int32_t(_patch->num_ports()))));
+ _app.forge().make(int32_t(_patch->num_ports()))));
props.insert(make_pair(uris.lv2_name,
- Atom(name.c_str())));
+ _app.forge().make(name.c_str())));
_app.engine()->put(path, props);
}
@@ -841,10 +844,14 @@ PatchCanvas::get_initial_data(Resource::Graph ctx)
{
GraphObject::Properties result;
const URIs& uris = _app.uris();
- result.insert(make_pair(uris.ingen_canvasX,
- Resource::Property((float)_last_click_x, ctx)));
- result.insert(make_pair(uris.ingen_canvasY,
- Resource::Property((float)_last_click_y, ctx)));
+ result.insert(
+ make_pair(uris.ingen_canvasX,
+ Resource::Property(_app.forge().make((float)_last_click_x),
+ ctx)));
+ result.insert(
+ make_pair(uris.ingen_canvasY,
+ Resource::Property(_app.forge().make((float)_last_click_y),
+ ctx)));
return result;
}