diff options
| author | David Robillard <d@drobilla.net> | 2015-01-18 17:19:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-18 17:19:00 +0000 |
| commit | 7e1c8329cf53668da157c71e7c48a05d385b616d (patch) | |
| tree | 19c6eff865a9a388ed89e9f55a6fd6687ca84a7a /src/lib.c | |
| parent | 5bd952509bf2d13ce075b9544bf0a498ebd44e5d (diff) | |
| download | lilv-7e1c8329cf53668da157c71e7c48a05d385b616d.tar.gz lilv-7e1c8329cf53668da157c71e7c48a05d385b616d.tar.bz2 lilv-7e1c8329cf53668da157c71e7c48a05d385b616d.zip | |
Remove LILV_NEW_LV2 define.
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@5522 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/lib.c')
| -rw-r--r-- | src/lib.c | 9 |
1 files changed, 1 insertions, 8 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; } |