summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-11-17 19:25:53 +0000
committerDavid Robillard <d@drobilla.net>2012-11-17 19:25:53 +0000
commit7767a8405496d3f2eba6594bfc1d57f25f8907ff (patch)
tree532e473ad8205cd2a26aff7bac6bb07bc1b74ce6
parentaf282195f9ced2947752154245d2ca13c670bef1 (diff)
downloadingen-7767a8405496d3f2eba6594bfc1d57f25f8907ff.tar.gz
ingen-7767a8405496d3f2eba6594bfc1d57f25f8907ff.tar.bz2
ingen-7767a8405496d3f2eba6594bfc1d57f25f8907ff.zip
Set plugin<=>UI queue size based on LV2 options.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4822 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--bundles/StereoInOut.ingen/StereoInOut.ttl2
-rw-r--r--bundles/ingen.lv2/manifest.ttl2
-rw-r--r--src/server/JackDriver.cpp2
-rw-r--r--src/server/ingen_lv2.cpp11
-rw-r--r--tests/empty.ingen/empty.ttl2
5 files changed, 10 insertions, 9 deletions
diff --git a/bundles/StereoInOut.ingen/StereoInOut.ttl b/bundles/StereoInOut.ingen/StereoInOut.ttl
index 9ae60646..6052ce0f 100644
--- a/bundles/StereoInOut.ingen/StereoInOut.ttl
+++ b/bundles/StereoInOut.ingen/StereoInOut.ttl
@@ -21,7 +21,7 @@
ingen:tail <control_in>
] ;
ingen:polyphony 1 ;
- <http://lv2plug.in/ns/extensions/ui#ui> ingen:PatchUIGtk2 ;
+ <http://lv2plug.in/ns/extensions/ui#ui> ingen:GraphUIGtk2 ;
lv2:extensionData <http://lv2plug.in/ns/ext/state#interface> ;
lv2:port <audio_in_1> ,
<audio_in_2> ,
diff --git a/bundles/ingen.lv2/manifest.ttl b/bundles/ingen.lv2/manifest.ttl
index ea2f62fe..d0151df1 100644
--- a/bundles/ingen.lv2/manifest.ttl
+++ b/bundles/ingen.lv2/manifest.ttl
@@ -7,7 +7,7 @@ ingen:
a owl:Ontology ;
rdfs:seeAlso <ingen.ttl> .
-ingen:PatchUIGtk2
+ingen:GraphUIGtk2
a ui:GtkUI ;
ui:binary <libingen_gui_lv2.so> ;
rdfs:comment "The Ingen patcher interface." .
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index c266861e..eb1c0894 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -357,8 +357,6 @@ JackDriver::append_time_events(ProcessContext& context,
_old_rolling = rolling;
_old_bpm = pos->beats_per_minute;
- std::cerr << "POS CHANGED" << endl;
-
// Build an LV2 position object to append to the buffer
uint8_t pos_buf[256];
LV2_Atom_Forge_Frame frame;
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index aaa0bcb2..dc274a32 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -32,15 +32,16 @@
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "ingen/Interface.hpp"
-#include "ingen/Log.hpp"
-#include "ingen/serialisation/Parser.hpp"
-#include "ingen/serialisation/Serialiser.hpp"
#include "ingen/AtomReader.hpp"
#include "ingen/AtomWriter.hpp"
+#include "ingen/Configuration.hpp"
+#include "ingen/Interface.hpp"
+#include "ingen/Log.hpp"
#include "ingen/Store.hpp"
#include "ingen/World.hpp"
#include "ingen/runtime_paths.hpp"
+#include "ingen/serialisation/Parser.hpp"
+#include "ingen/serialisation/Serialiser.hpp"
#include "raul/Semaphore.hpp"
#include "raul/SharedPtr.hpp"
#include "raul/Thread.hpp"
@@ -550,6 +551,8 @@ 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);
SharedPtr<Server::Engine> engine(new Server::Engine(plugin->world));
plugin->world->set_engine(engine);
diff --git a/tests/empty.ingen/empty.ttl b/tests/empty.ingen/empty.ttl
index ac905a2e..95f60157 100644
--- a/tests/empty.ingen/empty.ttl
+++ b/tests/empty.ingen/empty.ttl
@@ -31,7 +31,7 @@
<>
ingen:polyphony 1 ;
- <http://lv2plug.in/ns/extensions/ui#ui> ingen:PatchUIGtk2 ;
+ <http://lv2plug.in/ns/extensions/ui#ui> ingen:GraphUIGtk2 ;
lv2:extensionData <http://lv2plug.in/ns/ext/state#interface> ;
lv2:port <control_in> ,
<control_out> ;