From aa23414e42027a680d029eb212d22c8e0a36caa8 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 30 Jan 2011 05:39:16 +0000 Subject: Wrap match (stream) variable getting in macro. git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2870 a436a847-0d15-0410-975c-d299462d15a1 --- src/port.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/port.c') diff --git a/src/port.c b/src/port.c index 35364a8..2f49d16 100644 --- a/src/port.c +++ b/src/port.c @@ -76,10 +76,8 @@ slv2_port_get_node(SLV2Plugin p, NULL); librdf_node* ret = NULL; FOREACH_MATCH(ports) { - librdf_statement* s = librdf_stream_get_object(ports); - librdf_node* node = librdf_statement_get_object(s); - - SLV2Value symbol = slv2_plugin_get_unique( + librdf_node* node = MATCH_OBJECT(ports); + SLV2Value symbol = slv2_plugin_get_unique( p, librdf_new_node_from_node(node), librdf_new_node_from_node(p->world->lv2_symbol_node)); @@ -148,8 +146,7 @@ slv2_values_from_stream_objects(SLV2Plugin p, librdf_stream* stream) values, slv2_value_new_librdf_node( p->world, - librdf_statement_get_object( - librdf_stream_get_object(stream)))); + MATCH_OBJECT(stream))); } END_MATCH(stream); return values; @@ -322,8 +319,7 @@ slv2_port_get_scale_points(SLV2Plugin p, ret = slv2_scale_points_new(); FOREACH_MATCH(points) { - librdf_statement* s = librdf_stream_get_object(points); - librdf_node* point = librdf_statement_get_object(s); + librdf_node* point = MATCH_OBJECT(points); SLV2Value value = slv2_plugin_get_unique( p, -- cgit v1.2.1