diff options
| author | David Robillard <d@drobilla.net> | 2012-11-21 16:12:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-11-21 16:12:50 +0000 |
| commit | 716e1e839790be24ebfa56c5fe8b688a3def60d2 (patch) | |
| tree | 88c6df99538a714df7dfbd83b8f897fa455e4eee /src/server | |
| parent | 75bec507b3815f8a101de265bd353cfdb289bc6d (diff) | |
| download | ingen-716e1e839790be24ebfa56c5fe8b688a3def60d2.tar.gz ingen-716e1e839790be24ebfa56c5fe8b688a3def60d2.tar.bz2 ingen-716e1e839790be24ebfa56c5fe8b688a3def60d2.zip | |
Use atoms for option values.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4842 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Engine.cpp | 2 | ||||
| -rw-r--r-- | src/server/ingen_jack.cpp | 3 | ||||
| -rw-r--r-- | src/server/ingen_lv2.cpp | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index 4a1afb86..7e1e2ffc 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -112,7 +112,7 @@ Engine::store() const size_t Engine::event_queue_size() const { - return world()->conf().option("queue-size").get_int(); + return world()->conf().option("queue-size").get_int32(); } void diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp index c6c5e005..f273a209 100644 --- a/src/server/ingen_jack.cpp +++ b/src/server/ingen_jack.cpp @@ -21,6 +21,7 @@ #include "ingen/Log.hpp" #include "ingen/Module.hpp" #include "ingen/World.hpp" +#include "raul/Atom.hpp" #include "JackDriver.hpp" #include "Engine.hpp" @@ -37,7 +38,7 @@ struct IngenJackModule : public Ingen::Module { Server::JackDriver* driver = new Server::JackDriver( *(Server::Engine*)world->engine().get()); - const Configuration::Value& s = world->conf().option("jack-server"); + const Raul::Atom& s = world->conf().option("jack-server"); const std::string server_name = s.is_valid() ? s.get_string() : ""; driver->attach(server_name, world->conf().option("jack-name").get_string(), diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp index f64e9c45..f0a4c2df 100644 --- a/src/server/ingen_lv2.cpp +++ b/src/server/ingen_lv2.cpp @@ -564,8 +564,9 @@ ingen_instantiate(const LV2_Descriptor* descriptor, plugin->world->log().info( Raul::fmt("Block: %1% frames, Sequence: %2% bytes\n") % block_length % seq_size); - plugin->world->conf().set("queue-size", - std::max(block_length, seq_size) * 4); + plugin->world->conf().set( + "queue-size", + plugin->world->forge().make(std::max(block_length, seq_size) * 4)); SharedPtr<Server::Engine> engine(new Server::Engine(plugin->world)); plugin->world->set_engine(engine); |