From b590c510015db3b3ff8201c557c51c38d26c9982 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 Mar 2022 18:23:35 -0500 Subject: fixup! WIP: Port to serd1 --- src/node.c | 19 +++++----- src/plugin.c | 26 ++++++------- src/pluginclass.c | 2 +- src/port.c | 6 +-- src/state.c | 44 +++++++++++----------- src/world.c | 4 +- test/bad_syntax.lv2/test_bad_syntax.c | 2 +- .../test_failed_instantiation.c | 2 +- .../test_failed_lib_descriptor.c | 2 +- test/lib_descriptor.lv2/test_lib_descriptor.c | 2 +- test/lilv_test_utils.c | 2 +- .../test_missing_descriptor.c | 2 +- test/missing_name.lv2/test_missing_name.c | 2 +- test/missing_plugin.lv2/test_missing_plugin.c | 2 +- test/missing_port.lv2/test_missing_port.c | 4 +- .../missing_port_name.lv2/test_missing_port_name.c | 2 +- test/test_state.c | 8 ++-- 17 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/node.c b/src/node.c index 0a86d0a..9a7d15f 100644 --- a/src/node.c +++ b/src/node.c @@ -31,7 +31,7 @@ LilvNode* lilv_new_uri(LilvWorld* world, const char* uri) { (void)world; - return serd_new_uri(NULL, SERD_STRING(uri)); + return serd_new_uri(NULL, serd_string(uri)); } LilvNode* @@ -42,8 +42,8 @@ lilv_new_file_uri(LilvWorld* world, const char* host, const char* path) char* abs_path = lilv_path_absolute(path); SerdNode* s = serd_new_file_uri(NULL, - SERD_STRING(abs_path), - host ? SERD_STRING(host) : SERD_EMPTY_STRING()); + serd_string(abs_path), + host ? serd_string(host) : serd_empty_string()); free(abs_path); return s; @@ -54,7 +54,7 @@ lilv_new_string(LilvWorld* world, const char* str) { (void)world; - return serd_new_string(NULL, SERD_STRING(str)); + return serd_new_string(NULL, serd_string(str)); } LilvNode* @@ -62,8 +62,7 @@ lilv_new_int(LilvWorld* world, int val) { (void)world; - return serd_new_integer( - NULL, val, serd_node_string_view(world->uris.xsd_int)); + return serd_new_value(NULL, serd_int(val)); } LilvNode* @@ -71,7 +70,7 @@ lilv_new_float(LilvWorld* world, float val) { (void)world; - return serd_new_float(NULL, val); + return serd_new_value(NULL, serd_float(val)); } LilvNode* @@ -79,7 +78,7 @@ lilv_new_bool(LilvWorld* world, bool val) { (void)world; - return serd_new_boolean(NULL, val); + return serd_new_value(NULL, serd_bool(val)); } LilvNode* @@ -202,7 +201,9 @@ lilv_node_is_float(const LilvNode* value) float lilv_node_as_float(const LilvNode* value) { - return serd_get_float(value); + const SerdValue result = serd_get_value_as(value, SERD_FLOAT, true); + + return result.type == SERD_FLOAT ? result.data.as_float : NAN; } bool diff --git a/src/plugin.c b/src/plugin.c index 9a9906c..8e2f923 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -842,7 +842,7 @@ lilv_plugin_get_author(const LilvPlugin* plugin) lilv_plugin_load_if_necessary(plugin); SerdNode* doap_maintainer = - serd_new_uri(NULL, SERD_STRING(NS_DOAP "maintainer")); + serd_new_uri(NULL, serd_string(NS_DOAP "maintainer")); const SerdNode* maintainer = serd_model_get( plugin->world->model, plugin->plugin_uri, doap_maintainer, NULL, NULL); @@ -870,7 +870,7 @@ lilv_plugin_get_author_property(const LilvPlugin* plugin, const char* uri) { SerdNode* author = lilv_plugin_get_author(plugin); if (author) { - SerdNode* pred = serd_new_uri(NULL, SERD_STRING(uri)); + SerdNode* pred = serd_new_uri(NULL, serd_string(uri)); LilvNode* ret = lilv_plugin_get_one(plugin, author, pred); serd_node_free(NULL, pred); serd_node_free(NULL, author); @@ -908,8 +908,8 @@ lilv_plugin_get_uis(const LilvPlugin* plugin) { lilv_plugin_load_if_necessary(plugin); - SerdNode* ui_ui_node = serd_new_uri(NULL, SERD_STRING(LV2_UI__ui)); - SerdNode* ui_binary_node = serd_new_uri(NULL, SERD_STRING(LV2_UI__binary)); + SerdNode* ui_ui_node = serd_new_uri(NULL, serd_string(LV2_UI__ui)); + SerdNode* ui_binary_node = serd_new_uri(NULL, serd_string(LV2_UI__binary)); LilvUIs* result = lilv_uis_new(); SerdCursor* uis = serd_model_find( @@ -978,17 +978,17 @@ lilv_plugin_get_related(const LilvPlugin* plugin, const LilvNode* type) } static SerdEnv* -new_lv2_env(const SerdWorld* const world, const SerdNode* base) +new_lv2_env(SerdWorld* const world, const SerdNode* base) { SerdEnv* env = serd_env_new(world, serd_node_string_view(base)); - serd_env_set_prefix(env, SERD_STRING("doap"), SERD_STRING(NS_DOAP)); - serd_env_set_prefix(env, SERD_STRING("foaf"), SERD_STRING(NS_FOAF)); - serd_env_set_prefix(env, SERD_STRING("lv2"), SERD_STRING(NS_LV2)); - serd_env_set_prefix(env, SERD_STRING("owl"), SERD_STRING(NS_OWL)); - serd_env_set_prefix(env, SERD_STRING("rdf"), SERD_STRING(NS_RDF)); - serd_env_set_prefix(env, SERD_STRING("rdfs"), SERD_STRING(NS_RDFS)); - serd_env_set_prefix(env, SERD_STRING("xsd"), SERD_STRING(NS_XSD)); + serd_env_set_prefix(env, serd_string("doap"), serd_string(NS_DOAP)); + serd_env_set_prefix(env, serd_string("foaf"), serd_string(NS_FOAF)); + serd_env_set_prefix(env, serd_string("lv2"), serd_string(NS_LV2)); + serd_env_set_prefix(env, serd_string("owl"), serd_string(NS_OWL)); + serd_env_set_prefix(env, serd_string("rdf"), serd_string(NS_RDF)); + serd_env_set_prefix(env, serd_string("rdfs"), serd_string(NS_RDFS)); + serd_env_set_prefix(env, serd_string("xsd"), serd_string(NS_XSD)); return env; } @@ -1073,7 +1073,7 @@ lilv_plugin_write_manifest_entry(LilvWorld* world, plugin->world->uris.lv2_Plugin, NULL); - const SerdNode* file_node = serd_new_uri(NULL, SERD_STRING(plugin_file_path)); + const SerdNode* file_node = serd_new_uri(NULL, serd_string(plugin_file_path)); serd_sink_write(serd_writer_sink(writer), 0, diff --git a/src/pluginclass.c b/src/pluginclass.c index 5ec89bc..004499d 100644 --- a/src/pluginclass.c +++ b/src/pluginclass.c @@ -33,7 +33,7 @@ lilv_plugin_class_new(LilvWorld* world, pc->world = world; pc->uri = serd_node_copy(NULL, uri); - pc->label = serd_new_string(NULL, SERD_STRING(label)); + pc->label = serd_new_string(NULL, serd_string(label)); pc->parent_uri = (parent_node ? serd_node_copy(NULL, parent_node) : NULL); return pc; diff --git a/src/port.c b/src/port.c index 2734727..fa3d122 100644 --- a/src/port.c +++ b/src/port.c @@ -37,7 +37,7 @@ lilv_port_new(const SerdNode* node, uint32_t index, const char* symbol) port->node = serd_node_copy(NULL, node); port->index = index; - port->symbol = serd_new_string(NULL, SERD_STRING(symbol)); + port->symbol = serd_new_string(NULL, serd_string(symbol)); port->classes = lilv_nodes_new(); return port; } @@ -94,7 +94,7 @@ lilv_port_supports_event(const LilvPlugin* plugin, for (const char** pred = predicates; *pred; ++pred) { if (serd_model_ask(plugin->world->model, port->node, - serd_new_uri(NULL, SERD_STRING(*pred)), + serd_new_uri(NULL, serd_string(*pred)), event_type, NULL)) { return true; @@ -232,7 +232,7 @@ lilv_port_get_scale_points(const LilvPlugin* plugin, const LilvPort* port) SerdCursor* points = serd_model_find(plugin->world->model, port->node, - serd_new_uri(NULL, SERD_STRING(LV2_CORE__scalePoint)), + serd_new_uri(NULL, serd_string(LV2_CORE__scalePoint)), NULL, NULL); diff --git a/src/state.c b/src/state.c index 9de6d9a..4d1b84c 100644 --- a/src/state.c +++ b/src/state.c @@ -669,9 +669,9 @@ new_state_from_model(LilvWorld* world, serd_cursor_free(i); } - SerdEnv* env = serd_env_new(world->world, SERD_EMPTY_STRING()); + SerdEnv* env = serd_env_new(world->world, serd_empty_string()); SratomLoader* loader = sratom_loader_new(world->world, map); - SerdBuffer buffer = {NULL, 0}; + SerdBuffer buffer = {NULL, NULL, 0}; // Get metadata SerdCursor* meta = serd_model_find(model, node, 0, 0, 0); @@ -772,7 +772,7 @@ lilv_state_new_from_file(LilvWorld* world, char* abs_path = lilv_path_absolute(path); SerdNode* node = - serd_new_file_uri(NULL, SERD_STRING(abs_path), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_path), serd_empty_string()); SerdEnv* env = serd_env_new(world->world, serd_node_string_view(node)); SerdModel* model = serd_model_new(world->world, SERD_ORDER_SPO, 0u); @@ -808,7 +808,7 @@ lilv_state_new_from_file(LilvWorld* world, static void set_prefixes(SerdEnv* env) { -#define SET_PSET(e, p, u) serd_env_set_prefix(e, SERD_STRING(p), SERD_STRING(u)) +#define SET_PSET(e, p, u) serd_env_set_prefix(e, serd_string(p), serd_string(u)) SET_PSET(env, "atom", LV2_ATOM_PREFIX); SET_PSET(env, "lv2", LV2_CORE_PREFIX); @@ -826,7 +826,7 @@ lilv_state_new_from_string(LilvWorld* world, LV2_URID_Map* map, const char* str) return NULL; } - SerdEnv* env = serd_env_new(world->world, SERD_EMPTY_STRING()); + SerdEnv* env = serd_env_new(world->world, serd_empty_string()); SerdModel* model = serd_model_new(world->world, SERD_ORDER_SPO, 0u); SerdSink* inserter = serd_inserter_new(model, NULL); SerdReader* reader = serd_reader_new( @@ -841,7 +841,7 @@ lilv_state_new_from_string(LilvWorld* world, LV2_URID_Map* map, const char* str) serd_reader_read_document(reader); serd_close_input(&in); - SerdNode* o = serd_new_uri(NULL, SERD_STRING(LV2_PRESETS__Preset)); + SerdNode* o = serd_new_uri(NULL, serd_string(LV2_PRESETS__Preset)); const SerdNode* s = serd_model_get(model, NULL, world->uris.rdf_a, o, NULL); LilvState* state = new_state_from_model(world, map, model, s, NULL); @@ -896,7 +896,7 @@ ttl_file_writer(SerdWorld* world, static void remove_manifest_entry(SerdModel* model, const char* subject) { - SerdNode* const s = serd_new_uri(NULL, SERD_STRING(subject)); + SerdNode* const s = serd_new_uri(NULL, serd_string(subject)); SerdCursor* const r = serd_model_find(model, s, NULL, NULL, NULL); serd_model_erase_statements(model, r); @@ -944,8 +944,8 @@ add_state_to_manifest(LilvWorld* lworld, { static const SerdStringView empty = {"", 0}; - const SerdStringView manifest_path_view = SERD_STRING(manifest_path); - const SerdStringView state_path_view = SERD_STRING(state_path); + const SerdStringView manifest_path_view = serd_string(manifest_path); + const SerdStringView state_path_view = serd_string(state_path); SerdWorld* world = lworld->world; SerdNode* manifest = serd_new_file_uri(NULL, manifest_path_view, empty); @@ -986,7 +986,7 @@ add_state_to_manifest(LilvWorld* lworld, remove_manifest_entry(model, state_uri); // Add manifest entry for this state to model - SerdNode* s = serd_new_uri(NULL, SERD_STRING(state_uri)); + SerdNode* s = serd_new_uri(NULL, serd_string(state_uri)); // a pset:Preset serd_model_add(model, s, lworld->uris.rdf_a, lworld->uris.pset_Preset, NULL); @@ -1053,7 +1053,7 @@ write_property_array(const LilvState* state, Property* prop = &array->props[i]; const char* key = unmap->unmap(unmap->handle, prop->key); - SerdNode* p = serd_new_uri(NULL, SERD_STRING(key)); + SerdNode* p = serd_new_uri(NULL, serd_string(key)); if (prop->type == state->atom_Path && !dir) { const char* path = (const char*)prop->value; const char* abs_path = lilv_state_rel2abs(state, path); @@ -1091,7 +1091,7 @@ lilv_state_write(LilvWorld* world, const SerdSink* sink = serd_writer_sink(writer); const SerdNode* plugin_uri = state->plugin_uri; SerdNode* subject = - serd_new_uri(NULL, uri ? SERD_STRING(uri) : SERD_EMPTY_STRING()); + serd_new_uri(NULL, uri ? serd_string(uri) : serd_empty_string()); SerdStatus st = SERD_SUCCESS; @@ -1109,7 +1109,7 @@ lilv_state_write(LilvWorld* world, // rdfs:label label if (state->label) { - SerdNode* label = serd_new_string(NULL, SERD_STRING(state->label)); + SerdNode* label = serd_new_string(NULL, serd_string(state->label)); if ((st = serd_sink_write( sink, 0, subject, world->uris.rdfs_label, label, NULL))) { return st; @@ -1128,7 +1128,7 @@ lilv_state_write(LilvWorld* world, for (uint32_t i = 0; i < state->n_values; ++i) { PortValue* const value = &state->values[i]; SerdNode* port = - serd_new_token(NULL, SERD_BLANK, SERD_STRING(value->symbol)); + serd_new_token(NULL, SERD_BLANK, serd_string(value->symbol)); // <> lv2:port _:symbol if ((st = serd_sink_write( @@ -1137,7 +1137,7 @@ lilv_state_write(LilvWorld* world, } // _:symbol lv2:symbol "symbol" - SerdNode* symbol = serd_new_string(NULL, SERD_STRING(value->symbol)); + SerdNode* symbol = serd_new_string(NULL, serd_string(value->symbol)); if ((st = serd_sink_write( sink, 0, port, world->uris.lv2_symbol, symbol, NULL))) { return st; @@ -1162,7 +1162,7 @@ lilv_state_write(LilvWorld* world, // <> state:state _:body - SerdNode* body = serd_new_token(NULL, SERD_BLANK, SERD_STRING("body")); + SerdNode* body = serd_new_token(NULL, SERD_BLANK, serd_string("body")); if (state->props.n > 0) { if ((st = serd_sink_write( sink, SERD_ANON_O, subject, world->uris.state_state, body, NULL))) { @@ -1259,10 +1259,10 @@ lilv_state_save(LilvWorld* world, // Write state to Turtle file SerdNode* file = - serd_new_file_uri(NULL, SERD_STRING(path), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(path), serd_empty_string()); SerdNode* node = - uri ? serd_new_uri(NULL, SERD_STRING(uri)) : serd_node_copy(NULL, file); + uri ? serd_new_uri(NULL, serd_string(uri)) : serd_node_copy(NULL, file); SerdOutputStream out = serd_open_output_stream( (SerdWriteFunc)fwrite, (SerdErrorFunc)ferror, (SerdCloseFunc)fclose, fd); @@ -1306,10 +1306,10 @@ lilv_state_to_string(LilvWorld* world, return NULL; } - SerdDynamicBuffer buffer = {NULL, NULL, 0}; - SerdEnv* env = NULL; - SerdNode* base = - serd_new_uri(NULL, base_uri ? SERD_STRING(base_uri) : SERD_EMPTY_STRING()); + SerdBuffer buffer = {NULL, NULL, 0}; + SerdEnv* env = NULL; + SerdNode* base = + serd_new_uri(NULL, base_uri ? serd_string(base_uri) : serd_empty_string()); SerdOutputStream out = serd_open_output_buffer(&buffer); SerdWriter* writer = ttl_writer(world->world, &out, base, &env); diff --git a/src/world.c b/src/world.c index 7024cb2..9083845 100644 --- a/src/world.c +++ b/src/world.c @@ -74,7 +74,7 @@ lilv_world_new(void) #define NS_DYNMAN "http://lv2plug.in/ns/ext/dynmanifest#" #define NS_OWL "http://www.w3.org/2002/07/owl#" -#define NEW_URI(uri) serd_new_uri(NULL, SERD_STRING(uri)) +#define NEW_URI(uri) serd_new_uri(NULL, serd_string(uri)) world->uris.dc_replaces = NEW_URI(NS_DCTERMS "replaces"); world->uris.dman_DynManifest = NEW_URI(NS_DYNMAN "DynManifest"); @@ -898,7 +898,7 @@ load_dir_entry(const char* dir, const char* name, void* data) char* path = lilv_strjoin(dir, "/", name, "/", NULL); SerdNode* suri = - serd_new_file_uri(NULL, SERD_STRING(path), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(path), serd_empty_string()); LilvNode* node = lilv_new_uri(world, serd_node_string(suri)); diff --git a/test/bad_syntax.lv2/test_bad_syntax.c b/test/bad_syntax.lv2/test_bad_syntax.c index 3922df0..19376ed 100644 --- a/test/bad_syntax.lv2/test_bad_syntax.c +++ b/test/bad_syntax.lv2/test_bad_syntax.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/failed_instantiation.lv2/test_failed_instantiation.c b/test/failed_instantiation.lv2/test_failed_instantiation.c index 64e7a80..b28d4e2 100644 --- a/test/failed_instantiation.lv2/test_failed_instantiation.c +++ b/test/failed_instantiation.lv2/test_failed_instantiation.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c index 5f7329f..194d3b4 100644 --- a/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c +++ b/test/failed_lib_descriptor.lv2/test_failed_lib_descriptor.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/lib_descriptor.lv2/test_lib_descriptor.c b/test/lib_descriptor.lv2/test_lib_descriptor.c index 3909feb..781243a 100644 --- a/test/lib_descriptor.lv2/test_lib_descriptor.c +++ b/test/lib_descriptor.lv2/test_lib_descriptor.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/lilv_test_utils.c b/test/lilv_test_utils.c index 563da20..bb5622b 100644 --- a/test/lilv_test_utils.c +++ b/test/lilv_test_utils.c @@ -95,7 +95,7 @@ create_bundle(LilvTestEnv* env, } SerdNode* s = serd_new_file_uri( - NULL, SERD_STRING(env->test_bundle_path), SERD_EMPTY_STRING()); + NULL, serd_string(env->test_bundle_path), serd_empty_string()); env->test_bundle_uri = lilv_new_uri(env->world, serd_node_string(s)); env->test_manifest_path = diff --git a/test/missing_descriptor.lv2/test_missing_descriptor.c b/test/missing_descriptor.lv2/test_missing_descriptor.c index d811d8f..2a630d7 100644 --- a/test/missing_descriptor.lv2/test_missing_descriptor.c +++ b/test/missing_descriptor.lv2/test_missing_descriptor.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/missing_name.lv2/test_missing_name.c b/test/missing_name.lv2/test_missing_name.c index ef00cc1..29b732b 100644 --- a/test/missing_name.lv2/test_missing_name.c +++ b/test/missing_name.lv2/test_missing_name.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/missing_plugin.lv2/test_missing_plugin.c b/test/missing_plugin.lv2/test_missing_plugin.c index a50f7cc..2cdd1b8 100644 --- a/test/missing_plugin.lv2/test_missing_plugin.c +++ b/test/missing_plugin.lv2/test_missing_plugin.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/missing_port.lv2/test_missing_port.c b/test/missing_port.lv2/test_missing_port.c index fcb5435..ae0055d 100644 --- a/test/missing_port.lv2/test_missing_port.c +++ b/test/missing_port.lv2/test_missing_port.c @@ -24,9 +24,9 @@ main(int argc, char** argv) // Load test plugin bundle char* const abs_bundle = lilv_path_absolute(bundle_path); - const SerdStringView abs_bundle_view = SERD_STRING(abs_bundle); + const SerdStringView abs_bundle_view = serd_string(abs_bundle); SerdNode* bundle = - serd_new_file_uri(NULL, abs_bundle_view, SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, abs_bundle_view, serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/missing_port_name.lv2/test_missing_port_name.c b/test/missing_port_name.lv2/test_missing_port_name.c index 2832077..8e9c392 100644 --- a/test/missing_port_name.lv2/test_missing_port_name.c +++ b/test/missing_port_name.lv2/test_missing_port_name.c @@ -25,7 +25,7 @@ main(int argc, char** argv) // Load test plugin bundle char* abs_bundle = lilv_path_absolute(bundle_path); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); lilv_world_load_bundle(world, bundle); free(abs_bundle); diff --git a/test/test_state.c b/test/test_state.c index 2951b61..636d637 100644 --- a/test/test_state.c +++ b/test/test_state.c @@ -248,7 +248,7 @@ load_test_plugin(const TestContext* const ctx) LilvWorld* world = ctx->env->world; char* abs_bundle = lilv_path_absolute(LILV_TEST_BUNDLE); SerdNode* bundle = - serd_new_file_uri(NULL, SERD_STRING(abs_bundle), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(abs_bundle), serd_empty_string()); LilvNode* bundle_uri = lilv_new_uri(world, serd_node_string(bundle)); LilvNode* plugin_uri = lilv_new_uri(world, TEST_PLUGIN_URI); @@ -550,9 +550,9 @@ count_statements(const char* path) size_t n_statements = 0; SerdWorld* const world = serd_world_new(NULL); - const SerdStringView path_view = SERD_STRING(path); + const SerdStringView path_view = serd_string(path); SerdNode* const base = - serd_new_file_uri(NULL, path_view, SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, path_view, serd_empty_string()); SerdEnv* const env = serd_env_new(world, serd_node_string_view(base)); SerdSink* const sink = serd_sink_new(world, &n_statements, count_func, NULL); @@ -919,7 +919,7 @@ test_world_round_trip(void) // Load state bundle into world SerdNode* bundle_uri = - serd_new_file_uri(NULL, SERD_STRING(bundle_path), SERD_EMPTY_STRING()); + serd_new_file_uri(NULL, serd_string(bundle_path), serd_empty_string()); LilvNode* const bundle_node = lilv_new_uri(world, serd_node_string(bundle_uri)); -- cgit v1.2.1