Compare commits
4 Commits
master
...
lv2-1-16-0
Author | SHA1 | Date | |
---|---|---|---|
8eec6888fa | |||
5904eaae34 | |||
f2958e7e5e | |||
98524c9bfb |
@ -2066,8 +2066,7 @@ PREDEFINED = \
|
||||
HAVE_LOCALTIME_R=1 \
|
||||
HAVE_LRDF=1 \
|
||||
HAVE_LV2=1 \
|
||||
HAVE_LV2_1_0_0=1 \
|
||||
HAVE_LV2_1_10_0=1 \
|
||||
HAVE_LV2_1_18_0=1 \
|
||||
HAVE_POSIX_MEMALIGN=1 \
|
||||
HAVE_PULSEAUDIO=1 \
|
||||
HAVE_READLINE=1 \
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
#include "gtkmm2ext/utils.h"
|
||||
|
||||
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
|
||||
#include "lv2/ui/ui.h"
|
||||
|
||||
#include <lilv/lilv.h>
|
||||
#include <suil/suil.h>
|
||||
@ -139,7 +139,7 @@ LV2PluginUI::set_path_property (int response,
|
||||
active_parameter_requests.erase (desc.key);
|
||||
}
|
||||
|
||||
#ifdef HAVE_LV2_1_17_2
|
||||
#ifdef HAVE_LV2_1_18_0
|
||||
LV2UI_Request_Value_Status
|
||||
LV2PluginUI::request_value(void* handle,
|
||||
LV2_URID key,
|
||||
@ -336,7 +336,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
|
||||
features[fi] = features_src[fi];
|
||||
}
|
||||
|
||||
#ifdef HAVE_LV2_1_17_2
|
||||
#ifdef HAVE_LV2_1_18_0
|
||||
_lv2ui_request_value.handle = this;
|
||||
_lv2ui_request_value.request = LV2PluginUI::request_value;
|
||||
_lv2ui_request_feature.URI = LV2_UI__requestValue;
|
||||
@ -376,7 +376,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
|
||||
}
|
||||
|
||||
features[fi] = NULL;
|
||||
#ifdef HAVE_LV2_1_17_2
|
||||
#ifdef HAVE_LV2_1_18_0
|
||||
assert (fi == features_count + (is_external_ui ? 3 : 2));
|
||||
#else
|
||||
assert (fi == features_count + (is_external_ui ? 2 : 1));
|
||||
|
@ -42,7 +42,7 @@
|
||||
|
||||
#include "lv2_external_ui.h"
|
||||
|
||||
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
|
||||
#include "lv2/ui/ui.h"
|
||||
|
||||
namespace ARDOUR {
|
||||
class LV2Plugin;
|
||||
@ -77,14 +77,14 @@ private:
|
||||
sigc::connection _screen_update_connection;
|
||||
sigc::connection _message_update_connection;
|
||||
Gtk::Widget* _gui_widget;
|
||||
/** a box containing the focus, bypa s, delete, save / add preset buttons etc. */
|
||||
/** a box containing the focus, bypass, delete, save / add preset buttons etc. */
|
||||
Gtk::HBox _ardour_buttons_box;
|
||||
float* _values_last_sent_to_ui;
|
||||
std::vector<ControllableRef> _controllables;
|
||||
struct lv2_external_ui_host _external_ui_host;
|
||||
LV2_Feature _external_ui_feature;
|
||||
LV2_Feature _external_kxui_feature;
|
||||
#ifdef HAVE_LV2_1_17_2
|
||||
#ifdef HAVE_LV2_1_18_0
|
||||
LV2UI_Request_Value _lv2ui_request_value;
|
||||
LV2_Feature _lv2ui_request_feature;
|
||||
#endif
|
||||
@ -115,7 +115,7 @@ private:
|
||||
uint32_t port_index,
|
||||
bool grabbed);
|
||||
|
||||
#ifdef HAVE_LV2_1_17_2
|
||||
#ifdef HAVE_LV2_1_18_0
|
||||
static LV2UI_Request_Value_Status
|
||||
request_value(void* handle,
|
||||
LV2_URID key,
|
||||
|
@ -17,7 +17,7 @@
|
||||
#ifndef _ardour_lv2_extensions_h_
|
||||
#define _ardour_lv2_extensions_h_
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
|
||||
/**
|
||||
@defgroup lv2inlinedisplay Inline-Display
|
||||
|
@ -27,8 +27,8 @@
|
||||
|
||||
#include <glibmm/threads.h>
|
||||
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
|
||||
#include <lv2/core/lv2.h>
|
||||
#include <lv2/urid/urid.h>
|
||||
|
||||
#include "ardour/libardour_visibility.h"
|
||||
|
||||
|
@ -18,8 +18,8 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/event/event.h"
|
||||
#include "lv2/atom/atom.h"
|
||||
#include "lv2/event/event.h"
|
||||
|
||||
#include "lv2_evbuf.h"
|
||||
|
||||
|
@ -76,23 +76,23 @@
|
||||
|
||||
#include <lilv/lilv.h>
|
||||
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/log/log.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/port-props/port-props.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/presets/presets.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/state/state.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/time/time.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/worker/worker.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/units/units.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/port-groups/port-groups.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/parameters/parameters.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/options/options.h"
|
||||
#include "lv2/atom/atom.h"
|
||||
#include "lv2/atom/forge.h"
|
||||
#include "lv2/buf-size/buf-size.h"
|
||||
#include "lv2/log/log.h"
|
||||
#include "lv2/midi/midi.h"
|
||||
#include "lv2/options/options.h"
|
||||
#include "lv2/parameters/parameters.h"
|
||||
#include "lv2/patch/patch.h"
|
||||
#include "lv2/port-groups/port-groups.h"
|
||||
#include "lv2/port-props/port-props.h"
|
||||
#include "lv2/presets/presets.h"
|
||||
#include "lv2/resize-port/resize-port.h"
|
||||
#include "lv2/state/state.h"
|
||||
#include "lv2/time/time.h"
|
||||
#include "lv2/ui/ui.h"
|
||||
#include "lv2/units/units.h"
|
||||
#include "lv2/worker/worker.h"
|
||||
|
||||
#include "lv2_evbuf.h"
|
||||
|
||||
@ -204,12 +204,6 @@ public:
|
||||
LilvNode* bufz_nominalBlockLength;
|
||||
LilvNode* bufz_coarseBlockLength;
|
||||
|
||||
#ifdef HAVE_LV2_1_10_0
|
||||
LilvNode* atom_int;
|
||||
LilvNode* atom_float;
|
||||
LilvNode* atom_object; // new in 1.8
|
||||
LilvNode* atom_vector;
|
||||
#endif
|
||||
#ifdef LV2_EXTENDED
|
||||
LilvNode* lv2_noSampleAccurateCtrl;
|
||||
LilvNode* routing_connectAllOutputs; // lv2:optionalFeature
|
||||
@ -1894,17 +1888,10 @@ LV2Plugin::set_property(uint32_t key, const Variant& value)
|
||||
lv2_atom_forge_set_buffer(forge, buf, sizeof(buf));
|
||||
|
||||
// Serialize patch:Set message to set property
|
||||
#ifdef HAVE_LV2_1_10_0
|
||||
lv2_atom_forge_object(forge, &frame, 0, _uri_map.urids.patch_Set);
|
||||
lv2_atom_forge_key(forge, _uri_map.urids.patch_property);
|
||||
lv2_atom_forge_urid(forge, key);
|
||||
lv2_atom_forge_key(forge, _uri_map.urids.patch_value);
|
||||
#else
|
||||
lv2_atom_forge_blank(forge, &frame, 0, _uri_map.urids.patch_Set);
|
||||
lv2_atom_forge_property_head(forge, _uri_map.urids.patch_property, 0);
|
||||
lv2_atom_forge_urid(forge, key);
|
||||
lv2_atom_forge_property_head(forge, _uri_map.urids.patch_value, 0);
|
||||
#endif
|
||||
|
||||
forge_variant(forge, value);
|
||||
|
||||
@ -2069,11 +2056,7 @@ LV2Plugin::announce_property_values()
|
||||
lv2_atom_forge_set_buffer(forge, buf, sizeof(buf));
|
||||
|
||||
// Serialize patch:Get message with no subject (implicitly plugin instance)
|
||||
#ifdef HAVE_LV2_1_10_0
|
||||
lv2_atom_forge_object(forge, &frame, 0, _uri_map.urids.patch_Get);
|
||||
#else
|
||||
lv2_atom_forge_blank(forge, &frame, 0, _uri_map.urids.patch_Get);
|
||||
#endif
|
||||
|
||||
// Write message to UI=>Plugin ring
|
||||
const LV2_Atom* const atom = (const LV2_Atom*)buf;
|
||||
@ -2607,8 +2590,8 @@ write_position(LV2_Atom_Forge* forge,
|
||||
|
||||
uint8_t pos_buf[256];
|
||||
lv2_atom_forge_set_buffer(forge, pos_buf, sizeof(pos_buf));
|
||||
|
||||
LV2_Atom_Forge_Frame frame;
|
||||
#ifdef HAVE_LV2_1_10_0
|
||||
lv2_atom_forge_object(forge, &frame, 0, urids.time_Position);
|
||||
lv2_atom_forge_key(forge, urids.time_frame);
|
||||
lv2_atom_forge_long(forge, position);
|
||||
@ -2626,25 +2609,6 @@ write_position(LV2_Atom_Forge* forge,
|
||||
lv2_atom_forge_float(forge, bpm);
|
||||
lv2_atom_forge_key(forge, urids.time_scale);
|
||||
lv2_atom_forge_float(forge, time_scale);
|
||||
#else
|
||||
lv2_atom_forge_blank(forge, &frame, 1, urids.time_Position);
|
||||
lv2_atom_forge_property_head(forge, urids.time_frame, 0);
|
||||
lv2_atom_forge_long(forge, position);
|
||||
lv2_atom_forge_property_head(forge, urids.time_speed, 0);
|
||||
lv2_atom_forge_float(forge, speed);
|
||||
lv2_atom_forge_property_head(forge, urids.time_barBeat, 0);
|
||||
lv2_atom_forge_float(forge, bbt.beats - 1 + (bbt.ticks / (float) Temporal::ticks_per_beat));
|
||||
lv2_atom_forge_property_head(forge, urids.time_bar, 0);
|
||||
lv2_atom_forge_long(forge, bbt.bars - 1);
|
||||
lv2_atom_forge_property_head(forge, urids.time_beatUnit, 0);
|
||||
lv2_atom_forge_int(forge, t.meter().note_divisor());
|
||||
lv2_atom_forge_property_head(forge, urids.time_beatsPerBar, 0);
|
||||
lv2_atom_forge_float(forge, t.meter().divisions_per_bar());
|
||||
lv2_atom_forge_property_head(forge, urids.time_beatsPerMinute, 0);
|
||||
lv2_atom_forge_float(forge, bpm);
|
||||
lv2_atom_forge_key(forge, urids.time_scale);
|
||||
lv2_atom_forge_float(forge, time_scale);
|
||||
#endif
|
||||
|
||||
LV2_Evbuf_Iterator end = lv2_evbuf_end(buf);
|
||||
const LV2_Atom* const atom = (const LV2_Atom*)pos_buf;
|
||||
|
@ -320,11 +320,9 @@ def configure(conf):
|
||||
atleast_version='2.0')
|
||||
|
||||
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
|
||||
atleast_version='1.2.0', mandatory=True)
|
||||
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_10_0',
|
||||
atleast_version='1.10.0', mandatory=False)
|
||||
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_17_2',
|
||||
atleast_version='1.17.2', mandatory=False)
|
||||
atleast_version='1.16.0', mandatory=True)
|
||||
autowaf.check_pkg(conf, 'lv2', uselib_store='LV2_1_18_0',
|
||||
atleast_version='1.18.0', mandatory=False)
|
||||
autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
|
||||
atleast_version='0.14.0', mandatory=True)
|
||||
autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
|
||||
@ -338,7 +336,7 @@ def configure(conf):
|
||||
conf.define ('LV2_SUPPORT', 1)
|
||||
|
||||
# non-standard LV2 extention -- TODO: add option to disable??
|
||||
if conf.is_defined ('HAVE_LV2_1_10_0'):
|
||||
if conf.is_defined ('HAVE_LV2'):
|
||||
conf.define ('LV2_EXTENDED', 1)
|
||||
|
||||
#autowaf.check_pkg(conf, 'soundtouch', uselib_store='SOUNDTOUCH',
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "ardour/lv2_extensions.h"
|
||||
#endif
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
|
||||
#define ACOMP_URI "urn:ardour:a-comp"
|
||||
#define ACOMP_STEREO_URI "urn:ardour:a-comp#stereo"
|
||||
|
@ -21,11 +21,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/time/time.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
|
||||
#include "lv2/atom/atom.h"
|
||||
#include "lv2/atom/forge.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
#include "lv2/time/time.h"
|
||||
#include "lv2/urid/urid.h"
|
||||
|
||||
#define ADELAY_URI "urn:ardour:a-delay"
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
#define isfinite_local isfinite
|
||||
#endif
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
|
||||
#ifdef LV2_EXTENDED
|
||||
#include <cairo/cairo.h>
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "ardour/lv2_extensions.h"
|
||||
#endif
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
|
||||
#define AEXP_URI "urn:ardour:a-exp"
|
||||
#define AEXP_STEREO_URI "urn:ardour:a-exp#stereo"
|
||||
|
@ -32,28 +32,22 @@
|
||||
|
||||
#define AFS_URN "urn:ardour:a-fluidsynth"
|
||||
|
||||
#ifdef HAVE_LV2_1_10_0
|
||||
#define x_forge_object lv2_atom_forge_object
|
||||
#else
|
||||
#define x_forge_object lv2_atom_forge_blank
|
||||
#endif
|
||||
|
||||
#ifdef LV2_EXTENDED
|
||||
#include "../../ardour/ardour/lv2_extensions.h"
|
||||
#endif
|
||||
|
||||
#include "fluidsynth.h"
|
||||
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/atom/util.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/log/logger.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/patch/patch.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/state/state.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
|
||||
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
|
||||
#include <lv2/lv2plug.in/ns/lv2core/lv2.h>
|
||||
#include <lv2/atom/atom.h>
|
||||
#include <lv2/atom/forge.h>
|
||||
#include <lv2/atom/util.h>
|
||||
#include <lv2/core/lv2.h>
|
||||
#include <lv2/log/logger.h>
|
||||
#include <lv2/midi/midi.h>
|
||||
#include <lv2/patch/patch.h>
|
||||
#include <lv2/state/state.h>
|
||||
#include <lv2/urid/urid.h>
|
||||
#include <lv2/worker/worker.h>
|
||||
|
||||
enum {
|
||||
FS_PORT_CONTROL = 0,
|
||||
@ -254,7 +248,7 @@ inform_ui (AFluidSynth* self)
|
||||
|
||||
LV2_Atom_Forge_Frame frame;
|
||||
lv2_atom_forge_frame_time (&self->forge, 0);
|
||||
x_forge_object (&self->forge, &frame, 1, self->patch_Set);
|
||||
lv2_atom_forge_object (&self->forge, &frame, 1, self->patch_Set);
|
||||
lv2_atom_forge_property_head (&self->forge, self->patch_property, 0);
|
||||
lv2_atom_forge_urid (&self->forge, self->afs_sf2file);
|
||||
lv2_atom_forge_property_head (&self->forge, self->patch_value, 0);
|
||||
@ -689,7 +683,7 @@ run (LV2_Handle instance, uint32_t n_samples)
|
||||
/* emit stateChanged */
|
||||
LV2_Atom_Forge_Frame frame;
|
||||
lv2_atom_forge_frame_time (&self->forge, 0);
|
||||
x_forge_object (&self->forge, &frame, 1, self->state_Changed);
|
||||
lv2_atom_forge_object (&self->forge, &frame, 1, self->state_Changed);
|
||||
lv2_atom_forge_pop (&self->forge, &frame);
|
||||
|
||||
/* send .sf2 filename */
|
||||
|
@ -249,7 +249,7 @@ reverb (b_reverb* r,
|
||||
* LV2 wrapper
|
||||
*/
|
||||
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
|
||||
typedef enum {
|
||||
AR_INPUT0 = 0,
|
||||
|
@ -24,10 +24,10 @@
|
||||
#include <time.h>
|
||||
|
||||
/* LV2 */
|
||||
#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
|
||||
#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
|
||||
#include "lv2/atom/atom.h"
|
||||
#include "lv2/core/lv2.h"
|
||||
#include "lv2/midi/midi.h"
|
||||
#include "lv2/urid/urid.h"
|
||||
|
||||
#define RSY_URI "https://community.ardour.org/node/7596"
|
||||
|
||||
|
@ -16,7 +16,7 @@ time ./tools/doxy2json/doxy2json -j 4 \
|
||||
-D PROGRAM_NAME=\"Ardour\" -D PROGRAM_VERSION=\"6\" -D LOCALEDIR=\"/\" \
|
||||
-D ARCH_X86 -D CONFIG_ARCH=\"x86_64\" -D WAF_BUILD -D CANVAS_COMPATIBILITY=1 \
|
||||
-D HAVE_AUBIO=1 -D HAVE_ALSA=1 -D HAVE_GLIB=1 -D HAVE_LIBS_LUA=1 -D HAVE_XML=1 -D PTFORMAT=1 \
|
||||
-D HAVE_SAMPLERATE=1 -D HAVE_LV2=1 -D HAVE_LV2_1_10_0=1 -D HAVE_SERD=1 -D HAVE_SORD=1 -D HAVE_SRATOM=1 -D HAVE_LILV=1 -D HAVE_LV2_1_0_0=1 \
|
||||
-D HAVE_SAMPLERATE=1 -D HAVE_LV2=1 -D HAVE_LV2_1_18_0=1 -D HAVE_SERD=1 -D HAVE_SORD=1 -D HAVE_SRATOM=1 -D HAVE_LILV=1 -D HAVE_LV2_1_0_0=1 \
|
||||
-D HAVE_SUIL=1 -D LV2_SUPPORT=1 -D LV2_EXTENDED=1 -D HAVE_GTK=1 -D HAVE_LIBS_GTKMM2EXT=1 \
|
||||
-D HAVE_X11=1 -D LXVST_64BIT=1 -D LXVST_SUPPORT=1 -D HAVE_TAGLIB=1 -D HAVE_POSIX_MEMALIGN=1 -D HAVE_VAMPSDK=1 -D HAVE_VAMPHOSTSDK=1 -D HAVE_RUBBERBAND=1 -D ENABLE_NLS=1 \
|
||||
-D HAVE_CURL=1 -D HAVE_LO=1 -D HAVE_LRDF=1 -D _VAMP_NO_PLUGIN_NAMESPACE=1 -D _VAMP_NO_HOST_NAMESPACE=1 \
|
||||
|
Loading…
Reference in New Issue
Block a user