From 6b9f18ad7d08a6ca1a38de7dc98529bcb9e17b43 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 13 May 2012 18:40:19 +0000 Subject: Sanify atom port buffer size stuff (fix dead assignment). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4386 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/LV2Node.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp index d1b99949..3ecbb456 100644 --- a/src/server/LV2Node.cpp +++ b/src/server/LV2Node.cpp @@ -259,10 +259,10 @@ LV2Node::instantiate(BufferFactory& bufs) LILV_FOREACH(nodes, i, defaults) { const LilvNode* d = lilv_nodes_get(defaults, i); if (lilv_node_is_string(d)) { - const char* str_val = lilv_node_as_string(d); - const size_t str_val_len = strlen(str_val); + const char* str_val = lilv_node_as_string(d); + const uint32_t str_val_len = strlen(str_val); val = forge.alloc(str_val); - port_buffer_size = str_val_len; + port_buffer_size = std::max(port_buffer_size, str_val_len); } } @@ -271,12 +271,13 @@ LV2Node::instantiate(BufferFactory& bufs) LILV_FOREACH(nodes, i, sizes) { const LilvNode* d = lilv_nodes_get(sizes, i); if (lilv_node_is_int(d)) { - size_t size_val = lilv_node_as_int(d); - port_buffer_size = size_val; - Raul::info << "Atom port " << path() << " buffer size " - << port_buffer_size << std::endl; + uint32_t size_val = lilv_node_as_int(d); + port_buffer_size = std::max(port_buffer_size, size_val); } } + + Raul::info << "Atom port " << path() << " buffer size " + << port_buffer_size << std::endl; } enum { UNKNOWN, INPUT, OUTPUT } direction = UNKNOWN; -- cgit v1.2.1