diff options
| -rw-r--r-- | src/lib.c | 9 | ||||
| -rw-r--r-- | src/lilv_internal.h | 2 | ||||
| -rw-r--r-- | src/world.c | 4 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 1 insertions, 16 deletions
@@ -48,7 +48,6 @@ lilv_lib_open(LilvWorld* world, LV2_Descriptor_Function df = (LV2_Descriptor_Function) lilv_dlfunc(lib, "lv2_descriptor"); -#ifdef LILV_NEW_LV2 LV2_Lib_Descriptor_Function ldf = (LV2_Lib_Descriptor_Function) lilv_dlfunc(lib, "lv2_lib_descriptor"); @@ -59,9 +58,7 @@ lilv_lib_open(LilvWorld* world, LILV_ERRORF("Call to `lv2_lib_descriptor' in %s failed\n", lib_path); return NULL; } - } else -#endif - if (!df) { + } else if (!df) { LILV_ERRORF("No `lv2_descriptor' or `lv2_lib_descriptor' in %s\n", lib_path); dlclose(lib); @@ -74,9 +71,7 @@ lilv_lib_open(LilvWorld* world, llib->bundle_path = lilv_strdup(bundle_path); llib->lib = lib; llib->lv2_descriptor = df; -#ifdef LILV_NEW_LV2 llib->desc = desc; -#endif llib->refs = 1; zix_tree_insert(world->libs, llib, NULL); @@ -89,11 +84,9 @@ lilv_lib_get_plugin(LilvLib* lib, uint32_t index) if (lib->lv2_descriptor) { return lib->lv2_descriptor(index); } -#ifdef LILV_NEW_LV2 if (lib->desc) { return lib->desc->get_plugin(lib->desc->handle, index); } -#endif return NULL; } diff --git a/src/lilv_internal.h b/src/lilv_internal.h index 25850d3..2d3fb23 100644 --- a/src/lilv_internal.h +++ b/src/lilv_internal.h @@ -102,9 +102,7 @@ typedef struct { char* bundle_path; void* lib; LV2_Descriptor_Function lv2_descriptor; -#ifdef LILV_NEW_LV2 const LV2_Lib_Descriptor* desc; -#endif uint32_t refs; } LilvLib; diff --git a/src/world.c b/src/world.c index 460ef7a..8a5182d 100644 --- a/src/world.c +++ b/src/world.c @@ -42,9 +42,7 @@ lilv_world_new(void) world->loaded_files = zix_tree_new( false, lilv_resource_node_cmp, NULL, (ZixDestroyFunc)lilv_node_free); -#ifdef LILV_NEW_LV2 world->libs = zix_tree_new(false, lilv_lib_compare, NULL, NULL); -#endif #define NS_DCTERMS "http://purl.org/dc/terms/" #define NS_DYNMAN "http://lv2plug.in/ns/ext/dynmanifest#" @@ -136,10 +134,8 @@ lilv_world_free(LilvWorld* world) zix_tree_free((ZixTree*)world->loaded_files); world->loaded_files = NULL; -#ifdef LILV_NEW_LV2 zix_tree_free((ZixTree*)world->libs); world->libs = NULL; -#endif zix_tree_free((ZixTree*)world->plugin_classes); world->plugin_classes = NULL; @@ -84,8 +84,6 @@ def configure(conf): autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM', atleast_version='0.4.0', mandatory=True) - autowaf.define(conf, 'LILV_NEW_LV2', 1) # New LV2 discovery API - defines = ['_POSIX_C_SOURCE', '_BSD_SOURCE'] if conf.env.DEST_OS == 'darwin': defines += ['_DARWIN_C_SOURCE'] |