summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-11 02:57:29 +0000
committerDavid Robillard <d@drobilla.net>2013-01-11 02:57:29 +0000
commit057bee977b95c6ccb4deb35245b598638d920330 (patch)
tree833ee00a08a918dd708b19e5c4fa801500ad9679 /src/server
parent4b480bf87cd496446491e3880d867d7fa92c6c49 (diff)
downloadingen-057bee977b95c6ccb4deb35245b598638d920330.tar.gz
ingen-057bee977b95c6ccb4deb35245b598638d920330.tar.bz2
ingen-057bee977b95c6ccb4deb35245b598638d920330.zip
C++11-safe conversions.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4914 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Buffer.hpp4
-rw-r--r--src/server/Engine.cpp32
-rw-r--r--src/server/EventWriter.cpp4
3 files changed, 25 insertions, 15 deletions
diff --git a/src/server/Buffer.hpp b/src/server/Buffer.hpp
index c710f4df..aefd63da 100644
--- a/src/server/Buffer.hpp
+++ b/src/server/Buffer.hpp
@@ -155,8 +155,8 @@ protected:
private:
void recycle();
- Buffer* _next; ///< Intrusive linked list for BufferFactory
- Raul::AtomicInt _refs; ///< Intrusive reference count
+ Buffer* _next; ///< Intrusive linked list for BufferFactory
+ Raul::AtomicInt _refs; ///< Intrusive reference count
};
} // namespace Server
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index fd96119b..faac9514 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -213,19 +213,24 @@ Engine::activate()
ProcessContext context(*this);
Resource::Properties control_properties;
- control_properties.insert(make_pair(uris.lv2_name,
- forge.alloc("Control")));
- control_properties.insert(make_pair(uris.rdf_type,
- uris.atom_AtomPort));
- control_properties.insert(make_pair(uris.atom_bufferType,
- uris.atom_Sequence));
+ control_properties.insert(
+ make_pair(uris.lv2_name, forge.alloc("Control")));
+ control_properties.insert(
+ make_pair(uris.rdf_type,
+ Resource::Property(uris.atom_AtomPort)));
+ control_properties.insert(
+ make_pair(uris.atom_bufferType,
+ Resource::Property(uris.atom_Sequence)));
// Add control input
Resource::Properties in_properties(control_properties);
- in_properties.insert(make_pair(uris.rdf_type, uris.lv2_InputPort));
+ in_properties.insert(
+ make_pair(uris.rdf_type,
+ Resource::Property(uris.lv2_InputPort)));
in_properties.insert(make_pair(uris.lv2_index, forge.make(0)));
- in_properties.insert(make_pair(uris.lv2_portProperty,
- uris.lv2_connectionOptional));
+ in_properties.insert(
+ make_pair(uris.lv2_portProperty,
+ Resource::Property(uris.lv2_connectionOptional)));
in_properties.insert(
make_pair(uris.ingen_canvasX,
Resource::Property(forge.make(32.0f), Resource::EXTERNAL)));
@@ -241,10 +246,13 @@ Engine::activate()
// Add control out
Resource::Properties out_properties(control_properties);
- out_properties.insert(make_pair(uris.rdf_type, uris.lv2_OutputPort));
+ out_properties.insert(
+ make_pair(uris.rdf_type,
+ Resource::Property(uris.lv2_OutputPort)));
out_properties.insert(make_pair(uris.lv2_index, forge.make(1)));
- in_properties.insert(make_pair(uris.lv2_portProperty,
- uris.lv2_connectionOptional));
+ in_properties.insert(
+ make_pair(uris.lv2_portProperty,
+ Resource::Property(uris.lv2_connectionOptional)));
out_properties.insert(
make_pair(uris.ingen_canvasX,
Resource::Property(forge.make(128.0f), Resource::EXTERNAL)));
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index 2b1b1bf6..a169e389 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -117,7 +117,9 @@ EventWriter::set_property(const Raul::URI& uri,
const Raul::Atom& value)
{
Resource::Properties remove;
- remove.insert(make_pair(predicate, _engine.world()->uris().wildcard));
+ remove.insert(
+ make_pair(predicate,
+ Resource::Property(_engine.world()->uris().wildcard)));
Resource::Properties add;
add.insert(make_pair(predicate, value));
_engine.enqueue_event(