smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Use precise define names for LV2 version configure checks.

Browse source
This commit is contained in:
David Robillard 2014-10-31 20:22:57 -04:00
parent 0a60077a61
commit 324ab35abc
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/ardour/lv2_plugin.cc
View file

@ -67,7 +67,7 @@
#include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h" #include "lv2/lv2plug.in/ns/ext/resize-port/resize-port.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
#include "lv2/lv2plug.in/ns/ext/patch/patch.h" #include "lv2/lv2plug.in/ns/ext/patch/patch.h"
#ifdef HAVE_NEW_LV2 #ifdef HAVE_LV2_1_2_0
#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h" #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
#include "lv2/lv2plug.in/ns/ext/options/options.h" #include "lv2/lv2plug.in/ns/ext/options/options.h"
#endif #endif
@ -348,13 +348,13 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
_features[6] = &_log_feature; _features[6] = &_log_feature;
unsigned n_features = 7; unsigned n_features = 7;
#ifdef HAVE_NEW_LV2 #ifdef HAVE_LV2_1_2_0
_features[n_features++] = &_def_state_feature; _features[n_features++] = &_def_state_feature;
#endif #endif
lv2_atom_forge_init(&_impl->forge, _uri_map.urid_map()); lv2_atom_forge_init(&_impl->forge, _uri_map.urid_map());
#ifdef HAVE_NEW_LV2 #ifdef HAVE_LV2_1_2_0
LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int); LV2_URID atom_Int = _uri_map.uri_to_id(LV2_ATOM__Int);
LV2_Options_Option options[] = { LV2_Options_Option options[] = {
{ LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength), { LV2_OPTIONS_INSTANCE, 0, _uri_map.uri_to_id(LV2_BUF_SIZE__minBlockLength),

4
libs/ardour/wscript
View file

@ -265,8 +265,8 @@ def configure(conf):
if Options.options.lv2: if Options.options.lv2:
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2', autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
atleast_version='1.0.0', mandatory=True) atleast_version='1.0.0', mandatory=True)
autowaf.check_pkg(conf, 'lv2', uselib_store='NEW_LV2', autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_2_0',
atleast_version='1.0.15', mandatory=False) atleast_version='1.2.0', mandatory=False)
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
atleast_version='0.14.0', mandatory=True) atleast_version='0.14.0', mandatory=True)
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD', autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',

2
msvc_extra_headers/ardourext/sys/targetsxs.h.input
View file

@ -7,7 +7,7 @@
#define LV2_SUPPORT 1 #define LV2_SUPPORT 1
#define HAVE_SUIL 1 #define HAVE_SUIL 1
#define HAVE_LV2 1 #define HAVE_LV2 1
#define HAVE_NEW_LV2 1 #define HAVE_LV2_1_2_0 1
/* Comment out the above lines to build Mixbus without LV2 support */ /* Comment out the above lines to build Mixbus without LV2 support */
#endif #endif